mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-07 13:41:13 -07:00
Added the option to set a CP quality #38
This commit is contained in:
parent
4136116555
commit
e34170f55a
9 changed files with 166 additions and 9 deletions
|
@ -33,7 +33,8 @@ namespace PlexRequests.Api.Interfaces
|
||||||
{
|
{
|
||||||
public interface ICouchPotatoApi
|
public interface ICouchPotatoApi
|
||||||
{
|
{
|
||||||
bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl);
|
bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl, string profileID = default(string));
|
||||||
CouchPotatoStatus GetStatus(Uri url, string apiKey);
|
CouchPotatoStatus GetStatus(Uri url, string apiKey);
|
||||||
|
CouchPotatoProfiles GetProfiles(Uri url, string apiKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
53
PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs
Normal file
53
PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
#region Copyright
|
||||||
|
// /************************************************************************
|
||||||
|
// Copyright (c) 2016 Jamie Rees
|
||||||
|
// File: CouchPotatoProfiles.cs
|
||||||
|
// Created By: Jamie Rees
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
// a copy of this software and associated documentation files (the
|
||||||
|
// "Software"), to deal in the Software without restriction, including
|
||||||
|
// without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
// permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
// the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be
|
||||||
|
// included in all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
|
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
|
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
// ************************************************************************/
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace PlexRequests.Api.Models.Movie
|
||||||
|
{
|
||||||
|
public class ProfileList
|
||||||
|
{
|
||||||
|
public bool core { get; set; }
|
||||||
|
public string _rev { get; set; }
|
||||||
|
public List<bool> finish { get; set; }
|
||||||
|
public List<string> qualities { get; set; }
|
||||||
|
public string _id { get; set; }
|
||||||
|
public string _t { get; set; }
|
||||||
|
public string label { get; set; }
|
||||||
|
public int minimum_score { get; set; }
|
||||||
|
public List<int> stop_after { get; set; }
|
||||||
|
public List<int> wait_for { get; set; }
|
||||||
|
public int order { get; set; }
|
||||||
|
public List<object> __invalid_name__3d { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CouchPotatoProfiles
|
||||||
|
{
|
||||||
|
public List<ProfileList> list { get; set; }
|
||||||
|
public bool success { get; set; }
|
||||||
|
}
|
||||||
|
}
|
|
@ -46,6 +46,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Movie\CouchPotatoAdd.cs" />
|
<Compile Include="Movie\CouchPotatoAdd.cs" />
|
||||||
|
<Compile Include="Movie\CouchPotatoProfiles.cs" />
|
||||||
<Compile Include="Movie\CouchPotatoStatus.cs" />
|
<Compile Include="Movie\CouchPotatoStatus.cs" />
|
||||||
<Compile Include="Notifications\PushbulletPush.cs" />
|
<Compile Include="Notifications\PushbulletPush.cs" />
|
||||||
<Compile Include="Notifications\PushbulletResponse.cs" />
|
<Compile Include="Notifications\PushbulletResponse.cs" />
|
||||||
|
|
|
@ -45,9 +45,17 @@ namespace PlexRequests.Api
|
||||||
private ApiRequest Api { get; set; }
|
private ApiRequest Api { get; set; }
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
private static Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
public bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl)
|
public bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl, string profileId = default(string))
|
||||||
{
|
{
|
||||||
var request = new RestRequest { Resource = "/api/{apikey}/movie.add?title={title}&identifier={imdbid}" };
|
RestRequest request;
|
||||||
|
request = string.IsNullOrEmpty(profileId)
|
||||||
|
? new RestRequest {Resource = "/api/{apikey}/movie.add?title={title}&identifier={imdbid}"}
|
||||||
|
: new RestRequest { Resource = "/api/{apikey}/movie.add?title={title}&identifier={imdbid}&profile_id={profileId}" };
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(profileId))
|
||||||
|
{
|
||||||
|
request.AddUrlSegment("profileId", profileId);
|
||||||
|
}
|
||||||
|
|
||||||
request.AddUrlSegment("apikey", apiKey);
|
request.AddUrlSegment("apikey", apiKey);
|
||||||
request.AddUrlSegment("imdbid", imdbid);
|
request.AddUrlSegment("imdbid", imdbid);
|
||||||
|
@ -93,5 +101,19 @@ namespace PlexRequests.Api
|
||||||
|
|
||||||
return Api.Execute<CouchPotatoStatus>(request,url);
|
return Api.Execute<CouchPotatoStatus>(request,url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public CouchPotatoProfiles GetProfiles(Uri url, string apiKey)
|
||||||
|
{
|
||||||
|
Log.Trace("Getting CP Profiles, ApiKey = {0}", apiKey);
|
||||||
|
var request = new RestRequest
|
||||||
|
{
|
||||||
|
Resource = "api/{apikey}/profile.list/",
|
||||||
|
Method = Method.GET
|
||||||
|
};
|
||||||
|
|
||||||
|
request.AddUrlSegment("apikey", apiKey);
|
||||||
|
|
||||||
|
return Api.Execute<CouchPotatoProfiles>(request, url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -37,6 +37,7 @@ namespace PlexRequests.Core.SettingModels
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
public string ApiKey { get; set; }
|
public string ApiKey { get; set; }
|
||||||
public bool Ssl { get; set; }
|
public bool Ssl { get; set; }
|
||||||
|
public string ProfileId { get; set; }
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public Uri FullUri
|
public Uri FullUri
|
||||||
|
|
|
@ -59,6 +59,7 @@ namespace PlexRequests.UI.Modules
|
||||||
private IPlexApi PlexApi { get; }
|
private IPlexApi PlexApi { get; }
|
||||||
private ISonarrApi SonarrApi { get; }
|
private ISonarrApi SonarrApi { get; }
|
||||||
private PushbulletApi PushbulletApi { get; }
|
private PushbulletApi PushbulletApi { get; }
|
||||||
|
private ICouchPotatoApi CpApi { get; }
|
||||||
|
|
||||||
private static Logger Log = LogManager.GetCurrentClassLogger();
|
private static Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
public AdminModule(ISettingsService<PlexRequestSettings> rpService,
|
public AdminModule(ISettingsService<PlexRequestSettings> rpService,
|
||||||
|
@ -70,7 +71,8 @@ namespace PlexRequests.UI.Modules
|
||||||
ISettingsService<EmailNotificationSettings> email,
|
ISettingsService<EmailNotificationSettings> email,
|
||||||
IPlexApi plexApi,
|
IPlexApi plexApi,
|
||||||
ISettingsService<PushbulletNotificationSettings> pbSettings,
|
ISettingsService<PushbulletNotificationSettings> pbSettings,
|
||||||
PushbulletApi pbApi) : base("admin")
|
PushbulletApi pbApi,
|
||||||
|
ICouchPotatoApi cpApi) : base("admin")
|
||||||
{
|
{
|
||||||
RpService = rpService;
|
RpService = rpService;
|
||||||
CpService = cpService;
|
CpService = cpService;
|
||||||
|
@ -82,6 +84,7 @@ namespace PlexRequests.UI.Modules
|
||||||
PlexApi = plexApi;
|
PlexApi = plexApi;
|
||||||
PushbulletService = pbSettings;
|
PushbulletService = pbSettings;
|
||||||
PushbulletApi = pbApi;
|
PushbulletApi = pbApi;
|
||||||
|
CpApi = cpApi;
|
||||||
|
|
||||||
#if !DEBUG
|
#if !DEBUG
|
||||||
this.RequiresAuthentication();
|
this.RequiresAuthentication();
|
||||||
|
@ -107,6 +110,7 @@ namespace PlexRequests.UI.Modules
|
||||||
Post["/sonarr"] = _ => SaveSonarr();
|
Post["/sonarr"] = _ => SaveSonarr();
|
||||||
|
|
||||||
Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
|
Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
|
||||||
|
Post["/cpprofiles"] = _ => GetCpProfiles();
|
||||||
|
|
||||||
Get["/emailnotification"] = _ => EmailNotifications();
|
Get["/emailnotification"] = _ => EmailNotifications();
|
||||||
Post["/emailnotification"] = _ => SaveEmailNotifications();
|
Post["/emailnotification"] = _ => SaveEmailNotifications();
|
||||||
|
@ -354,5 +358,13 @@ namespace PlexRequests.UI.Modules
|
||||||
? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Pushbullet Notifications!" }
|
? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Pushbullet Notifications!" }
|
||||||
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
|
: new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Response GetCpProfiles()
|
||||||
|
{
|
||||||
|
var settings = this.Bind<CouchPotatoSettings>();
|
||||||
|
var profiles = CpApi.GetProfiles(settings.FullUri, settings.ApiKey);
|
||||||
|
|
||||||
|
return Response.AsJson(profiles);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -127,7 +127,7 @@ namespace PlexRequests.UI.Modules
|
||||||
var cpSettings = CpService.GetSettings();
|
var cpSettings = CpService.GetSettings();
|
||||||
var cp = new CouchPotatoApi();
|
var cp = new CouchPotatoApi();
|
||||||
Log.Info("Adding movie to CP : {0}", request.Title);
|
Log.Info("Adding movie to CP : {0}", request.Title);
|
||||||
var result = cp.AddMovie(request.ImdbId, cpSettings.ApiKey, request.Title, cpSettings.FullUri);
|
var result = cp.AddMovie(request.ImdbId, cpSettings.ApiKey, request.Title, cpSettings.FullUri, cpSettings.ProfileId);
|
||||||
Log.Trace("Adding movie to CP result {0}", result);
|
Log.Trace("Adding movie to CP result {0}", result);
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
|
@ -212,7 +212,7 @@ namespace PlexRequests.UI.Modules
|
||||||
private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
|
private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
|
||||||
{
|
{
|
||||||
Log.Info("Adding movie to CP : {0}", r.Title);
|
Log.Info("Adding movie to CP : {0}", r.Title);
|
||||||
var result = cp.AddMovie(r.ImdbId, settings.ApiKey, r.Title, settings.FullUri);
|
var result = cp.AddMovie(r.ImdbId, settings.ApiKey, r.Title, settings.FullUri, settings.ProfileId);
|
||||||
Log.Trace("Adding movie to CP result {0}", result);
|
Log.Trace("Adding movie to CP result {0}", result);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -215,7 +215,7 @@ namespace PlexRequests.UI.Modules
|
||||||
if (!settings.RequireApproval)
|
if (!settings.RequireApproval)
|
||||||
{
|
{
|
||||||
Log.Info("Adding movie to CP (No approval required)");
|
Log.Info("Adding movie to CP (No approval required)");
|
||||||
var result = CouchPotatoApi.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri);
|
var result = CouchPotatoApi.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri,cpSettings.ProfileId);
|
||||||
Log.Debug("Adding movie to CP result {0}", result);
|
Log.Debug("Adding movie to CP result {0}", result);
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,6 +52,20 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div>
|
||||||
|
<button type="submit" id="getProfiles" class="btn btn-primary-outline">Get Quality Profiles</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="select" class="control-label">Quality Profiles</label>
|
||||||
|
<div id="profiles">
|
||||||
|
<select class="form-control" id="select"></select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br/>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div>
|
<div>
|
||||||
<button id="testCp" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
|
<button id="testCp" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
|
||||||
|
@ -75,9 +89,58 @@
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
|
|
||||||
|
@if (!string.IsNullOrEmpty(Model.ProfileId))
|
||||||
|
{
|
||||||
|
<text>
|
||||||
|
var qualitySelected = '@Model.ProfileId';
|
||||||
|
var $form = $("#mainForm");
|
||||||
|
$.ajax({
|
||||||
|
type: $form.prop("method"),
|
||||||
|
data: $form.serialize(),
|
||||||
|
url: "cpprofiles",
|
||||||
|
dataType: "json",
|
||||||
|
success: function(response) {
|
||||||
|
response.list.forEach(function(result) {
|
||||||
|
if (result._id == qualitySelected) {
|
||||||
|
|
||||||
|
$("#select").append("<option selected='selected' value='" + result._id + "'>" + result.label + "</option>");
|
||||||
|
} else {
|
||||||
|
$("#select").append("<option value='" + result._id + "'>" + result.label + "</option>");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
error: function(e) {
|
||||||
|
console.log(e);
|
||||||
|
generateNotify("Something went wrong!", "danger");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</text>
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#getProfiles').click(function (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
var $form = $("#mainForm");
|
||||||
|
$.ajax({
|
||||||
|
type: $form.prop("method"),
|
||||||
|
data: $form.serialize(),
|
||||||
|
url: "cpprofiles",
|
||||||
|
dataType: "json",
|
||||||
|
success: function (response) {
|
||||||
|
response.list.forEach(function (result) {
|
||||||
|
$("#select").append("<option value='" + result._id + "'>" + result.label + "</option>");
|
||||||
|
});
|
||||||
|
},
|
||||||
|
error: function (e) {
|
||||||
|
console.log(e);
|
||||||
|
generateNotify("Something went wrong!", "danger");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
$('#testCp').click(function (e) {
|
$('#testCp').click(function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
var $form = $("#mainForm");
|
var $form = $("#mainForm");
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: $form.prop("method"),
|
type: $form.prop("method"),
|
||||||
url: "/test/cp",
|
url: "/test/cp",
|
||||||
|
@ -107,9 +170,13 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var $form = $("#mainForm");
|
var $form = $("#mainForm");
|
||||||
|
var qualityProfile = $("#profiles option:selected").val();
|
||||||
|
var data = $form.serialize();
|
||||||
|
data = data + "&profileId=" + qualityProfile;
|
||||||
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: $form.prop("method"),
|
type: $form.prop("method"),
|
||||||
data: $form.serialize(),
|
data: data,
|
||||||
url: $form.prop("action"),
|
url: $form.prop("action"),
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
@ -125,6 +192,6 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
Loading…
Add table
Add a link
Reference in a new issue