mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-11 15:56:05 -07:00
#254 MOSTLY DONE! At last, this took a while.
So currently if a series exists then we will correctly monitor the episodes selected. TODO: When the series doesn't exist in sonarr we need to add the series and then wait for the episode metadata to be populated. Also need to add in all of the regular checks and notification e.g. whitelist etc.
This commit is contained in:
parent
8b46925f08
commit
b14fd36ecd
21 changed files with 1380 additions and 861 deletions
|
@ -41,5 +41,11 @@ namespace PlexRequests.Api.Interfaces
|
|||
SystemStatus SystemStatus(string apiKey, Uri baseUrl);
|
||||
|
||||
List<Series> GetSeries(string apiKey, Uri baseUrl);
|
||||
Series GetSeries(string seriesId, string apiKey, Uri baseUrl);
|
||||
IEnumerable<SonarrEpisodes> GetEpisodes(string seriesId, string apiKey, Uri baseUrl);
|
||||
SonarrEpisode GetEpisode(string episodeId, string apiKey, Uri baseUrl);
|
||||
SonarrEpisode UpdateEpisode(SonarrEpisode episodeInfo, string apiKey, Uri baseUrl);
|
||||
SonarrAddEpisodeResult SearchForEpisodes(int[] episodeIds, string apiKey, Uri baseUrl);
|
||||
|
||||
}
|
||||
}
|
|
@ -78,8 +78,12 @@
|
|||
<Compile Include="SickRage\SickRageShowInformation.cs" />
|
||||
<Compile Include="SickRage\SickRageStatus.cs" />
|
||||
<Compile Include="SickRage\SickRageTvAdd.cs" />
|
||||
<Compile Include="Sonarr\SonarrAddEpisodeBody.cs" />
|
||||
<Compile Include="Sonarr\SonarrAddEpisodeResult.cs" />
|
||||
<Compile Include="Sonarr\SonarrAddSeries.cs" />
|
||||
<Compile Include="Sonarr\SonarrAllSeries.cs" />
|
||||
<Compile Include="Sonarr\SonarrEpisode.cs" />
|
||||
<Compile Include="Sonarr\SonarrEpisodes.cs" />
|
||||
<Compile Include="Sonarr\SonarrError.cs" />
|
||||
<Compile Include="Sonarr\SonarrProfile.cs" />
|
||||
<Compile Include="Sonarr\SystemStatus.cs" />
|
||||
|
|
34
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs
Normal file
34
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs
Normal file
|
@ -0,0 +1,34 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: SonarrAddEpisodeBody.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
|
||||
namespace PlexRequests.Api.Models.Sonarr
|
||||
{
|
||||
public class SonarrAddEpisodeBody
|
||||
{
|
||||
public string name { get; set; }
|
||||
public int[] episodeIds { get; set; }
|
||||
}
|
||||
}
|
58
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs
Normal file
58
PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs
Normal file
|
@ -0,0 +1,58 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: SonarrAddEpisodeResult.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.Sonarr
|
||||
{
|
||||
public class Body
|
||||
{
|
||||
public List<int> episodeIds { get; set; }
|
||||
public bool sendUpdatesToClient { get; set; }
|
||||
public bool updateScheduledTask { get; set; }
|
||||
public string completionMessage { get; set; }
|
||||
public string name { get; set; }
|
||||
public string trigger { get; set; }
|
||||
}
|
||||
|
||||
public class SonarrAddEpisodeResult
|
||||
{
|
||||
public string name { get; set; }
|
||||
public Body body { get; set; }
|
||||
public string priority { get; set; }
|
||||
public string status { get; set; }
|
||||
public string queued { get; set; }
|
||||
public string trigger { get; set; }
|
||||
public string state { get; set; }
|
||||
public bool manual { get; set; }
|
||||
public string startedOn { get; set; }
|
||||
public bool sendUpdatesToClient { get; set; }
|
||||
public bool updateScheduledTask { get; set; }
|
||||
public int id { get; set; }
|
||||
}
|
||||
|
||||
}
|
73
PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs
Normal file
73
PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs
Normal file
|
@ -0,0 +1,73 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: SonarrEpisode.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
|
||||
|
||||
namespace PlexRequests.Api.Models.Sonarr
|
||||
{
|
||||
|
||||
public class Revision
|
||||
{
|
||||
public int version { get; set; }
|
||||
public int real { get; set; }
|
||||
}
|
||||
|
||||
public class EpisodeFile
|
||||
{
|
||||
public int seriesId { get; set; }
|
||||
public int seasonNumber { get; set; }
|
||||
public string relativePath { get; set; }
|
||||
public string path { get; set; }
|
||||
public long size { get; set; }
|
||||
public string dateAdded { get; set; }
|
||||
public Quality quality { get; set; }
|
||||
public bool qualityCutoffNotMet { get; set; }
|
||||
public int id { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
public class SonarrEpisode
|
||||
{
|
||||
public int seriesId { get; set; }
|
||||
public int episodeFileId { get; set; }
|
||||
public int seasonNumber { get; set; }
|
||||
public int episodeNumber { get; set; }
|
||||
public string title { get; set; }
|
||||
public string airDate { get; set; }
|
||||
public string airDateUtc { get; set; }
|
||||
public string overview { get; set; }
|
||||
public EpisodeFile episodeFile { get; set; }
|
||||
public bool hasFile { get; set; }
|
||||
public bool monitored { get; set; }
|
||||
public int absoluteEpisodeNumber { get; set; }
|
||||
public bool unverifiedSceneNumbering { get; set; }
|
||||
public Series series { get; set; }
|
||||
public int id { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
47
PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs
Normal file
47
PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs
Normal file
|
@ -0,0 +1,47 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: SonarrEpisodes.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
|
||||
namespace PlexRequests.Api.Models.Sonarr
|
||||
{
|
||||
public class SonarrEpisodes
|
||||
{
|
||||
|
||||
public int seriesId { get; set; }
|
||||
public int episodeFileId { get; set; }
|
||||
public int seasonNumber { get; set; }
|
||||
public int episodeNumber { get; set; }
|
||||
public string title { get; set; }
|
||||
public string overview { get; set; }
|
||||
public bool hasFile { get; set; }
|
||||
public bool monitored { get; set; }
|
||||
public bool unverifiedSceneNumbering { get; set; }
|
||||
public int id { get; set; }
|
||||
public string airDate { get; set; }
|
||||
public string airDateUtc { get; set; }
|
||||
public int? absoluteEpisodeNumber { get; set; }
|
||||
}
|
||||
|
||||
}
|
|
@ -63,11 +63,11 @@ namespace PlexRequests.Api
|
|||
request.AddUrlSegment("imdbid", imdbid);
|
||||
request.AddUrlSegment("title", title);
|
||||
|
||||
var obj = RetryHandler.Execute(() => Api.ExecuteJson<JObject>(request, baseUrl), new[] {
|
||||
var obj = RetryHandler.Execute(() => Api.ExecuteJson<JObject>(request, baseUrl),
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling AddMovie for CP, Retrying {0}", timespan), new[] {
|
||||
TimeSpan.FromSeconds (2),
|
||||
TimeSpan.FromSeconds(5),
|
||||
TimeSpan.FromSeconds(10)},
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling AddMovie for CP, Retrying {0}", timespan));
|
||||
TimeSpan.FromSeconds(10)});
|
||||
|
||||
|
||||
if (obj.Count > 0)
|
||||
|
@ -103,11 +103,11 @@ namespace PlexRequests.Api
|
|||
request.AddUrlSegment("apikey", apiKey);
|
||||
|
||||
|
||||
var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url), new TimeSpan[] {
|
||||
var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url),
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (2),
|
||||
TimeSpan.FromSeconds(5),
|
||||
TimeSpan.FromSeconds(10)},
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan));
|
||||
TimeSpan.FromSeconds(10)});
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
@ -122,8 +122,8 @@ namespace PlexRequests.Api
|
|||
|
||||
request.AddUrlSegment("apikey", apiKey);
|
||||
|
||||
var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoProfiles>(request, url), null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for CP, Retrying {0}", timespan));
|
||||
var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoProfiles>(request, url),
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for CP, Retrying {0}", timespan), null);
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
@ -144,12 +144,11 @@ namespace PlexRequests.Api
|
|||
try
|
||||
{
|
||||
var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoMovies>(request, baseUrl),
|
||||
new[] {
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan), new[] {
|
||||
TimeSpan.FromSeconds (5),
|
||||
TimeSpan.FromSeconds(10),
|
||||
TimeSpan.FromSeconds(30)
|
||||
},
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
@ -172,8 +171,8 @@ namespace PlexRequests.Api
|
|||
request.AddUrlSegment("username", StringHasher.CalcuateMd5Hash(username));
|
||||
request.AddUrlSegment("password", StringHasher.CalcuateMd5Hash(password));
|
||||
|
||||
var obj = RetryHandler.Execute(() => Api.Execute<CoucPotatoApiKey>(request, baseUrl), null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetApiKey for CP, Retrying {0}", timespan));
|
||||
var obj = RetryHandler.Execute(() => Api.Execute<CoucPotatoApiKey>(request, baseUrl),
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetApiKey for CP, Retrying {0}", timespan), null);
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
|
|
@ -60,5 +60,30 @@ namespace PlexRequests.Api.Mocks
|
|||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public Series GetSeries(string seriesId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public IEnumerable<SonarrEpisodes> GetEpisodes(string seriesId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public SonarrEpisode GetEpisode(string episodeId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public SonarrEpisode UpdateEpisode(SonarrEpisode episodeInfo, string apiKey, Uri baseUrl)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public SonarrAddEpisodeResult SearchForEpisodes(int[] episodeIds, string apiKey, Uri baseUrl)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -81,8 +81,7 @@ namespace PlexRequests.Api
|
|||
request.AddJsonBody(userModel);
|
||||
|
||||
var obj = RetryHandler.Execute<PlexAuthentication>(() => Api.Execute<PlexAuthentication> (request, new Uri(SignInUri)),
|
||||
null,
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling SignIn for Plex, Retrying {0}", timespan));
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling SignIn for Plex, Retrying {0}", timespan), null);
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
@ -97,8 +96,7 @@ namespace PlexRequests.Api
|
|||
AddHeaders(ref request, authToken);
|
||||
|
||||
var users = RetryHandler.Execute(() => Api.ExecuteXml<PlexFriends> (request, new Uri(FriendsUri)),
|
||||
null,
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetUsers for Plex, Retrying {0}", timespan));
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetUsers for Plex, Retrying {0}", timespan), null);
|
||||
|
||||
|
||||
return users;
|
||||
|
@ -123,8 +121,7 @@ namespace PlexRequests.Api
|
|||
AddHeaders(ref request, authToken);
|
||||
|
||||
var search = RetryHandler.Execute<PlexSearch>(() => Api.ExecuteXml<PlexSearch> (request, plexFullHost),
|
||||
null,
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling SearchContent for Plex, Retrying {0}", timespan));
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling SearchContent for Plex, Retrying {0}", timespan), null);
|
||||
|
||||
return search;
|
||||
}
|
||||
|
@ -139,8 +136,7 @@ namespace PlexRequests.Api
|
|||
AddHeaders(ref request, authToken);
|
||||
|
||||
var users = RetryHandler.Execute<PlexStatus>(() => Api.ExecuteXml<PlexStatus> (request, uri),
|
||||
null,
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetStatus for Plex, Retrying {0}", timespan));
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetStatus for Plex, Retrying {0}", timespan), null);
|
||||
|
||||
return users;
|
||||
}
|
||||
|
@ -155,8 +151,7 @@ namespace PlexRequests.Api
|
|||
AddHeaders(ref request, authToken);
|
||||
|
||||
var account = RetryHandler.Execute<PlexAccount>(() => Api.ExecuteXml<PlexAccount> (request, new Uri(GetAccountUri)),
|
||||
null,
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetAccount for Plex, Retrying {0}", timespan));
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetAccount for Plex, Retrying {0}", timespan), null);
|
||||
|
||||
return account;
|
||||
}
|
||||
|
@ -174,12 +169,11 @@ namespace PlexRequests.Api
|
|||
try
|
||||
{
|
||||
var lib = RetryHandler.Execute<PlexLibraries>(() => Api.ExecuteXml<PlexLibraries> (request, plexFullHost),
|
||||
new TimeSpan[] {
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetLibrarySections for Plex, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (5),
|
||||
TimeSpan.FromSeconds(10),
|
||||
TimeSpan.FromSeconds(30)
|
||||
},
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetLibrarySections for Plex, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
return lib;
|
||||
}
|
||||
|
@ -204,12 +198,11 @@ namespace PlexRequests.Api
|
|||
try
|
||||
{
|
||||
var lib = RetryHandler.Execute<PlexSearch>(() => Api.ExecuteXml<PlexSearch> (request, plexFullHost),
|
||||
new TimeSpan[] {
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetLibrary for Plex, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (5),
|
||||
TimeSpan.FromSeconds(10),
|
||||
TimeSpan.FromSeconds(30)
|
||||
},
|
||||
(exception, timespan) => Log.Error (exception, "Exception when calling GetLibrary for Plex, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
return lib;
|
||||
}
|
||||
|
@ -234,12 +227,11 @@ namespace PlexRequests.Api
|
|||
try
|
||||
{
|
||||
var lib = RetryHandler.Execute(() => Api.ExecuteXml<PlexMetadata>(request, plexFullHost),
|
||||
new[] {
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetMetadata for Plex, Retrying {0}", timespan), new[] {
|
||||
TimeSpan.FromSeconds (5),
|
||||
TimeSpan.FromSeconds(10),
|
||||
TimeSpan.FromSeconds(30)
|
||||
},
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetMetadata for Plex, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
return lib;
|
||||
}
|
||||
|
|
|
@ -35,25 +35,29 @@ namespace PlexRequests.Api
|
|||
{
|
||||
private static readonly TimeSpan[] DefaultTime = { TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10) };
|
||||
|
||||
public static T Execute<T>(Func<T> action, TimeSpan[] timeSpan)
|
||||
{
|
||||
var policy = RetryAndWaitPolicy(timeSpan);
|
||||
|
||||
return policy.Execute(action);
|
||||
}
|
||||
|
||||
public static T Execute<T>(Func<T> func, TimeSpan[] timeSpan, Action<Exception, TimeSpan> action)
|
||||
public static T Execute<T>(Func<T> action, TimeSpan[] timeSpan = null)
|
||||
{
|
||||
if (timeSpan == null)
|
||||
{
|
||||
timeSpan = DefaultTime;
|
||||
}
|
||||
var policy = RetryAndWaitPolicy(timeSpan, action);
|
||||
var policy = RetryAndWaitPolicy(timeSpan);
|
||||
|
||||
return policy.Execute(action);
|
||||
}
|
||||
|
||||
public static T Execute<T>(Func<T> func, Action<Exception, TimeSpan> action, TimeSpan[] timeSpan = null)
|
||||
{
|
||||
if (timeSpan == null)
|
||||
{
|
||||
timeSpan = DefaultTime;
|
||||
}
|
||||
var policy = RetryAndWaitPolicy(action, timeSpan);
|
||||
|
||||
return policy.Execute(func);
|
||||
}
|
||||
|
||||
public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action action)
|
||||
public static RetryPolicy RetryAndWaitPolicy(Action action, TimeSpan[] timeSpan = null)
|
||||
{
|
||||
if (timeSpan == null)
|
||||
{
|
||||
|
@ -75,7 +79,7 @@ namespace PlexRequests.Api
|
|||
return policy;
|
||||
}
|
||||
|
||||
public static RetryPolicy RetryAndWaitPolicy(TimeSpan[] timeSpan, Action<Exception, TimeSpan> action)
|
||||
public static RetryPolicy RetryAndWaitPolicy(Action<Exception, TimeSpan> action, TimeSpan[] timeSpan = null)
|
||||
{
|
||||
if (timeSpan == null)
|
||||
{
|
||||
|
|
|
@ -62,9 +62,7 @@ namespace PlexRequests.Api
|
|||
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy(
|
||||
null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling VerifyShowHasLoaded for SR, Retrying {0}", timespan));
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling VerifyShowHasLoaded for SR, Retrying {0}", timespan), null);
|
||||
|
||||
var obj = policy.Execute(() => Api.ExecuteJson<SickRageSeasonList>(request, baseUrl));
|
||||
return obj;
|
||||
|
@ -95,9 +93,7 @@ namespace PlexRequests.Api
|
|||
request.AddQueryParameter("initial", quality);
|
||||
}
|
||||
|
||||
var policy = RetryHandler.RetryAndWaitPolicy(
|
||||
null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling AddSeries for SR, Retrying {0}", timespan));
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling AddSeries for SR, Retrying {0}", timespan), null);
|
||||
|
||||
var obj = policy.Execute(() => Api.Execute<SickRageTvAdd>(request, baseUrl));
|
||||
Log.Trace("obj Result:");
|
||||
|
@ -168,9 +164,7 @@ namespace PlexRequests.Api
|
|||
{
|
||||
var request = new RestRequest { Resource = "/api/{apiKey}/?cmd=sb.ping", Method = Method.GET };
|
||||
|
||||
var policy = RetryHandler.RetryAndWaitPolicy(
|
||||
null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling Ping for SR, Retrying {0}", timespan));
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling Ping for SR, Retrying {0}", timespan), null);
|
||||
|
||||
request.AddUrlSegment("apiKey", apiKey);
|
||||
var obj = policy.Execute(() => Api.ExecuteJson<SickRagePing>(request, baseUrl));
|
||||
|
@ -190,9 +184,7 @@ namespace PlexRequests.Api
|
|||
return await Task.Run(
|
||||
() =>
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy(
|
||||
null,
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling AddSeason for SR, Retrying {0}", timespan));
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling AddSeason for SR, Retrying {0}", timespan), null);
|
||||
|
||||
var result = policy.Execute(() => Api.Execute<SickRageTvAdd>(request, baseUrl));
|
||||
|
||||
|
@ -210,9 +202,7 @@ namespace PlexRequests.Api
|
|||
{
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy(
|
||||
new[] { TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30) },
|
||||
(exception, timespan) => Log.Error(exception, "Exception when calling GetShows for SR, Retrying {0}", timespan));
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetShows for SR, Retrying {0}", timespan), new[] { TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(30) });
|
||||
|
||||
return policy.Execute(() => Api.Execute<SickrageShows>(request, baseUrl));
|
||||
}
|
||||
|
|
|
@ -36,9 +36,6 @@ using PlexRequests.Api.Models.Sonarr;
|
|||
using PlexRequests.Helpers;
|
||||
|
||||
using RestSharp;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
using PlexRequests.Helpers.Exceptions;
|
||||
|
||||
namespace PlexRequests.Api
|
||||
{
|
||||
|
@ -56,11 +53,11 @@ namespace PlexRequests.Api
|
|||
var request = new RestRequest { Resource = "/api/profile", Method = Method.GET };
|
||||
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
var policy = RetryHandler.RetryAndWaitPolicy (new TimeSpan[] {
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetProfiles for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (2),
|
||||
TimeSpan.FromSeconds(5),
|
||||
TimeSpan.FromSeconds(10)
|
||||
}, (exception, timespan) => Log.Error (exception, "Exception when calling GetProfiles for Sonarr, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
var obj = policy.Execute(() => Api.ExecuteJson<List<SonarrProfile>>(request, baseUrl));
|
||||
|
||||
|
@ -107,11 +104,11 @@ namespace PlexRequests.Api
|
|||
SonarrAddSeries result;
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy (new TimeSpan[] {
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling AddSeries for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (2),
|
||||
TimeSpan.FromSeconds(5),
|
||||
TimeSpan.FromSeconds(10)
|
||||
}, (exception, timespan) => Log.Error (exception, "Exception when calling AddSeries for Sonarr, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
result = policy.Execute(() => Api.ExecuteJson<SonarrAddSeries>(request, baseUrl));
|
||||
}
|
||||
|
@ -132,11 +129,11 @@ namespace PlexRequests.Api
|
|||
var request = new RestRequest { Resource = "/api/system/status", Method = Method.GET };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
|
||||
var policy = RetryHandler.RetryAndWaitPolicy (new TimeSpan[] {
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling SystemStatus for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (2),
|
||||
TimeSpan.FromSeconds(5),
|
||||
TimeSpan.FromSeconds(10)
|
||||
}, (exception, timespan) => Log.Error (exception, "Exception when calling SystemStatus for Sonarr, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
var obj = policy.Execute(() => Api.ExecuteJson<SystemStatus>(request, baseUrl));
|
||||
|
||||
|
@ -149,11 +146,11 @@ namespace PlexRequests.Api
|
|||
request.AddHeader("X-Api-Key", apiKey);
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy (new TimeSpan[] {
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) => Log.Error(exception, "Exception when calling GetSeries for Sonarr, Retrying {0}", timespan), new TimeSpan[] {
|
||||
TimeSpan.FromSeconds (5),
|
||||
TimeSpan.FromSeconds(10),
|
||||
TimeSpan.FromSeconds(30)
|
||||
}, (exception, timespan) => Log.Error (exception, "Exception when calling GetSeries for Sonarr, Retrying {0}", timespan));
|
||||
});
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<List<Series>>(request, baseUrl));
|
||||
}
|
||||
|
@ -163,5 +160,140 @@ namespace PlexRequests.Api
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public Series GetSeries(string seriesId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
var request = new RestRequest { Resource = "/api/series/{seriesId}", Method = Method.GET };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
request.AddUrlSegment("seriesId", seriesId);
|
||||
try
|
||||
{
|
||||
var policy =
|
||||
RetryHandler.RetryAndWaitPolicy(
|
||||
(exception, timespan) =>
|
||||
Log.Error(exception, "Exception when calling GetSeries by ID for Sonarr, Retrying {0}",
|
||||
timespan));
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<Series>(request, baseUrl));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, "There has been an API exception when getting the Sonarr Series by ID");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns all episodes for the given series.
|
||||
/// </summary>
|
||||
/// <param name="seriesId">The series identifier.</param>
|
||||
/// <param name="apiKey">The API key.</param>
|
||||
/// <param name="baseUrl">The base URL.</param>
|
||||
/// <returns></returns>
|
||||
public IEnumerable<SonarrEpisodes> GetEpisodes(string seriesId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
var request = new RestRequest { Resource = "/api/Episode", Method = Method.GET };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
request.AddQueryParameter("seriesId", seriesId);
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
||||
Log.Error(exception, "Exception when calling GetEpisodes for Sonarr, Retrying {0}", timespan));
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<List<SonarrEpisodes>>(request, baseUrl));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, "There has been an API exception when getting the Sonarr GetEpisodes");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the episode with the matching id.
|
||||
/// </summary>
|
||||
/// <param name="episodeId">The episode identifier.</param>
|
||||
/// <param name="apiKey">The API key.</param>
|
||||
/// <param name="baseUrl">The base URL.</param>
|
||||
/// <returns></returns>
|
||||
public SonarrEpisode GetEpisode(string episodeId, string apiKey, Uri baseUrl)
|
||||
{
|
||||
var request = new RestRequest { Resource = "/api/Episode/{episodeId}", Method = Method.GET };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
request.AddUrlSegment("episodeId", episodeId);
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
||||
Log.Error(exception, "Exception when calling GetEpisode by ID for Sonarr, Retrying {0}", timespan));
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<SonarrEpisode>(request, baseUrl));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, "There has been an API exception when getting the Sonarr GetEpisode by ID");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Update the given episodes, currently only monitored is changed, all other modifications are ignored.
|
||||
/// Required: All parameters (you should perform a GET/{id} and submit the full body with the changes, as other values may be editable in the future.
|
||||
/// </summary>
|
||||
/// <param name="episodeInfo">The episode information.</param>
|
||||
/// <param name="apiKey">The API key.</param>
|
||||
/// <param name="baseUrl">The base URL.</param>
|
||||
/// <returns></returns>
|
||||
public SonarrEpisode UpdateEpisode(SonarrEpisode episodeInfo, string apiKey, Uri baseUrl)
|
||||
{
|
||||
var request = new RestRequest { Resource = "/api/Episode", Method = Method.PUT };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
request.AddJsonBody(episodeInfo);
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
||||
Log.Error(exception, "Exception when calling UpdateEpisode for Sonarr, Retrying {0}", timespan));
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<SonarrEpisode>(request, baseUrl));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, "There has been an API exception when put the Sonarr UpdateEpisode");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Search for one or more episodes
|
||||
/// </summary>
|
||||
/// <param name="episodeIds">The episode ids.</param>
|
||||
/// <param name="apiKey">The API key.</param>
|
||||
/// <param name="baseUrl">The base URL.</param>
|
||||
/// <returns></returns>
|
||||
public SonarrAddEpisodeResult SearchForEpisodes(int[] episodeIds, string apiKey, Uri baseUrl)
|
||||
{
|
||||
var request = new RestRequest { Resource = "/api/Command", Method = Method.POST };
|
||||
request.AddHeader("X-Api-Key", apiKey);
|
||||
|
||||
var body = new SonarrAddEpisodeBody
|
||||
{
|
||||
name = "EpisodeSearch",
|
||||
episodeIds = episodeIds
|
||||
};
|
||||
|
||||
request.AddJsonBody(body);
|
||||
|
||||
try
|
||||
{
|
||||
var policy = RetryHandler.RetryAndWaitPolicy((exception, timespan) =>
|
||||
Log.Error(exception, "Exception when calling SearchForEpisodes for Sonarr, Retrying {0}", timespan));
|
||||
|
||||
return policy.Execute(() => Api.ExecuteJson<SonarrAddEpisodeResult>(request, baseUrl));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Error(e, "There has been an API exception when put the Sonarr SearchForEpisodes");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -121,19 +121,20 @@ namespace PlexRequests.UI
|
|||
{
|
||||
Debug.WriteLine("Configuring the conventions");
|
||||
base.ConfigureConventions(nancyConventions);
|
||||
Debug.WriteLine("Finished BASE");
|
||||
|
||||
var settingsService = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
|
||||
var settings = settingsService.GetSettings();
|
||||
var assetLocation = settings.BaseUrl ?? string.Empty;
|
||||
var assetLocation = string.Empty;
|
||||
if (!string.IsNullOrEmpty(settings.BaseUrl))
|
||||
{
|
||||
assetLocation = $"{settings.BaseUrl}/";
|
||||
}
|
||||
|
||||
Debug.WriteLine($"AssetLocation {assetLocation}");
|
||||
nancyConventions.StaticContentsConventions.Add(
|
||||
StaticContentConventionBuilder.AddDirectory($"{assetLocation}/Content_{AssemblyHelper.GetProductVersion()}", "Content")
|
||||
);
|
||||
Debug.WriteLine("Added Content");
|
||||
nancyConventions.StaticContentsConventions.AddDirectory($"{assetLocation}/docs", "swagger-ui");
|
||||
|
||||
nancyConventions.StaticContentsConventions.AddDirectory($"{assetLocation}/fonts", "Content/fonts");
|
||||
nancyConventions.StaticContentsConventions.AddDirectory($"{assetLocation}Content", "Content");
|
||||
nancyConventions.StaticContentsConventions.AddDirectory($"{assetLocation}docs", "swagger-ui");
|
||||
nancyConventions.StaticContentsConventions.AddDirectory($"{assetLocation}fonts", "Content/fonts");
|
||||
}
|
||||
|
||||
protected override DiagnosticsConfiguration DiagnosticsConfiguration => new DiagnosticsConfiguration { Password = @"password" };
|
||||
|
@ -173,7 +174,6 @@ Debug.WriteLine("Added Content");
|
|||
|
||||
protected override void RequestStartup(IKernel container, IPipelines pipelines, NancyContext context)
|
||||
{
|
||||
Debug.WriteLine("RequestStartup");
|
||||
//CORS Enable
|
||||
pipelines.AfterRequest.AddItemToEndOfPipeline((ctx) =>
|
||||
{
|
||||
|
|
39
PlexRequests.UI/Content/search.js
vendored
39
PlexRequests.UI/Content/search.js
vendored
|
@ -538,6 +538,7 @@ $(function () {
|
|||
});
|
||||
|
||||
$('#episodesModal').on('show.bs.modal', function (event) {
|
||||
finishLoading("episodesRequest", "primary");
|
||||
var button = $(event.relatedTarget); // Button that triggered the modal
|
||||
var id = button.data('identifier'); // Extract info from data-* attributes
|
||||
var url = createBaseUrl(base, '/search/episodes/');
|
||||
|
@ -552,8 +553,6 @@ $(function () {
|
|||
$content.html("");
|
||||
$('#selectedEpisodeId').val(id);
|
||||
results.forEach(function (result) {
|
||||
|
||||
|
||||
var episodes = buildEpisodesView(result);
|
||||
|
||||
if (!seenSeasons.find(x => x === episodes.season)) {
|
||||
|
@ -572,6 +571,42 @@ $(function () {
|
|||
}
|
||||
});
|
||||
|
||||
// Save Modal click
|
||||
$("#episodesRequest").click(function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
var tvId = $('#selectedEpisodeId').val();
|
||||
|
||||
$("#episodesRequest").prop("disabled", true);
|
||||
loadingButton("episodesRequest", "primary");
|
||||
|
||||
|
||||
var $form = $('#form' + tvId);
|
||||
|
||||
var model = [];
|
||||
|
||||
|
||||
|
||||
var $checkedEpisodes = $('.selectedEpisodes:checkbox:checked');
|
||||
$checkedEpisodes.each(function (index, element) {
|
||||
var $element = $('#' + element.id);
|
||||
var tempObj = {};
|
||||
tempObj.episodeNumber = $element.attr("epNumber");
|
||||
tempObj.seasonNumber = $element.attr("epSeason");
|
||||
model.push(tempObj);
|
||||
});
|
||||
|
||||
var finalObj = {
|
||||
ShowId: tvId,
|
||||
Episodes: model
|
||||
}
|
||||
|
||||
var url = createBaseUrl(mainBaseUrl, "search/request/tvEpisodes");
|
||||
var type = $form.prop('method');
|
||||
|
||||
sendRequestAjax(JSON.stringify(finalObj), type, url, tvId);
|
||||
});
|
||||
|
||||
function buildSeasonsContext(result) {
|
||||
var context = {
|
||||
id: result
|
||||
|
|
2
PlexRequests.UI/Content/site.js
vendored
2
PlexRequests.UI/Content/site.js
vendored
|
@ -8,6 +8,8 @@
|
|||
return s;
|
||||
}
|
||||
|
||||
var mainBaseUrl = $('#baseUrl').text();
|
||||
|
||||
function Humanize(date) {
|
||||
var mNow = moment();
|
||||
var mDate = moment(date).local();
|
||||
|
|
|
@ -73,7 +73,7 @@ namespace PlexRequests.UI.Helpers
|
|||
if (settings.ThemeName == "PlexBootstrap.css") settings.ThemeName = Themes.PlexTheme;
|
||||
if (settings.ThemeName == "OriginalBootstrap.css") settings.ThemeName = Themes.OriginalTheme;
|
||||
|
||||
var startUrl = $"{content}/Content_{Assembly}";
|
||||
var startUrl = $"{content}/Content";
|
||||
|
||||
var styleAssets = new List<string>
|
||||
{
|
||||
|
@ -123,7 +123,7 @@ namespace PlexRequests.UI.Helpers
|
|||
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
sb.AppendLine($"<script src=\"{content}/Content_{Assembly}/search.js\" type=\"text/javascript\"></script>");
|
||||
sb.AppendLine($"<script src=\"{content}/Content/search.js\" type=\"text/javascript\"></script>");
|
||||
|
||||
return helper.Raw(sb.ToString());
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ namespace PlexRequests.UI.Helpers
|
|||
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
sb.AppendLine($"<script src=\"{content}/Content_{Assembly}/requests.js\" type=\"text/javascript\"></script>");
|
||||
sb.AppendLine($"<script src=\"{content}/Content/requests.js\" type=\"text/javascript\"></script>");
|
||||
|
||||
return helper.Raw(sb.ToString());
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ namespace PlexRequests.UI.Helpers
|
|||
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
sb.AppendLine($"<script src=\"{content}/Content_{Assembly}/issues.js\" type=\"text/javascript\"></script>");
|
||||
sb.AppendLine($"<script src=\"{content}/Content/issues.js\" type=\"text/javascript\"></script>");
|
||||
|
||||
return helper.Raw(sb.ToString());
|
||||
}
|
||||
|
@ -157,7 +157,7 @@ namespace PlexRequests.UI.Helpers
|
|||
var assetLocation = GetBaseUrl();
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
var asset = $"<script src=\"{content}/Content_{Assembly}/issue-details.js\" type=\"text/javascript\"></script>";
|
||||
var asset = $"<script src=\"{content}/Content/issue-details.js\" type=\"text/javascript\"></script>";
|
||||
|
||||
return helper.Raw(asset);
|
||||
}
|
||||
|
@ -169,8 +169,8 @@ namespace PlexRequests.UI.Helpers
|
|||
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
sb.AppendLine($"<script src=\"{content}/Content_{Assembly}/datatables.min.js\" type=\"text/javascript\"></script>");
|
||||
sb.AppendLine($"<link rel=\"stylesheet\" type=\"text/css\" href=\"{content}/Content_{Assembly}/dataTables.bootstrap.css\" />");
|
||||
sb.AppendLine($"<script src=\"{content}/Content/datatables.min.js\" type=\"text/javascript\"></script>");
|
||||
sb.AppendLine($"<link rel=\"stylesheet\" type=\"text/css\" href=\"{content}/Content/dataTables.bootstrap.css\" />");
|
||||
|
||||
return helper.Raw(sb.ToString());
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ namespace PlexRequests.UI.Helpers
|
|||
var assetLocation = GetBaseUrl();
|
||||
var content = GetContentUrl(assetLocation);
|
||||
|
||||
var asset = $"<script src=\"{content}/Content_{Assembly}/analytics.js\" type=\"text/javascript\"></script>";
|
||||
var asset = $"<script src=\"{content}/Content/analytics.js\" type=\"text/javascript\"></script>";
|
||||
|
||||
return helper.Raw(asset);
|
||||
}
|
||||
|
|
|
@ -44,8 +44,6 @@ namespace PlexRequests.UI.Helpers
|
|||
/// </summary>
|
||||
public IEnumerable<IBinding> Resolve(Multimap<Type, IBinding> bindings, Type service)
|
||||
{
|
||||
Debug.WriteLine("Contrar thing");
|
||||
|
||||
if (service.IsGenericType)
|
||||
{
|
||||
var genericType = service.GetGenericTypeDefinition();
|
||||
|
@ -56,12 +54,24 @@ namespace PlexRequests.UI.Helpers
|
|||
}
|
||||
if (genericArguments.Length == 1 && genericArguments.Single().GenericParameterAttributes.HasFlag(GenericParameterAttributes.Contravariant))
|
||||
{
|
||||
var argument = service.GetGenericArguments().Single();
|
||||
var argument = service.GetGenericArguments().FirstOrDefault();
|
||||
if (argument == null)
|
||||
{
|
||||
return Enumerable.Empty<IBinding>();
|
||||
}
|
||||
|
||||
var matches =
|
||||
bindings.Where(
|
||||
kvp =>
|
||||
kvp.Key.IsGenericType && kvp.Key.GetGenericTypeDefinition() == genericType && kvp.Key.GetGenericArguments().Single() != argument
|
||||
&& kvp.Key.GetGenericArguments().Single().IsAssignableFrom(argument)).SelectMany(kvp => kvp.Value);
|
||||
{
|
||||
var assignableFrom = kvp.Key.GetGenericArguments().FirstOrDefault();
|
||||
|
||||
return kvp.Key.IsGenericType && kvp.Key.GetGenericTypeDefinition() == genericType &&
|
||||
kvp.Key.GetGenericArguments().FirstOrDefault() != argument
|
||||
&& assignableFrom.IsAssignableFrom(argument);
|
||||
|
||||
|
||||
}).SelectMany(kvp => kvp.Value);
|
||||
return matches;
|
||||
}
|
||||
}
|
||||
|
|
41
PlexRequests.UI/Models/EpisodeRequestModel.cs
Normal file
41
PlexRequests.UI/Models/EpisodeRequestModel.cs
Normal file
|
@ -0,0 +1,41 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: EpisodeRequestModel.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
|
||||
namespace PlexRequests.UI.Models
|
||||
{
|
||||
public class EpisodeRequestModel
|
||||
{
|
||||
public int ShowId { get; set; }
|
||||
public EpisodesModel[] Episodes { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public class EpisodesModel
|
||||
{
|
||||
public int SeasonNumber { get; set; }
|
||||
public int EpisodeNumber { get; set; }
|
||||
}
|
||||
}
|
|
@ -49,8 +49,10 @@ using PlexRequests.UI.Models;
|
|||
using System.Threading.Tasks;
|
||||
|
||||
using Nancy.Extensions;
|
||||
using Nancy.ModelBinding;
|
||||
using Nancy.Responses;
|
||||
|
||||
using Newtonsoft.Json;
|
||||
using PlexRequests.Api.Models.Sonarr;
|
||||
using PlexRequests.Api.Models.Tv;
|
||||
using PlexRequests.Core.Models;
|
||||
using PlexRequests.Helpers.Analytics;
|
||||
|
@ -103,7 +105,7 @@ namespace PlexRequests.UI.Modules
|
|||
TvApi = new TvMazeApi();
|
||||
|
||||
|
||||
Get["SearchIndex","/", true] = async (x, ct) => await RequestLoad();
|
||||
Get["SearchIndex", "/", true] = async (x, ct) => await RequestLoad();
|
||||
|
||||
Get["movie/{searchTerm}", true] = async (x, ct) => await SearchMovie((string)x.searchTerm);
|
||||
Get["tv/{searchTerm}", true] = async (x, ct) => await SearchTvShow((string)x.searchTerm);
|
||||
|
@ -115,6 +117,7 @@ namespace PlexRequests.UI.Modules
|
|||
|
||||
Post["request/movie", true] = async (x, ct) => await RequestMovie((int)Request.Form.movieId);
|
||||
Post["request/tv", true] = async (x, ct) => await RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons);
|
||||
Post["request/tvEpisodes", true] = async (x, ct) => await RequestEpisodes();
|
||||
Post["request/album", true] = async (x, ct) => await RequestAlbum((string)Request.Form.albumId);
|
||||
|
||||
Post["/notifyuser", true] = async (x, ct) => await NotifyUser((bool)Request.Form.notify);
|
||||
|
@ -533,9 +536,8 @@ namespace PlexRequests.UI.Modules
|
|||
return Response.AsJson(new JsonResponseModel { Result = false, Message = Resources.UI.Search_WeeklyRequestLimitTVShow });
|
||||
}
|
||||
Analytics.TrackEventAsync(Category.Search, Action.Request, "TvShow", Username, CookieHelper.GetAnalyticClientId(Cookies));
|
||||
var tvApi = new TvMazeApi();
|
||||
|
||||
var showInfo = tvApi.ShowLookupByTheTvDbId(showId);
|
||||
var showInfo = TvApi.ShowLookupByTheTvDbId(showId);
|
||||
DateTime firstAir;
|
||||
DateTime.TryParse(showInfo.premiered, out firstAir);
|
||||
string fullShowName = $"{showInfo.name} ({firstAir.Year})";
|
||||
|
@ -954,5 +956,65 @@ namespace PlexRequests.UI.Modules
|
|||
|
||||
return Response.AsJson(new JsonResponseModel { Result = true, Message = message });
|
||||
}
|
||||
|
||||
private async Task<Response> RequestEpisodes()
|
||||
{
|
||||
var req = (Dictionary<string, object>.ValueCollection)this.Request.Form.Values;
|
||||
var json = req.FirstOrDefault().ToString();
|
||||
var model = JsonConvert.DeserializeObject<EpisodeRequestModel>(json);
|
||||
//var model = this.Bind<EpisodeRequestModel>();
|
||||
if (model == null)
|
||||
{
|
||||
return Nancy.Response.NoBody;
|
||||
}
|
||||
var sonarrSettings = await SonarrService.GetSettingsAsync();
|
||||
if (!sonarrSettings.Enabled)
|
||||
{
|
||||
return Response.AsJson("Need sonarr");
|
||||
}
|
||||
|
||||
var existingRequest = await RequestService.CheckRequestAsync(model.ShowId);
|
||||
|
||||
|
||||
|
||||
|
||||
// Find the correct series
|
||||
var task = await Task.Run(() => SonarrApi.GetSeries(sonarrSettings.ApiKey, sonarrSettings.FullUri)).ConfigureAwait(false);
|
||||
var selectedSeries = task.FirstOrDefault(series => series.tvdbId == model.ShowId);
|
||||
if (selectedSeries == null)
|
||||
{
|
||||
|
||||
// Need to add the series as unmonitored.
|
||||
return Response.AsJson("");
|
||||
}
|
||||
|
||||
// Show Exists
|
||||
// Look up all episodes
|
||||
var episodes = SonarrApi.GetEpisodes(selectedSeries.id.ToString(), sonarrSettings.ApiKey, sonarrSettings.FullUri).ToList();
|
||||
var internalEpisodeIds = new List<int>();
|
||||
var tasks = new List<Task>();
|
||||
foreach (var r in model.Episodes)
|
||||
{
|
||||
var episode =
|
||||
episodes.FirstOrDefault(
|
||||
x => x.episodeNumber == r.EpisodeNumber && x.seasonNumber == r.SeasonNumber);
|
||||
if (episode == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
var episodeInfo = SonarrApi.GetEpisode(episode.id.ToString(), sonarrSettings.ApiKey, sonarrSettings.FullUri);
|
||||
episodeInfo.monitored = true; // Set the episode to monitored
|
||||
tasks.Add(Task.Run(() => SonarrApi.UpdateEpisode(episodeInfo, sonarrSettings.ApiKey,
|
||||
sonarrSettings.FullUri)));
|
||||
internalEpisodeIds.Add(episode.id);
|
||||
}
|
||||
Task.WaitAll(tasks.ToArray());
|
||||
|
||||
SonarrApi.SearchForEpisodes(internalEpisodeIds.ToArray(), sonarrSettings.ApiKey, sonarrSettings.FullUri);
|
||||
|
||||
|
||||
return Response.AsJson(new JsonResponseModel() { Result = true });
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -200,6 +200,7 @@
|
|||
<Compile Include="ModelDataProviders\UserUpdateViewModelDataProvider.cs" />
|
||||
<Compile Include="ModelDataProviders\RequestedModelDataProvider.cs" />
|
||||
<Compile Include="Models\DatatablesModel.cs" />
|
||||
<Compile Include="Models\EpisodeRequestModel.cs" />
|
||||
<Compile Include="Models\IssuesDetailsViewModel.cs" />
|
||||
<Compile Include="Models\IssuesViewMOdel.cs" />
|
||||
<Compile Include="Models\JsonUpdateAvailableModel.cs" />
|
||||
|
|
|
@ -172,15 +172,17 @@
|
|||
<div class="col-sm-2 col-sm-push-3">
|
||||
<form method="POST" action="@url/search/request/{{type}}" id="form{{id}}">
|
||||
<input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
|
||||
{{#if_eq type "movie"}}
|
||||
{{#if_eq available true}}
|
||||
<button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button>
|
||||
{{else}}
|
||||
{{#if_eq requested true}}
|
||||
<button style="text-align: right" class="btn btn-primary-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Requested</button>
|
||||
{{else}}
|
||||
{{#if_eq type "movie"}}
|
||||
<button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMovie" type="submit"><i class="fa fa-plus"></i> @UI.Search_Request</button>
|
||||
{{/if_eq}}
|
||||
{{/if_eq}}
|
||||
{{/if_eq}}
|
||||
{{#if_eq type "tv"}}
|
||||
<div class="dropdown">
|
||||
<button id="{{id}}" class="btn btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||
|
@ -196,8 +198,7 @@
|
|||
</ul>
|
||||
</div>
|
||||
{{/if_eq}}
|
||||
{{/if_eq}}
|
||||
{{/if_eq}}
|
||||
|
||||
|
||||
<br />
|
||||
</form>
|
||||
|
@ -304,6 +305,7 @@
|
|||
</div>
|
||||
|
||||
<div hidden="hidden" id="selectedEpisodeId"></div>
|
||||
<div hidden="hidden" id="episodeTvID"></div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">@UI.Common_Close</button>
|
||||
<button type="button" id="episodesRequest" class="btn btn-primary">@UI.Search_Request</button>
|
||||
|
@ -345,7 +347,9 @@
|
|||
</script>
|
||||
|
||||
<script id="seasonNumber-template" type="text/x-handlebars-template">
|
||||
<div class="row"></div>
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
<div id="seasonNumber{{seasonNumber}}">
|
||||
<strong>@UI.Search_Season {{seasonNumber}}</strong>
|
||||
</div>
|
||||
|
@ -357,7 +361,7 @@
|
|||
<script id="episode-template" type="text/x-handlebars-template">
|
||||
<div class="form-group col-md-6">
|
||||
<div class="checkbox" style="margin-bottom:0px; margin-top:0px;">
|
||||
<input type="checkbox" class="selectedEpisodes" id="{{id}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
<input type="checkbox" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue