From 3efd54c1b6e8a0379946e9a7a2bd9b1e5b5b5464 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Wed, 6 Apr 2016 23:08:00 +0100
Subject: [PATCH] Fixed #144

---
 .../PlexRequests.Api.Models.csproj            |  6 ++++
 .../SickRage/SickRageBase.cs                  |  2 +-
 .../SickRage/SickRageSeasonList.cs            | 31 +++++++++++++++++--
 PlexRequests.Api/ApiRequest.cs                | 13 ++++++--
 PlexRequests.Api/SickrageApi.cs               |  2 +-
 PlexRequests.UI/Views/Shared/_Layout.cshtml   | 16 +++++-----
 appveyor.yml                                  |  2 +-
 7 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index db7e29259..33b154211 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -87,6 +87,12 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
+      <Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
+      <Name>PlexRequests.Helpers</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PlexRequests.Api.Models/SickRage/SickRageBase.cs b/PlexRequests.Api.Models/SickRage/SickRageBase.cs
index 7dd9d778e..3cbb12cf5 100644
--- a/PlexRequests.Api.Models/SickRage/SickRageBase.cs
+++ b/PlexRequests.Api.Models/SickRage/SickRageBase.cs
@@ -1,6 +1,6 @@
 namespace PlexRequests.Api.Models.SickRage
 {
-    public class SickRageBase<T>
+    public abstract class SickRageBase<T>
     {
         public T data { get; set; }
         public string message { get; set; }
diff --git a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs
index 7a0592b5e..708ecf68f 100644
--- a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs
+++ b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs
@@ -1,6 +1,33 @@
-namespace PlexRequests.Api.Models.SickRage
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using PlexRequests.Helpers;
+
+namespace PlexRequests.Api.Models.SickRage
 {
-    public class SickRageSeasonList : SickRageBase<int[]>
+    public class SickRageSeasonList : SickRageBase<object>
     {
+        [JsonIgnore]
+        public int[] Data => ParseObjectToArray<int>(data);
+
+        protected T[] ParseObjectToArray<T>(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<T[]>(json);
+            }
+            if (json.TrimStart().Equals("{}"))
+            {
+                return new T[0];
+            }
+
+            return new T[1] { JsonConvert.DeserializeObject<T>(json) };
+
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs
index 214676a03..68ba4a2af 100644
--- a/PlexRequests.Api/ApiRequest.cs
+++ b/PlexRequests.Api/ApiRequest.cs
@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
 
@@ -33,13 +34,19 @@ using Newtonsoft.Json;
 using NLog;
 
 using PlexRequests.Api.Interfaces;
-
+using PlexRequests.Helpers;
 using RestSharp;
 
 namespace PlexRequests.Api
 {
     public class ApiRequest : IApiRequest
     {
+        private JsonSerializerSettings Settings = new JsonSerializerSettings
+        {
+            NullValueHandling = NullValueHandling.Ignore,
+            MissingMemberHandling = MissingMemberHandling.Ignore
+        };
+
         private static Logger Log = LogManager.GetCurrentClassLogger();
         /// <summary>
         /// An API request handler
@@ -108,7 +115,7 @@ namespace PlexRequests.Api
             }
 
 
-            var json = JsonConvert.DeserializeObject<T>(response.Content);
+            var json = JsonConvert.DeserializeObject<T>(response.Content, Settings);
 
             return json;
         }
@@ -129,4 +136,6 @@ namespace PlexRequests.Api
             }
         }
     }
+
+   
 }
diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs
index 000ffd130..e344d4b26 100644
--- a/PlexRequests.Api/SickrageApi.cs
+++ b/PlexRequests.Api/SickrageApi.cs
@@ -84,7 +84,7 @@ namespace PlexRequests.Api
                 while (seasonIncrement < seasonCount)
                 {
                     seasonList = VerifyShowHasLoaded(tvdbId, apiKey, baseUrl);
-                    seasonIncrement = seasonList.data?.Length ?? 0;
+                    seasonIncrement = seasonList.Data?.Length ?? 0;
                     
                     if (sw.ElapsedMilliseconds > 30000) // Break out after 30 seconds, it's not going to get added
                     {
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 13025d053..03b8984c0 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -14,14 +14,14 @@
 
 
     <!-- Scripts -->
-    <script src="/Content/jquery-2.2.1.min.js"></script>
-    <script src="/Content/handlebars.min.js"></script>
-    <script src="/Content/bootstrap.min.js"></script>
-    <script src="/Content/bootstrap-notify.min.js"></script>
-    <script src="/Content/site.js"></script>
-    <script src="/Content/pace.min.js"></script>
-    <script src="/Content/jquery.mixitup.js"></script>
-    <script src="/Content/moment.min.js"></script>
+    <script src="~/Content/jquery-2.2.1.min.js"></script>
+    <script src="~/Content/handlebars.min.js"></script>
+    <script src="~/Content/bootstrap.min.js"></script>
+    <script src="~/Content/bootstrap-notify.min.js"></script>
+    <script src="~/Content/site.js"></script>
+    <script src="~/Content/pace.min.js"></script>
+    <script src="~/Content/jquery.mixitup.js"></script>
+    <script src="~/Content/moment.min.js"></script>
 </head>
 <body>
 
diff --git a/appveyor.yml b/appveyor.yml
index adf8268ba..de5218d8d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ assembly_info:
   file: '**\AssemblyInfo.*'
   assembly_version: '1.6.0'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.6.0'
+  assembly_informational_version: '1.6.0' 
 before_build:
 - cmd: appveyor-retry nuget restore
 build: