diff --git a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs index 708ecf68f..7716204dc 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using Newtonsoft.Json; +using Newtonsoft.Json; using PlexRequests.Helpers; namespace PlexRequests.Api.Models.SickRage @@ -8,26 +6,6 @@ namespace PlexRequests.Api.Models.SickRage public class SickRageSeasonList : SickRageBase { [JsonIgnore] - public int[] Data => ParseObjectToArray(data); - - protected T[] ParseObjectToArray(object ambiguousObject) - { - var json = ambiguousObject.ToString(); - if (string.IsNullOrWhiteSpace(json)) - { - return new T[0]; // Could return null here instead. - } - if (json.TrimStart().StartsWith("[")) - { - return JsonConvert.DeserializeObject(json); - } - if (json.TrimStart().Equals("{}")) - { - return new T[0]; - } - - return new T[1] { JsonConvert.DeserializeObject(json) }; - - } + public int[] Data => JsonConvertHelper.ParseObjectToArray(data); } } \ No newline at end of file diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs index 68ba4a2af..d3c26066c 100644 --- a/PlexRequests.Api/ApiRequest.cs +++ b/PlexRequests.Api/ApiRequest.cs @@ -60,6 +60,8 @@ namespace PlexRequests.Api var client = new RestClient { BaseUrl = baseUri }; var response = client.Execute(request); + Log.Trace("Api Content Response:"); + Log.Trace(response.Content); if (response.ErrorException != null) { @@ -68,7 +70,6 @@ namespace PlexRequests.Api } return response.Data; - } public IRestResponse Execute(IRestRequest request, Uri baseUri) @@ -107,15 +108,17 @@ namespace PlexRequests.Api var client = new RestClient { BaseUrl = baseUri }; var response = client.Execute(request); - + Log.Trace("Api Content Response:"); + Log.Trace(response.Content); if (response.ErrorException != null) { var message = "Error retrieving response. Check inner details for more info."; throw new ApplicationException(message, response.ErrorException); } - + Log.Trace("Deserialzing Object"); var json = JsonConvert.DeserializeObject(response.Content, Settings); + Log.Trace("Finished Deserialzing Object"); return json; } diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index e344d4b26..4967875b9 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -28,6 +28,7 @@ #endregion using System; +using System.ComponentModel; using System.Diagnostics; using System.Linq; using System.Threading; @@ -55,9 +56,13 @@ namespace PlexRequests.Api public async Task AddSeries(int tvdbId, int seasonCount, int[] seasons, string quality, string apiKey, Uri baseUrl) { + var futureStatus = seasons.Length > 0 && !seasons.Any(x => x == seasonCount) ? SickRageStatus.Skipped : SickRageStatus.Wanted; var status = seasons.Length > 0 ? SickRageStatus.Skipped : SickRageStatus.Wanted; + Log.Trace("Future Status: {0}", futureStatus); + Log.Trace("Current Status: {0}", status); + var request = new RestRequest { Resource = "/api/{apiKey}/?cmd=show.addnew", @@ -69,10 +74,15 @@ namespace PlexRequests.Api request.AddQueryParameter("future_status", futureStatus); if (!quality.Equals("default", StringComparison.CurrentCultureIgnoreCase)) { + Log.Trace("Settings quality to {0}", quality); request.AddQueryParameter("initial", quality); } + Log.Trace("Entering `Execute`"); var obj = Api.Execute(request, baseUrl); + Log.Trace("Exiting `Execute`"); + Log.Trace("obj Result:"); + Log.Trace(obj.DumpJson()); if (obj.result != "failure") { @@ -81,11 +91,13 @@ namespace PlexRequests.Api var seasonIncrement = 0; var seasonList = new SickRageSeasonList(); + Log.Trace("while (seasonIncrement < seasonCount) where seasonCount = {0}", seasonCount); while (seasonIncrement < seasonCount) { seasonList = VerifyShowHasLoaded(tvdbId, apiKey, baseUrl); seasonIncrement = seasonList.Data?.Length ?? 0; - + Log.Trace("New seasonIncrement -> {0}", seasonIncrement); + if (sw.ElapsedMilliseconds > 30000) // Break out after 30 seconds, it's not going to get added { Log.Warn("Couldn't find out if the show had been added after 10 seconds. I doubt we can change the status to wanted."); @@ -94,17 +106,29 @@ namespace PlexRequests.Api } sw.Stop(); } - if (seasons.Length > 0) + Log.Trace("seasons.Length > 0 where seasons.Len -> {0}", seasons.Length); + try { - //handle the seasons requested - foreach (var s in seasons) + if (seasons.Length > 0) { - var result = await AddSeason(tvdbId, s, apiKey, baseUrl); - Log.Trace("SickRage adding season results: "); - Log.Trace(result.DumpJson()); + //handle the seasons requested + foreach (var s in seasons) + { + Log.Trace("Adding season {0}", s); + var result = await AddSeason(tvdbId, s, apiKey, baseUrl); + Log.Trace("SickRage adding season results: "); + Log.Trace(result.DumpJson()); + } } } + catch (Exception e) + { + Log.Trace("Exception when adding seasons:"); + Log.Error(e); + throw; + } + Log.Trace("Finished with the API, returning the obj"); return obj; } @@ -124,6 +148,7 @@ namespace PlexRequests.Api public SickRageSeasonList VerifyShowHasLoaded(int tvdbId, string apiKey, Uri baseUrl) { + Log.Trace("Entered `VerifyShowHasLoaded({0} <- id)`", tvdbId); var request = new RestRequest { Resource = "/api/{apiKey}/?cmd=show.seasonlist", @@ -134,7 +159,9 @@ namespace PlexRequests.Api try { + Log.Trace("Entering `ExecuteJson`"); var obj = Api.ExecuteJson(request, baseUrl); + Log.Trace("Exited `ExecuteJson`"); return obj; } catch (Exception e) @@ -157,7 +184,14 @@ namespace PlexRequests.Api request.AddQueryParameter("status", SickRageStatus.Wanted); await Task.Run(() => Thread.Sleep(2000)); - return await Task.Run(() => Api.Execute(request, baseUrl)).ConfigureAwait(false); + return await Task.Run(() => + { + Log.Trace("Entering `Execute` in a new `Task`"); + var result = Api.Execute(request, baseUrl); + + Log.Trace("Exiting `Execute` and yeilding `Task` result"); + return result; + }).ConfigureAwait(false); } } } \ No newline at end of file diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs index 76fd2cbb6..91b9be55e 100644 --- a/PlexRequests.Api/SonarrApi.cs +++ b/PlexRequests.Api/SonarrApi.cs @@ -105,7 +105,9 @@ namespace PlexRequests.Api { Log.Error(jse); var error = Api.ExecuteJson>(request, baseUrl); - result = new SonarrAddSeries { ErrorMessages = error.Select(x => x.errorMessage).ToList() }; + var messages = error?.Select(x => x.errorMessage).ToList(); + messages?.ForEach(x => Log.Error(x)); + result = new SonarrAddSeries { ErrorMessages = messages }; } return result; diff --git a/PlexRequests.Helpers/JsonConvertHelper.cs b/PlexRequests.Helpers/JsonConvertHelper.cs new file mode 100644 index 000000000..9762e1363 --- /dev/null +++ b/PlexRequests.Helpers/JsonConvertHelper.cs @@ -0,0 +1,54 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: JsonConvertHelper.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 Newtonsoft.Json; + +namespace PlexRequests.Helpers +{ + public static class JsonConvertHelper + { + public static T[] ParseObjectToArray(object ambiguousObject) + { + var json = ambiguousObject.ToString(); + if (string.IsNullOrWhiteSpace(json)) + { + return new T[0]; // Could return null here instead. + } + if (json.TrimStart().StartsWith("[")) + { + return JsonConvert.DeserializeObject(json); + } + if (json.TrimStart().Equals("{}")) + { + return new T[0]; + } + + return new T[1] { JsonConvert.DeserializeObject(json) }; + + } + } +} \ No newline at end of file diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj index b2bf29a0a..d936a71d3 100644 --- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj +++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj @@ -56,6 +56,7 @@ + diff --git a/PlexRequests.UI/Helpers/TvSender.cs b/PlexRequests.UI/Helpers/TvSender.cs index c4edac50f..a00851ec4 100644 --- a/PlexRequests.UI/Helpers/TvSender.cs +++ b/PlexRequests.UI/Helpers/TvSender.cs @@ -77,11 +77,16 @@ namespace PlexRequests.UI.Helpers public SickRageTvAdd SendToSickRage(SickRageSettings sickRageSettings, RequestedModel model, string qualityId) { + Log.Info("Sending to SickRage {0}", model.Title); if (!sickRageSettings.Qualities.Any(x => x.Key == qualityId)) { qualityId = sickRageSettings.QualityProfile; } + Log.Trace("Calling `AddSeries` with the following settings:"); + Log.Trace(sickRageSettings.DumpJson()); + Log.Trace("And the following `model`:"); + Log.Trace(model.DumpJson()); var apiResult = SickrageApi.AddSeries(model.ProviderId, model.SeasonCount, model.SeasonList, qualityId, sickRageSettings.ApiKey, sickRageSettings.FullUri);