From c376ea4ea0f19d2d6bae7b0d4f759e238f1f1803 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Thu, 17 Mar 2016 21:23:49 +0000
Subject: [PATCH 01/23] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e73e40abc..6fb5f53ce 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ We are looking for any contributions to the project! Just pick up a task, if you
 Please feed free to submit a pull request!
 
 # Donation
-If you feel like donating you can [here!](paypal.me/PlexRequestsNet)
+If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
 
 # Sponsors

From eeafd01106214bdd456a8936bb59ebb50bf9d494 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Thu, 17 Mar 2016 21:29:20 +0000
Subject: [PATCH 02/23] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 6fb5f53ce..5f4966d65 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,10 @@ Please feed free to submit a pull request!
 # Donation
 If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
+###### A massive thanks to everyone below!
+
+[heartisall](https://github.com/heartisall)
+
 
 # Sponsors
 - [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools!!!

From 0edcecf71fc7240f5ab577670b3618f36f084cf8 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Thu, 17 Mar 2016 22:01:11 +0000
Subject: [PATCH 03/23] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f4966d65..8b78102a0 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ I wanted to write a similar application in .Net!
 
 #Preview
 
-![Preview](http://i.imgur.com/yNztwTn.gif)
+![Preview](http://i.imgur.com/ucCFUvd.gif)
 
 #Installation
 Download the latest [Release](https://github.com/tidusjar/PlexRequests.Net/releases).

From 2786d13a17a3e376d97a1f8215782ec4f14980b1 Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:50:00 +0000
Subject: [PATCH 04/23] Exploratory test for #37

---
 PlexRequests.UI/Program.cs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 8a7d5a6ce..e1c145459 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -48,7 +48,7 @@ namespace PlexRequests.UI
         private static Logger Log = LogManager.GetCurrentClassLogger();
         static void Main(string[] args)
         {
-            var uri = string.Empty;
+            var port = -1;
             if (args.Length > 0)
             {
                 Log.Info("We are going to use port {0} that was passed in", args[0]);
@@ -59,7 +59,7 @@ namespace PlexRequests.UI
                     Console.ReadLine();
                     Environment.Exit(1);
                 }
-                uri = $"http://*:{portResult}";
+                port = portResult;
             }
 
             Log.Trace("Getting product version");
@@ -68,19 +68,21 @@ namespace PlexRequests.UI
             var s = new Setup();
             s.SetupDb();
 
-            if (string.IsNullOrEmpty(uri))
-                uri = GetStartupUri();
+            if (port == -1)
+                port = GetStartupPort();
 
-            var options = new StartOptions(uri)
+            var options = new StartOptions
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };
+            options.Urls.Add($"http://localhost:{port}");
+            //options.Urls.Add($"http://127.0.0.1:{port}");
             try
             {
 
             using (WebApp.Start<Startup>(options))
             {
-                Console.WriteLine($"Request Plex is running on {uri}");
+                Console.WriteLine($"Request Plex is running on the following port: {port}");
                 Console.WriteLine("Press any key to exit");
                 Console.ReadLine();
             }
@@ -100,19 +102,19 @@ namespace PlexRequests.UI
             Console.WriteLine($"Version: {assemblyVer}");
         }
 
-        private static string GetStartupUri()
+        private static int GetStartupPort()
         {
-            Log.Trace("Getting startup URI");
-            var uri = "http://*:3579/";
+            Log.Trace("Getting startup Port");
+            var port = 3579;
             var service = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
             var settings = service.GetSettings();
             Log.Trace("Port: {0}", settings.Port);
             if (settings.Port != 0)
             {
-                uri = $"http://*:{settings.Port}";
+                port = settings.Port;
             }
 
-            return uri;
+            return port;
         }
 
         private static void ConfigureTargets(string connectionString)

From 3c6338cadc2126f20ad8a00c69b849950186bc24 Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:59:34 +0000
Subject: [PATCH 05/23] Catch the missing table exception when they have a new
 DB

---
 PlexRequests.Core/Setup.cs | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 4681dd3b4..ddb7a5a03 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -24,6 +24,8 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -70,18 +72,29 @@ namespace PlexRequests.Core
 
         private void MigrateDb() // TODO: Remove when no longer needed
         {
+            var result = new List<long>();
+            RequestedModel[] requestedModels;
             var repo = new GenericRepository<RequestedModel>(Db);
-            var records = repo.GetAll();
-            var requestedModels = records as RequestedModel[] ?? records.ToArray();
-            if(!requestedModels.Any())
-            { return; }
+            try
+            {
+                var records = repo.GetAll();
 
-            var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
-            var result = new List<long>();
-            foreach (var r in requestedModels)
+                requestedModels = records as RequestedModel[] ?? records.ToArray();
+                if (!requestedModels.Any())
+                { return; }
+
+                var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
+
+                foreach (var r in requestedModels)
+                {
+                    var id = jsonRepo.AddRequest(r);
+                    result.Add(id);
+                }
+            }
+            catch (SqliteException)
             {
-                var id = jsonRepo.AddRequest(r);
-                result.Add(id);
+                // There is no requested table so they do not have an old version of the DB
+                return;
             }
 
             if (result.Any(x => x == -1))

From 1d814cd76e2f90efed1d2861e255e67b6fe96988 Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 22:11:11 +0000
Subject: [PATCH 06/23] This should fix #37

---
 PlexRequests.UI/Program.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index e1c145459..08a353fca 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -75,8 +75,7 @@ namespace PlexRequests.UI
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };
-            options.Urls.Add($"http://localhost:{port}");
-            //options.Urls.Add($"http://127.0.0.1:{port}");
+            options.Urls.Add($"http://+:{port}");
             try
             {
 

From cd682cdff9316d453f31e52fff39a983bb207ae9 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 18 Mar 2016 23:00:44 +0000
Subject: [PATCH 07/23] another test for #37

---
 PlexRequests.Core/Setup.cs | 22 +++++++++++-----------
 PlexRequests.UI/Program.cs |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index ddb7a5a03..4486df9fb 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -78,24 +78,24 @@ namespace PlexRequests.Core
             try
             {
                 var records = repo.GetAll();
-
                 requestedModels = records as RequestedModel[] ?? records.ToArray();
-                if (!requestedModels.Any())
-                { return; }
-
-                var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
-
-                foreach (var r in requestedModels)
-                {
-                    var id = jsonRepo.AddRequest(r);
-                    result.Add(id);
-                }
             }
             catch (SqliteException)
             {
                 // There is no requested table so they do not have an old version of the DB
                 return;
             }
+            if (!requestedModels.Any())
+            { return; }
+
+            var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
+
+            foreach (var r in requestedModels)
+            {
+                var id = jsonRepo.AddRequest(r);
+                result.Add(id);
+            }
+
 
             if (result.Any(x => x == -1))
             {
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 08a353fca..134c6510c 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -75,7 +75,7 @@ namespace PlexRequests.UI
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };
-            options.Urls.Add($"http://+:{port}");
+            options.Urls.Add($"http://localhost:{port}/");
             try
             {
 

From a2d2121afe6f4cb8a7af1761f1c485081f1f39ff Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 18 Mar 2016 23:28:24 +0000
Subject: [PATCH 08/23] back to what it was :(

---
 PlexRequests.UI/Program.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 134c6510c..a16a5c393 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -71,11 +71,10 @@ namespace PlexRequests.UI
             if (port == -1)
                 port = GetStartupPort();
 
-            var options = new StartOptions
+            var options = new StartOptions($"http://+:{port}")
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };
-            options.Urls.Add($"http://localhost:{port}/");
             try
             {
 

From 4136116555bef6ba4332d220c10a802ad4f5279a Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 18 Mar 2016 23:45:31 +0000
Subject: [PATCH 09/23] Added the code to lookup the old requests and refresh
 them with new information from TVMaze

---
 PlexRequests.Api/TvMazeApi.cs              | 13 ++++++++++
 PlexRequests.Core/PlexRequests.Core.csproj |  4 +++
 PlexRequests.Core/Setup.cs                 | 29 ++++++++++++++++++++--
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Api/TvMazeApi.cs b/PlexRequests.Api/TvMazeApi.cs
index 5f74ea7f2..8b6cb9f37 100644
--- a/PlexRequests.Api/TvMazeApi.cs
+++ b/PlexRequests.Api/TvMazeApi.cs
@@ -69,5 +69,18 @@ namespace PlexRequests.Api
             return Api.Execute<TvMazeShow>(request, new Uri(Uri));
         }
 
+        public TvMazeShow ShowLookupByTheTvDbId(int theTvDbId)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "lookup/shows?thetvdb={id}"
+            };
+            request.AddUrlSegment("id", theTvDbId.ToString());
+            request.AddHeader("Content-Type", "application/json");
+
+            return Api.Execute<TvMazeShow>(request, new Uri(Uri));
+        }
+
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj
index b7534d1b0..e1c4ee1f3 100644
--- a/PlexRequests.Core/PlexRequests.Core.csproj
+++ b/PlexRequests.Core/PlexRequests.Core.csproj
@@ -94,6 +94,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.Api\PlexRequests.Api.csproj">
       <Project>{8CB8D235-2674-442D-9C6A-35FCAEEB160D}</Project>
       <Name>PlexRequests.Api</Name>
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 4486df9fb..7cab60066 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using Mono.Data.Sqlite;
+using PlexRequests.Api;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Store;
@@ -85,14 +86,38 @@ namespace PlexRequests.Core
                 // There is no requested table so they do not have an old version of the DB
                 return;
             }
+
             if (!requestedModels.Any())
             { return; }
 
             var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
 
-            foreach (var r in requestedModels)
+            var api = new TvMazeApi();
+
+            foreach (var r in requestedModels.Where(x => x.Type == RequestType.TvShow))
             {
-                var id = jsonRepo.AddRequest(r);
+                var show = api.ShowLookupByTheTvDbId(r.ProviderId);
+
+                var model = new RequestedModel
+                {
+                    Title = show.name,
+                    PosterPath = show.image?.medium,
+                    Type = RequestType.TvShow,
+                    ProviderId = show.externals.thetvdb ?? 0,
+                    ReleaseDate = r.ReleaseDate,
+                    AdminNote = r.AdminNote,
+                    Approved = r.Approved,
+                    Available = r.Available,
+                    ImdbId = show.externals.imdb,
+                    Issues = r.Issues,
+                    LatestTv = r.LatestTv,
+                    OtherMessage = r.OtherMessage,
+                    Overview = show.summary.RemoveHtml(),
+                    RequestedBy = r.RequestedBy,
+                    RequestedDate = r.ReleaseDate,
+                    Status = show.status
+                };
+                var id = jsonRepo.AddRequest(model);
                 result.Add(id);
             }
 

From e34170f55aa35da6471b27c6d24c8a0fac75a496 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 00:16:44 +0000
Subject: [PATCH 10/23] Added the option to set a CP quality #38

---
 .../ICouchPotatoApi.cs                        |  3 +-
 .../Movie/CouchPotatoProfiles.cs              | 53 ++++++++++++++
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api/CouchPotatoApi.cs            | 26 ++++++-
 .../SettingModels/CouchPotatoSettings.cs      |  1 +
 PlexRequests.UI/Modules/AdminModule.cs        | 14 +++-
 PlexRequests.UI/Modules/ApprovalModule.cs     |  4 +-
 PlexRequests.UI/Modules/SearchModule.cs       |  2 +-
 .../Views/Admin/CouchPotato.cshtml            | 71 ++++++++++++++++++-
 9 files changed, 166 insertions(+), 9 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs

diff --git a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs
index bcfdb3dfd..288f09d67 100644
--- a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs
+++ b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs
@@ -33,7 +33,8 @@ namespace PlexRequests.Api.Interfaces
 {
     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);
+        CouchPotatoProfiles GetProfiles(Uri url, string apiKey);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs b/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs
new file mode 100644
index 000000000..f63661ecb
--- /dev/null
+++ b/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs
@@ -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; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 402cdd22a..1bdc4ffe9 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Movie\CouchPotatoAdd.cs" />
+    <Compile Include="Movie\CouchPotatoProfiles.cs" />
     <Compile Include="Movie\CouchPotatoStatus.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
diff --git a/PlexRequests.Api/CouchPotatoApi.cs b/PlexRequests.Api/CouchPotatoApi.cs
index bdb238ee2..7e660a38d 100644
--- a/PlexRequests.Api/CouchPotatoApi.cs
+++ b/PlexRequests.Api/CouchPotatoApi.cs
@@ -45,9 +45,17 @@ namespace PlexRequests.Api
         private ApiRequest Api { get; set; }
         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("imdbid", imdbid);
@@ -93,5 +101,19 @@ namespace PlexRequests.Api
 
             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);
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
index 0c4ccd06f..7c18ca5d7 100644
--- a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
+++ b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
@@ -37,6 +37,7 @@ namespace PlexRequests.Core.SettingModels
         public int Port { get; set; }
         public string ApiKey { get; set; }
         public bool Ssl { get; set; }
+        public string ProfileId { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index a41e6c967..fc86ad568 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -59,6 +59,7 @@ namespace PlexRequests.UI.Modules
         private IPlexApi PlexApi { get; }
         private ISonarrApi SonarrApi { get; }
         private PushbulletApi PushbulletApi { get; }
+        private ICouchPotatoApi CpApi { get; }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
         public AdminModule(ISettingsService<PlexRequestSettings> rpService,
@@ -70,7 +71,8 @@ namespace PlexRequests.UI.Modules
             ISettingsService<EmailNotificationSettings> email,
             IPlexApi plexApi,
             ISettingsService<PushbulletNotificationSettings> pbSettings,
-            PushbulletApi pbApi) : base("admin")
+            PushbulletApi pbApi,
+            ICouchPotatoApi cpApi) : base("admin")
         {
             RpService = rpService;
             CpService = cpService;
@@ -82,6 +84,7 @@ namespace PlexRequests.UI.Modules
             PlexApi = plexApi;
             PushbulletService = pbSettings;
             PushbulletApi = pbApi;
+            CpApi = cpApi;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -107,6 +110,7 @@ namespace PlexRequests.UI.Modules
             Post["/sonarr"] = _ => SaveSonarr();
 
             Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
+            Post["/cpprofiles"] = _ => GetCpProfiles();
 
             Get["/emailnotification"] = _ => EmailNotifications();
             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 = 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);
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index ca3a4bcdb..74a26a6a2 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -127,7 +127,7 @@ namespace PlexRequests.UI.Modules
             var cpSettings = CpService.GetSettings();
             var cp = new CouchPotatoApi();
             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);
             if (result)
             {
@@ -212,7 +212,7 @@ namespace PlexRequests.UI.Modules
         private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
         { 
             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);
             return result;
         }
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 353a99c73..f56ac9b40 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -215,7 +215,7 @@ namespace PlexRequests.UI.Modules
             if (!settings.RequireApproval)
             {
                 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);
                 if (result)
                 {
diff --git a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
index 0b967436b..4be47db0a 100644
--- a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
+++ b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
@@ -52,6 +52,20 @@
                 </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>
                     <button id="testCp" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
@@ -75,9 +89,58 @@
 <script>
     $(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) {
             e.preventDefault();
             var $form = $("#mainForm");
+
             $.ajax({
                 type: $form.prop("method"),
                 url: "/test/cp",
@@ -107,9 +170,13 @@
                 return;
             }
             var $form = $("#mainForm");
+            var qualityProfile = $("#profiles option:selected").val();
+            var data = $form.serialize();
+            data = data + "&profileId=" + qualityProfile;
+
             $.ajax({
                 type: $form.prop("method"),
-                data: $form.serialize(),
+                data: data,
                 url: $form.prop("action"),
                 dataType: "json",
                 success: function (response) {
@@ -125,6 +192,6 @@
                 }
             });
         });
-        
+
     });
 </script>
\ No newline at end of file

From 1ebf80d1d120c2149dacdeadc87dfaa6219a4c30 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 00:17:53 +0000
Subject: [PATCH 11/23] Fixed the new dependancy with the admin class tests

---
 PlexRequests.UI.Tests/AdminModuleTests.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs
index e10594a71..8e5ebbdc4 100644
--- a/PlexRequests.UI.Tests/AdminModuleTests.cs
+++ b/PlexRequests.UI.Tests/AdminModuleTests.cs
@@ -57,6 +57,7 @@ namespace PlexRequests.UI.Tests
         private Mock<IPlexApi> PlexMock { get; set; }
         private Mock<ISonarrApi> SonarrApiMock { get; set; }
         private Mock<IPushbulletApi> PushbulletApi { get; set; }
+        private Mock<ICouchPotatoApi> CpApi { get; set; }
 
         private ConfigurableBootstrapper Bootstrapper { get; set; }
 
@@ -79,6 +80,7 @@ namespace PlexRequests.UI.Tests
             EmailMock = new Mock<ISettingsService<EmailNotificationSettings>>();
             PushbulletApi = new Mock<IPushbulletApi>();
             PushbulletSettings = new Mock<ISettingsService<PushbulletNotificationSettings>>();
+            CpApi = new Mock<ICouchPotatoApi>();
 
             Bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -93,6 +95,7 @@ namespace PlexRequests.UI.Tests
                 with.Dependency(EmailMock.Object);
                 with.Dependency(PushbulletApi.Object);
                 with.Dependency(PushbulletSettings.Object);
+                with.Dependency(CpApi.Object);
                 with.RootPathProvider<TestRootPathProvider>();
                 with.RequestStartup((container, pipelines, context) =>
                 {

From 803b12da0f609426fc5a71e9e7fa6a9de7d77806 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 12:25:44 +0000
Subject: [PATCH 12/23] Added the api and settings page for Sickrage. Just need
 to do the tester and hook it up #40

---
 PlexRequests.Api/PlexRequests.Api.csproj      |   1 +
 PlexRequests.Api/SickrageApi.cs               |  68 ++++++
 .../SettingModels/SickRageSettings.cs         |  19 +-
 .../SettingModels/SonarrSettings.cs           |   1 +
 PlexRequests.UI.Tests/AdminModuleTests.cs     |   3 +
 PlexRequests.UI/Bootstrapper.cs               |   1 +
 PlexRequests.UI/Modules/AdminModule.cs        |  41 +++-
 PlexRequests.UI/PlexRequests.UI.csproj        |   4 +
 .../Validators/SickRageValidator.cs           |  43 ++++
 PlexRequests.UI/Views/Admin/Sickrage.cshtml   | 197 ++++++++++++++++++
 PlexRequests.UI/Views/Admin/Sonarr.cshtml     |  17 +-
 PlexRequests.UI/Views/Admin/_Sidebar.cshtml   |   9 +-
 12 files changed, 399 insertions(+), 5 deletions(-)
 create mode 100644 PlexRequests.Api/SickrageApi.cs
 create mode 100644 PlexRequests.UI/Validators/SickRageValidator.cs
 create mode 100644 PlexRequests.UI/Views/Admin/Sickrage.cshtml

diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 5157e905c..2f204c975 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -73,6 +73,7 @@
     </Compile>
     <Compile Include="Mocks\MockSonarrApi.cs" />
     <Compile Include="PushbulletApi.cs" />
+    <Compile Include="SickrageApi.cs" />
     <Compile Include="SonarrApi.cs" />
     <Compile Include="CouchPotatoApi.cs" />
     <Compile Include="MovieBase.cs" />
diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs
new file mode 100644
index 000000000..26dbdb3d7
--- /dev/null
+++ b/PlexRequests.Api/SickrageApi.cs
@@ -0,0 +1,68 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: CouchPotatoApi.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;
+using System.Collections.Generic;
+
+using NLog;
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.Sonarr;
+using RestSharp;
+
+namespace PlexRequests.Api
+{
+    public class SickrageApi 
+    {
+        public SickrageApi()
+        {
+            Api = new ApiRequest();
+        }
+        private ApiRequest Api { get; set; }
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+
+        public SonarrAddSeries AddSeries(int tvdbId, string status, string futureStatus, string quality, string apiKey, Uri baseUrl)
+        {
+            //localhost:8081/api/e738882774aeb0b2210f4bc578cbb584/?cmd=show.addnew&tvdbid=101501&status=skipped&future_status=wanted&initial=fullhdbluray&sdtv
+
+            var request = new RestRequest
+            {
+                Resource = "/api/{apiKey}/?cmd=show.addnew",
+                Method = Method.GET
+            };
+
+            request.AddQueryParameter("tvdbid", tvdbId.ToString());
+            request.AddQueryParameter("status", status);
+            request.AddQueryParameter("future_status", futureStatus);
+            request.AddQueryParameter("initial", quality);
+            
+            var obj = Api.ExecuteJson<SonarrAddSeries>(request, baseUrl);
+
+            return obj;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Core/SettingModels/SickRageSettings.cs b/PlexRequests.Core/SettingModels/SickRageSettings.cs
index b06801db4..344e41434 100644
--- a/PlexRequests.Core/SettingModels/SickRageSettings.cs
+++ b/PlexRequests.Core/SettingModels/SickRageSettings.cs
@@ -24,13 +24,30 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
+using System;
+using Newtonsoft.Json;
+using PlexRequests.Helpers;
+
 namespace PlexRequests.Core.SettingModels
 {
     public class SickRageSettings : Settings
     {
+        public bool Enabled { get; set; }
         public string Ip { get; set; }
         public int Port { get; set; }
         public string ApiKey { get; set; }
-        public bool Enabled { get; set; }
+        public string QualityProfile { get; set; }
+        public bool Ssl { get; set; }
+
+        [JsonIgnore]
+        public Uri FullUri
+        {
+            get
+            {
+                var formatted = Ip.ReturnUri(Port, Ssl);
+                return formatted;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Core/SettingModels/SonarrSettings.cs b/PlexRequests.Core/SettingModels/SonarrSettings.cs
index 15f486d37..2c128f993 100644
--- a/PlexRequests.Core/SettingModels/SonarrSettings.cs
+++ b/PlexRequests.Core/SettingModels/SonarrSettings.cs
@@ -33,6 +33,7 @@ namespace PlexRequests.Core.SettingModels
 {
     public class SonarrSettings : Settings
     {
+        public bool Enabled { get; set; }
         public string Ip { get; set; }
         public int Port { get; set; }
         public string ApiKey { get; set; }
diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs
index 8e5ebbdc4..e42eb4a13 100644
--- a/PlexRequests.UI.Tests/AdminModuleTests.cs
+++ b/PlexRequests.UI.Tests/AdminModuleTests.cs
@@ -52,6 +52,7 @@ namespace PlexRequests.UI.Tests
         private Mock<ISettingsService<AuthenticationSettings>> AuthMock { get; set; }
         private Mock<ISettingsService<PlexSettings>> PlexSettingsMock { get; set; }
         private Mock<ISettingsService<SonarrSettings>> SonarrSettingsMock { get; set; }
+        private Mock<ISettingsService<SickRageSettings>> SickRageSettingsMock { get; set; }
         private Mock<ISettingsService<EmailNotificationSettings>> EmailMock { get; set; }
         private Mock<ISettingsService<PushbulletNotificationSettings>> PushbulletSettings { get; set; }
         private Mock<IPlexApi> PlexMock { get; set; }
@@ -81,6 +82,7 @@ namespace PlexRequests.UI.Tests
             PushbulletApi = new Mock<IPushbulletApi>();
             PushbulletSettings = new Mock<ISettingsService<PushbulletNotificationSettings>>();
             CpApi = new Mock<ICouchPotatoApi>();
+            SickRageSettingsMock = new Mock<ISettingsService<SickRageSettings>>();
 
             Bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -96,6 +98,7 @@ namespace PlexRequests.UI.Tests
                 with.Dependency(PushbulletApi.Object);
                 with.Dependency(PushbulletSettings.Object);
                 with.Dependency(CpApi.Object);
+                with.Dependency(SickRageSettingsMock.Object);
                 with.RootPathProvider<TestRootPathProvider>();
                 with.RequestStartup((container, pipelines, context) =>
                 {
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index cba01fd25..358940c5c 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -73,6 +73,7 @@ namespace PlexRequests.UI
             container.Register<ISettingsService<AuthenticationSettings>, SettingsServiceV2<AuthenticationSettings>>();
             container.Register<ISettingsService<PlexSettings>, SettingsServiceV2<PlexSettings>>();
             container.Register<ISettingsService<SonarrSettings>, SettingsServiceV2<SonarrSettings>>();
+            container.Register<ISettingsService<SickRageSettings>, SettingsServiceV2<SickRageSettings>>();
             container.Register<ISettingsService<EmailNotificationSettings>, SettingsServiceV2<EmailNotificationSettings>>();
             container.Register<ISettingsService<PushbulletNotificationSettings>, SettingsServiceV2<PushbulletNotificationSettings>>();
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index fc86ad568..eeac628f0 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -54,6 +54,7 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<AuthenticationSettings> AuthService { get; }
         private ISettingsService<PlexSettings> PlexService { get; }
         private ISettingsService<SonarrSettings> SonarrService { get; }
+        private ISettingsService<SickRageSettings> SickRageService { get; }
         private ISettingsService<EmailNotificationSettings> EmailService { get; }
         private ISettingsService<PushbulletNotificationSettings> PushbulletService { get; }
         private IPlexApi PlexApi { get; }
@@ -67,6 +68,7 @@ namespace PlexRequests.UI.Modules
             ISettingsService<AuthenticationSettings> auth,
             ISettingsService<PlexSettings> plex,
             ISettingsService<SonarrSettings> sonarr,
+            ISettingsService<SickRageSettings> sickrage,
             ISonarrApi sonarrApi,
             ISettingsService<EmailNotificationSettings> email,
             IPlexApi plexApi,
@@ -85,6 +87,7 @@ namespace PlexRequests.UI.Modules
             PushbulletService = pbSettings;
             PushbulletApi = pbApi;
             CpApi = cpApi;
+            SickRageService = sickrage;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -109,6 +112,9 @@ namespace PlexRequests.UI.Modules
             Get["/sonarr"] = _ => Sonarr();
             Post["/sonarr"] = _ => SaveSonarr();
 
+            Get["/sickrage"] = _ => Sickrage();
+            Post["/sickrage"] = _ => SaveSickrage();
+
             Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
             Post["/cpprofiles"] = _ => GetCpProfiles();
 
@@ -283,7 +289,11 @@ namespace PlexRequests.UI.Modules
             {
                 return Response.AsJson(valid.SendJsonError());
             }
-
+            var sickRageEnabled = SickRageService.GetSettings().Enabled;
+            if (sickRageEnabled)
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "SickRage is enabled, we cannot enable Sonarr and SickRage" });
+            }
             var result = SonarrService.SaveSettings(sonarrSettings);
 
             return Response.AsJson(result
@@ -291,6 +301,35 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Negotiator Sickrage()
+        {
+            var settings = SickRageService.GetSettings();
+
+            return View["Sickrage", settings];
+        }
+
+        private Response SaveSickrage()
+        {
+            var sickRageSettings = this.Bind<SickRageSettings>();
+
+            var valid = this.Validate(sickRageSettings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+
+            var sonarrEnabled = SonarrService.GetSettings().Enabled;
+            if (sonarrEnabled)
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Sonarr is enabled, we cannot enable Sonarr and SickRage" });
+            }
+            var result = SickRageService.SaveSettings(sickRageSettings);
+
+            return Response.AsJson(result
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for SickRage!" }
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
+        }
+
         private Response GetSonarrQualityProfiles()
         {
             var settings = this.Bind<SonarrSettings>();
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index ec0bf2acc..a5eed1bcf 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -165,6 +165,7 @@
     <Compile Include="Validators\EmailNotificationSettingsValidator.cs" />
     <Compile Include="Validators\CouchPotatoValidator.cs" />
     <Compile Include="Validators\PlexValidator.cs" />
+    <Compile Include="Validators\SickRageValidator.cs" />
     <Compile Include="Validators\SonarrValidator.cs" />
     <Content Include="Content\bootstrap-notify.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -320,6 +321,9 @@
     <Content Include="Views\Admin\PushbulletNotifications.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Views\Admin\Sickrage.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
diff --git a/PlexRequests.UI/Validators/SickRageValidator.cs b/PlexRequests.UI/Validators/SickRageValidator.cs
new file mode 100644
index 000000000..28056e095
--- /dev/null
+++ b/PlexRequests.UI/Validators/SickRageValidator.cs
@@ -0,0 +1,43 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.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 FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class SickRageValidator : AbstractValidator<SickRageSettings>
+    {
+        public SickRageValidator()
+        {
+            RuleFor(request => request.ApiKey).NotEmpty().WithMessage("You must specify a Api Key.");
+            RuleFor(request => request.Ip).NotEmpty().WithMessage("You must specify a IP/Host name.");
+            RuleFor(request => request.Port).NotEmpty().WithMessage("You must specify a Port.");
+            RuleFor(request => request.QualityProfile).NotEmpty().WithMessage("You must specify a Quality Profile.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/Sickrage.cshtml b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
new file mode 100644
index 000000000..34b17bb49
--- /dev/null
+++ b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
@@ -0,0 +1,197 @@
+@Html.Partial("_Sidebar")
+@{
+    int port;
+    if (Model.Port == 0)
+    {
+        port = 8081;
+    }
+    else
+    {
+        port = Model.Port;
+    }
+}
+<div class="col-sm-8 col-sm-push-1">
+    <form class="form-horizontal" method="POST" id="mainForm">
+        <fieldset>
+            <legend>SickRage Settings</legend>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Enabled)
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><text>Enabled</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled"><text>Enabled</text>
+                        }
+                    </label>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="Ip" class="control-label">SickRage Hostname or IP</label>
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="localhost" value="@Model.Ip">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="portNumber" class="control-label">Port</label>
+
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <label for="ApiKey" class="control-label">SickRage API Key</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="ApiKey" name="ApiKey" value="@Model.ApiKey">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Ssl)
+                        {
+                            <input type="checkbox" id="Ssl" name="Ssl" checked="checked"><text>SSL</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Ssl" name="Ssl"><text>SSL</text>
+                        }
+                    </label>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="profiles" class="control-label">Quality Profiles</label>
+                <div id="profiles">
+                    <select class="form-control" value="selected">
+                        <option selected="selected" value="default">Use Deafult</option>
+                        <option value="sdtv">SD TV</option>
+                        <option value="sddvd">SD DVD</option>
+                        <option value="hdtv">HD TV</option>
+                        <option value="rawhdtv">Raw HD TV</option>
+                        <option value="hdwebdl">HD Web DL</option>
+                        <option value="fullhdwebdl">Full HD Web DL</option>
+                        <option value="hdbluray">HD Bluray</option>
+                        <option value="fullhdbluray">Full HD Bluray</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div>
+                    <button id="testSickRage" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <div>
+                    <button id="save" type="submit" class="btn btn-primary-outline ">Submit</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+</div>
+
+
+
+<script>
+    $(function () {
+
+        
+        $('#save').click(function(e) {
+            e.preventDefault();
+            var port = $('#portNumber').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a Port.", "warning");
+                return;
+            }
+            var qualityProfile = $("#profiles option:selected").val();
+
+            var $form = $("#mainForm");
+
+            var data = $form.serialize();
+            data = data + "&qualityProfile=" + qualityProfile;
+
+            $.ajax({
+                type: $form.prop("method"),
+                data: data,
+                url: $form.prop("action"),
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify("Success!", "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+        $('#getProfiles').click(function (e) {
+            e.preventDefault();
+            if (!$('#Ip').val()) {
+                generateNotify("Please enter a valid IP/Hostname.", "warning");
+                return;
+            }
+            if (!$('#portNumber').val()) {
+                generateNotify("Please enter a valid Port Number.", "warning");
+                return;
+            }
+            if (!$('#ApiKey').val()) {
+                generateNotify("Please enter a valid ApiKey.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: "sonarrprofiles",
+                dataType: "json",
+                success: function (response) {
+                    response.forEach(function (result) {
+                        $("#select").append("<option value='" + result.id + "'>" + result.name + "</option>");
+                    });
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+        $('#testSonarr').click(function (e) {
+            e.preventDefault();
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                url: "/test/sonarr",
+                data: $form.serialize(),
+                dataType: "json",
+                success: function (response) {
+                    console.log(response);
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+
+
+    })
+</script>
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/Sonarr.cshtml b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
index 83a06c443..192161a23 100644
--- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
@@ -14,7 +14,20 @@
     <form class="form-horizontal" method="POST" id="mainForm">
         <fieldset>
             <legend>Sonarr Settings</legend>
-
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Enabled)
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><text>Enabled</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled"><text>Enabled</text>
+                        }
+                    </label>
+                </div>
+            </div>
             <div class="form-group">
                 <label for="Ip" class="control-label">Sonarr Hostname or IP</label>
                 <div class="">
@@ -121,7 +134,7 @@
             success: function(response) {
                 response.forEach(function(result) {
                     if (result.id == qualitySelected) {
-                        
+
                         $("#select").append("<option selected='selected' value='" + result.id + "'>" + result.name + "</option>");
                     } else {
                         $("#select").append("<option value='" + result.id + "'>" + result.name + "</option>");
diff --git a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
index 0626b06fd..2877729c7 100644
--- a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
+++ b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
@@ -44,7 +44,14 @@
         {
             <a class="list-group-item" href="/admin/sonarr">Sonarr</a>
         }
-        @*<a class="list-group-item" href="/admin/sickbeard">Sickbeard Settings</a>*@
+        @if (Context.Request.Path == "/admin/sickrage")
+        {
+            <a class="list-group-item active" href="/admin/sickrage">SickRage</a>
+        }
+        else
+        {
+            <a class="list-group-item" href="/admin/sickrage">SickRage</a>
+        }
 
         @if (Context.Request.Path == "/admin/emailnotification")
         {

From 9402d1409e4cf834edffb5535e7f71df921623f2 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 14:17:54 +0000
Subject: [PATCH 13/23] Wow, that was a lot of work. - So, I have now finished
 #40. - Fixed a bug where we was not choosing the correct tv series (Because
 of TVMaze) - Fixed a bug when checking for plex titles - Fixed a bug where
 the wrong issue would clean on the UI (DB was correct) - Refactored how we
 send tv shows - And too many small changes to count.

---
 PlexRequests.Api.Interfaces/ISickRageApi.cs   |  40 +++++++
 .../PlexRequests.Api.Interfaces.csproj        |   1 +
 .../PlexRequests.Api.Models.csproj            |   3 +
 .../SickRage/SickRagePing.cs                  |  40 +++++++
 .../SickRage/SickRageStatus.cs                |  35 ++++++
 .../SickRage/SickRageTvAdd.cs                 |  41 +++++++
 PlexRequests.Api/SickrageApi.cs               |  42 +++++--
 PlexRequests.Helpers/HtmlRemover.cs           |   4 +
 .../PlexAvailabilityCheckerTests.cs           |   2 +-
 .../PlexAvailabilityChecker.cs                |  18 ++-
 .../Repository/RequestJsonRepository.cs       |   2 +-
 PlexRequests.UI/Bootstrapper.cs               |  16 +--
 PlexRequests.UI/Content/requests.js           |   2 +-
 PlexRequests.UI/Helpers/TvSender.cs           |  77 +++++++++++++
 .../Modules/ApplicationTesterModule.cs        |  34 +++++-
 PlexRequests.UI/Modules/ApprovalModule.cs     | 105 +++++++++++++++---
 PlexRequests.UI/Modules/SearchModule.cs       |  91 ++++++++++-----
 PlexRequests.UI/PlexRequests.UI.csproj        |   1 +
 PlexRequests.UI/Views/Admin/Sickrage.cshtml   |  67 ++++-------
 PlexRequests.UI/Views/Admin/Sonarr.cshtml     |   5 -
 PlexRequests.UI/Views/Requests/Index.cshtml   |   2 +-
 21 files changed, 508 insertions(+), 120 deletions(-)
 create mode 100644 PlexRequests.Api.Interfaces/ISickRageApi.cs
 create mode 100644 PlexRequests.Api.Models/SickRage/SickRagePing.cs
 create mode 100644 PlexRequests.Api.Models/SickRage/SickRageStatus.cs
 create mode 100644 PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs
 create mode 100644 PlexRequests.UI/Helpers/TvSender.cs

diff --git a/PlexRequests.Api.Interfaces/ISickRageApi.cs b/PlexRequests.Api.Interfaces/ISickRageApi.cs
new file mode 100644
index 000000000..516b8784f
--- /dev/null
+++ b/PlexRequests.Api.Interfaces/ISickRageApi.cs
@@ -0,0 +1,40 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: ISickRageApi.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;
+using PlexRequests.Api.Models.SickRage;
+
+namespace PlexRequests.Api.Interfaces
+{
+    public interface ISickRageApi
+    {
+        SickRageTvAdd AddSeries(int tvdbId, bool latest, string quality, string apiKey,
+            Uri baseUrl);
+
+        SickRagePing Ping(string apiKey, Uri baseUrl);
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
index b76996490..3ea7be621 100644
--- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
+++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
@@ -49,6 +49,7 @@
     <Compile Include="ICouchPotatoApi.cs" />
     <Compile Include="IPlexApi.cs" />
     <Compile Include="IPushbulletApi.cs" />
+    <Compile Include="ISickRageApi.cs" />
     <Compile Include="ISonarrApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 1bdc4ffe9..87a9951a6 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -57,6 +57,9 @@
     <Compile Include="Plex\PlexStatus.cs" />
     <Compile Include="Plex\PlexUserRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SickRage\SickRagePing.cs" />
+    <Compile Include="SickRage\SickRageStatus.cs" />
+    <Compile Include="SickRage\SickRageTvAdd.cs" />
     <Compile Include="Sonarr\SonarrAddSeries.cs" />
     <Compile Include="Sonarr\SonarrProfile.cs" />
     <Compile Include="Sonarr\SystemStatus.cs" />
diff --git a/PlexRequests.Api.Models/SickRage/SickRagePing.cs b/PlexRequests.Api.Models/SickRage/SickRagePing.cs
new file mode 100644
index 000000000..e3a7528da
--- /dev/null
+++ b/PlexRequests.Api.Models/SickRage/SickRagePing.cs
@@ -0,0 +1,40 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SickRagePing.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.SickRage
+{
+    public class SickRagePingData
+    {
+        public int pid { get; set; }
+    }
+
+    public class SickRagePing
+    {
+        public SickRagePingData data { get; set; }
+        public string message { get; set; }
+        public string result { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/SickRage/SickRageStatus.cs b/PlexRequests.Api.Models/SickRage/SickRageStatus.cs
new file mode 100644
index 000000000..2ea03632d
--- /dev/null
+++ b/PlexRequests.Api.Models/SickRage/SickRageStatus.cs
@@ -0,0 +1,35 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SickRageStatus.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.SickRage
+{
+    public static class SickRageStatus
+    {
+        public const string Wanted = "wanted";
+        public const string Skipped = "skipped";
+        public const string Ignored = "Ignored";
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs b/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs
new file mode 100644
index 000000000..0fb021163
--- /dev/null
+++ b/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs
@@ -0,0 +1,41 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SickRageTvAdd.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.SickRage
+{
+    public class SickRageTvAddData
+    {
+        public string name { get; set; }
+    }
+
+    public class SickRageTvAdd
+    {
+        public SickRageTvAddData data { get; set; }
+        public string message { get; set; }
+        public string result { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs
index 26dbdb3d7..a28ac21bf 100644
--- a/PlexRequests.Api/SickrageApi.cs
+++ b/PlexRequests.Api/SickrageApi.cs
@@ -1,4 +1,5 @@
 #region Copyright
+
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: CouchPotatoApi.cs
@@ -23,46 +24,65 @@
 //    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;
-using System.Collections.Generic;
 
+using System;
 using NLog;
 using PlexRequests.Api.Interfaces;
-using PlexRequests.Api.Models.Sonarr;
+using PlexRequests.Api.Models.SickRage;
 using RestSharp;
 
 namespace PlexRequests.Api
 {
-    public class SickrageApi 
+    public class SickrageApi : ISickRageApi
     {
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
         public SickrageApi()
         {
             Api = new ApiRequest();
         }
-        private ApiRequest Api { get; set; }
-        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        private ApiRequest Api { get; }
 
 
-        public SonarrAddSeries AddSeries(int tvdbId, string status, string futureStatus, string quality, string apiKey, Uri baseUrl)
+        public SickRageTvAdd AddSeries(int tvdbId, bool latest, string quality, string apiKey,
+            Uri baseUrl)
         {
-            //localhost:8081/api/e738882774aeb0b2210f4bc578cbb584/?cmd=show.addnew&tvdbid=101501&status=skipped&future_status=wanted&initial=fullhdbluray&sdtv
+            string status;
+            var futureStatus = SickRageStatus.Wanted;
+
+            status = latest ? SickRageStatus.Skipped : SickRageStatus.Wanted;
 
             var request = new RestRequest
             {
                 Resource = "/api/{apiKey}/?cmd=show.addnew",
                 Method = Method.GET
             };
-
+            request.AddUrlSegment("apiKey", apiKey);
             request.AddQueryParameter("tvdbid", tvdbId.ToString());
             request.AddQueryParameter("status", status);
             request.AddQueryParameter("future_status", futureStatus);
             request.AddQueryParameter("initial", quality);
-            
-            var obj = Api.ExecuteJson<SonarrAddSeries>(request, baseUrl);
+
+            var obj = Api.Execute<SickRageTvAdd>(request, baseUrl);
 
             return obj;
         }
 
+        public SickRagePing Ping(string apiKey, Uri baseUrl)
+        {
+            var request = new RestRequest
+            {
+                Resource = "/api/{apiKey}/?cmd=sb.ping",
+                Method = Method.GET
+            };
+
+            request.AddUrlSegment("apiKey", apiKey);
+            var obj = Api.ExecuteJson<SickRagePing>(request, baseUrl);
+
+            return obj;
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Helpers/HtmlRemover.cs b/PlexRequests.Helpers/HtmlRemover.cs
index 64d23a6de..43d484255 100644
--- a/PlexRequests.Helpers/HtmlRemover.cs
+++ b/PlexRequests.Helpers/HtmlRemover.cs
@@ -33,6 +33,10 @@ namespace PlexRequests.Helpers
     {
         public static string RemoveHtml(this string value)
         {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
             var step1 = Regex.Replace(value, @"<[^>]+>|&nbsp;", "").Trim();
             var step2 = Regex.Replace(step1, @"\s{2,}", " ");
             return step2;
diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
index 117157927..8e641181e 100644
--- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
+++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
@@ -108,7 +108,7 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title", Year = "2011"} } };
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong tistle", Year = "2011"} } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index 999c7d697..bc1cfb8e7 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -97,11 +97,21 @@ namespace PlexRequests.Services
             {
                 throw new ApplicationSettingsException("The settings are not configured for Plex or Authentication");
             }
+            if (!string.IsNullOrEmpty(year))
+            {
+                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
+                var result = results.Video?.FirstOrDefault(x => x.Title.Contains(title) && x.Year == year);
+                var directoryTitle = results.Directory?.Title == title && results.Directory?.Year == year;
+                return result?.Title != null || directoryTitle;
+            }
+            else
+            {
+                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
+                var result = results.Video?.FirstOrDefault(x => x.Title.Contains(title));
+                var directoryTitle = results.Directory?.Title == title;
+                return result?.Title != null || directoryTitle;
+            }
 
-            var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-            var result = results.Video?.FirstOrDefault(x => x.Title == title && x.Year == year);
-            var directoryTitle = results.Directory?.Title == title && results.Directory?.Year == year;
-            return result?.Title != null || directoryTitle;
         }
 
         private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth, IEnumerable<RequestedModel> requests)
diff --git a/PlexRequests.Store/Repository/RequestJsonRepository.cs b/PlexRequests.Store/Repository/RequestJsonRepository.cs
index 54bdfd282..cacd2356e 100644
--- a/PlexRequests.Store/Repository/RequestJsonRepository.cs
+++ b/PlexRequests.Store/Repository/RequestJsonRepository.cs
@@ -74,7 +74,7 @@ namespace PlexRequests.Store.Repository
 
         public RequestBlobs Get(int id)
         {
-            var key = TypeName + "Get";
+            var key = TypeName + "Get" + id;
             var item = Cache.GetOrSet(key, () =>
             {
                 using (var con = Db.DbConnection())
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 358940c5c..8fd5aad2b 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -62,12 +62,10 @@ namespace PlexRequests.UI
         protected override void ConfigureRequestContainer(TinyIoCContainer container, NancyContext context)
         {
             container.Register<IUserMapper, UserMapper>();
-
             container.Register<ISqliteConfiguration, DbConfiguration>(new DbConfiguration(new SqliteFactory()));
-
-            container.Register<ISettingsRepository, SettingsJsonRepository>();
             container.Register<ICacheProvider, MemoryCacheProvider>();
 
+            // Settings
             container.Register<ISettingsService<PlexRequestSettings>, SettingsServiceV2<PlexRequestSettings>>();
             container.Register<ISettingsService<CouchPotatoSettings>, SettingsServiceV2<CouchPotatoSettings>>();
             container.Register<ISettingsService<AuthenticationSettings>, SettingsServiceV2<AuthenticationSettings>>();
@@ -76,20 +74,22 @@ namespace PlexRequests.UI
             container.Register<ISettingsService<SickRageSettings>, SettingsServiceV2<SickRageSettings>>();
             container.Register<ISettingsService<EmailNotificationSettings>, SettingsServiceV2<EmailNotificationSettings>>();
             container.Register<ISettingsService<PushbulletNotificationSettings>, SettingsServiceV2<PushbulletNotificationSettings>>();
+
+            // Repo's
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
             container.Register<IRequestService, JsonRequestService>();
+            container.Register<ISettingsRepository, SettingsJsonRepository>();
 
+            // Services
             container.Register<IAvailabilityChecker, PlexAvailabilityChecker>();
             container.Register<IConfigurationReader, ConfigurationReader>();
             container.Register<IIntervals, UpdateInterval>();
 
+            // Api's
             container.Register<ICouchPotatoApi, CouchPotatoApi>();
             container.Register<IPushbulletApi, PushbulletApi>();
-
+            container.Register<ISickRageApi, SickrageApi>();
             container.Register<ISonarrApi, SonarrApi>();
-            //container.Register<ISonarrApi, MockSonarrApi>();
-
-
             container.Register<IPlexApi, PlexApi>();
 
             SubscribeAllObservers(container);
@@ -102,7 +102,7 @@ namespace PlexRequests.UI
             TaskManager.Initialize(new PlexRegistry());
 
             CookieBasedSessions.Enable(pipelines, CryptographyConfiguration.Default);
-            
+
             StaticConfiguration.DisableErrorTraces = false;
 
             base.ApplicationStartup(container, pipelines);
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 5e26fc4a7..1a387b86c 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -210,7 +210,7 @@ $(document).on("click", ".clear", function (e) {
 
             if (checkJsonResponse(response)) {
                 generateNotify("Success! Issues Cleared.", "info");
-                $('#issueArea').html("<div>Issue: None</div>");
+                $('#issueArea'+buttonId).html("<div>Issue: None</div>");
             }
         },
         error: function (e) {
diff --git a/PlexRequests.UI/Helpers/TvSender.cs b/PlexRequests.UI/Helpers/TvSender.cs
new file mode 100644
index 000000000..9e63749fc
--- /dev/null
+++ b/PlexRequests.UI/Helpers/TvSender.cs
@@ -0,0 +1,77 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: TvSender.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 Nancy;
+using NLog;
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.SickRage;
+using PlexRequests.Api.Models.Sonarr;
+using PlexRequests.Core;
+using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
+using PlexRequests.Store;
+using PlexRequests.UI.Models;
+
+namespace PlexRequests.UI.Helpers
+{
+    public class TvSender
+    {
+        public TvSender(ISonarrApi sonarrApi, ISickRageApi srApi)
+        {
+            SonarrApi = sonarrApi;
+            SickrageApi = srApi;
+        }
+        private ISonarrApi SonarrApi { get; }
+        private ISickRageApi SickrageApi { get; }
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        public SonarrAddSeries SendToSonarr(SonarrSettings sonarrSettings, RequestedModel model)
+        {
+            int qualityProfile;
+            int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
+            var result = SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
+                sonarrSettings.SeasonFolders, sonarrSettings.RootPath, model.LatestTv, sonarrSettings.ApiKey,
+                sonarrSettings.FullUri);
+
+            Log.Trace("Sonarr Add Result: ");
+            Log.Trace(result.DumpJson());
+
+            return result;
+        }
+
+        public SickRageTvAdd SendToSickRage(SickRageSettings sickRageSettings, RequestedModel model)
+        {
+            var result = SickrageApi.AddSeries(model.ProviderId, model.LatestTv, sickRageSettings.QualityProfile,
+                           sickRageSettings.ApiKey, sickRageSettings.FullUri);
+
+            Log.Trace("SickRage Add Result: ");
+            Log.Trace(result.DumpJson());
+
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs
index 2e6c719ad..98d2bd591 100644
--- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs
+++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs
@@ -43,7 +43,7 @@ namespace PlexRequests.UI.Modules
     {
 
         public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPlexApi plexApi,
-            ISettingsService<AuthenticationSettings> authSettings) : base("test")
+            ISettingsService<AuthenticationSettings> authSettings, ISickRageApi srApi) : base("test")
         {
             this.RequiresAuthentication();
             
@@ -51,10 +51,12 @@ namespace PlexRequests.UI.Modules
             SonarrApi = sonarrApi;
             PlexApi = plexApi;
             AuthSettings = authSettings;
+            SickRageApi = srApi;
 
             Post["/cp"] = _ => CouchPotatoTest();
             Post["/sonarr"] = _ => SonarrTest();
             Post["/plex"] = _ => PlexTest();
+            Post["/sickrage"] = _ => SickRageTest();
 
         }
         
@@ -62,6 +64,7 @@ namespace PlexRequests.UI.Modules
         private ISonarrApi SonarrApi { get; }
         private ICouchPotatoApi CpApi { get; }
         private IPlexApi PlexApi { get; }
+        private ISickRageApi SickRageApi { get; }
         private ISettingsService<AuthenticationSettings> AuthSettings { get; }
 
         private Response CouchPotatoTest()
@@ -99,7 +102,7 @@ namespace PlexRequests.UI.Modules
                : Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Sonarr, please check your settings." });
 
             }
-            catch (ApplicationException e) // Exceptions are expected if we cannot connect so we will just log and swallow them.
+            catch (ApplicationException e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
             {
                 Log.Warn("Exception thrown when attempting to get Sonarr's status: ");
                 Log.Warn(e);
@@ -128,7 +131,7 @@ namespace PlexRequests.UI.Modules
                : Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Plex, please check your settings." });
 
             }
-            catch (ApplicationException e) // Exceptions are expected if we cannot connect so we will just log and swallow them.
+            catch (ApplicationException e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
             {
                 Log.Warn("Exception thrown when attempting to get Plex's status: ");
                 Log.Warn(e);
@@ -140,5 +143,30 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
             }
         }
+
+        private Response SickRageTest()
+        {
+            var sickRageSettings = this.Bind<SickRageSettings>();
+           
+            try
+            {
+                var status = SickRageApi.Ping(sickRageSettings.ApiKey, sickRageSettings.FullUri);
+                return status?.result == "success"
+                    ? Response.AsJson(new JsonResponseModel { Result = true, Message = "Connected to SickRage successfully!" })
+               : Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to SickRage, please check your settings." });
+
+            }
+            catch (ApplicationException e) // Exceptions are expected, if we cannot connect so we will just log and swallow them.
+            {
+                Log.Warn("Exception thrown when attempting to get SickRage's status: ");
+                Log.Warn(e);
+                var message = $"Could not connect to SickRage, please check your settings. <strong>Exception Message:</strong> {e.Message}";
+                if (e.InnerException != null)
+                {
+                    message = $"Could not connect to SickRage, please check your settings. <strong>Exception Message:</strong> {e.InnerException.Message}";
+                }
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index 74a26a6a2..4a468414b 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
+using System.Linq.Expressions;
 using Nancy;
 using Nancy.Security;
 
@@ -36,7 +36,9 @@ using PlexRequests.Api;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
 using PlexRequests.Store;
+using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
 
 namespace PlexRequests.UI.Modules
@@ -45,7 +47,7 @@ namespace PlexRequests.UI.Modules
     {
 
         public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSettings> cpService, ICouchPotatoApi cpApi, ISonarrApi sonarrApi,
-            ISettingsService<SonarrSettings> sonarrSettings) : base("approval")
+            ISettingsService<SonarrSettings> sonarrSettings, ISickRageApi srApi, ISettingsService<SickRageSettings> srSettings) : base("approval")
         {
             this.RequiresAuthentication();
 
@@ -54,6 +56,8 @@ namespace PlexRequests.UI.Modules
             CpApi = cpApi;
             SonarrApi = sonarrApi;
             SonarrSettings = sonarrSettings;
+            SickRageApi = srApi;
+            SickRageSettings = srSettings;
 
             Post["/approve"] = parameters => Approve((int)Request.Form.requestid);
             Post["/approveall"] = x => ApproveAll();
@@ -63,8 +67,10 @@ namespace PlexRequests.UI.Modules
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
         private ISettingsService<SonarrSettings> SonarrSettings { get; }
+        private ISettingsService<SickRageSettings> SickRageSettings { get; }
         private ISettingsService<CouchPotatoSettings> CpService { get; }
         private ISonarrApi SonarrApi { get; }
+        private ISickRageApi SickRageApi { get; }
         private ICouchPotatoApi CpApi { get; }
 
         /// <summary>
@@ -74,6 +80,7 @@ namespace PlexRequests.UI.Modules
         /// <returns></returns>
         private Response Approve(int requestId)
         {
+            Log.Info("approving request {0}", requestId);
             if (!Context.CurrentUser.IsAuthenticated())
             {
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
@@ -100,20 +107,63 @@ namespace PlexRequests.UI.Modules
 
         private Response RequestTvAndUpdateStatus(RequestedModel request)
         {
+            var sender = new TvSender(SonarrApi, SickRageApi);
+
             var sonarrSettings = SonarrSettings.GetSettings();
-            int qualityProfile;
-            int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
-            var result = SonarrApi.AddSeries(request.ProviderId, request.Title, qualityProfile,
-                sonarrSettings.SeasonFolders, sonarrSettings.RootPath, request.LatestTv, sonarrSettings.ApiKey,
-                sonarrSettings.FullUri);
+            if (sonarrSettings.Enabled)
+            {
+                Log.Trace("Sending to Sonarr");
+                var result = sender.SendToSonarr(sonarrSettings, request);
+                Log.Trace("Sonarr Result: ");
+                Log.Trace(result.DumpJson());
+                if (!string.IsNullOrEmpty(result.title))
+                {
+                    Log.Info("Sent successfully, Approving request now.");
+                    request.Approved = true;
+                    var requestResult = Service.UpdateRequest(request);
+                    Log.Trace("Approval result: {0}",requestResult);
+                    if (requestResult)
+                    {
+                        return Response.AsJson(new JsonResponseModel { Result = true });
+                    }
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Updated Sonarr but could not approve it in PlexRequests :("});
+                }
+                return Response.AsJson(new JsonResponseModel
+                {
+                    Result = false,
+                    Message = "Could not add the series to Sonarr"
+                });
+            }
 
-            if (!string.IsNullOrEmpty(result.title))
+            var srSettings = SickRageSettings.GetSettings();
+            if (srSettings.Enabled)
             {
-                return Response.AsJson(new JsonResponseModel { Result = true });
+                Log.Trace("Sending to SickRage");
+                var result = sender.SendToSickRage(srSettings, request);
+                Log.Trace("SickRage Result: ");
+                Log.Trace(result.DumpJson());
+                if (result?.result == "success")
+                {
+                    Log.Info("Sent successfully, Approving request now.");
+                    request.Approved = true;
+                    var requestResult = Service.UpdateRequest(request);
+                    Log.Trace("Approval result: {0}", requestResult);
+                    if (requestResult)
+                    {
+                        return Response.AsJson(new JsonResponseModel { Result = true });
+                    }
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Updated SickRage but could not approve it in PlexRequests :(" });
+                }
+                return Response.AsJson(new JsonResponseModel
+                {
+                    Result = false,
+                    Message = result?.message != null ? "<b>Message From SickRage: </b>" + result.message : "Could not add the series to SickRage"
+                });
             }
             return Response.AsJson(new JsonResponseModel
             {
-                Result = false, Message = "Could not add the series to Sonarr"
+                Result = false,
+                Message = "SickRage or Sonarr are not set up!"
             });
         }
 
@@ -184,12 +234,42 @@ namespace PlexRequests.UI.Modules
                     }
                     else
                     {
-                        Log.Error("Could not approve send the movie {0} to couch potato!", r.Title);
+                        Log.Error("Could not approve and send the movie {0} to couch potato!", r.Title);
                     }
                 }
                 if (r.Type == RequestType.TvShow)
                 {
-                    // TODO
+                    var sender = new TvSender(SonarrApi,SickRageApi);
+                    var sr = SickRageSettings.GetSettings();
+                    var sonarr = SonarrSettings.GetSettings();
+                    if (sr.Enabled)
+                    {
+                        var result = sender.SendToSickRage(sr, r);
+                        if (result?.result == "success")
+                        {
+                            r.Approved = true;
+                            updatedRequests.Add(r);
+                        }
+                        else
+                        {
+                            Log.Error("Could not approve and send the TV {0} to SickRage!", r.Title);
+                            Log.Error("SickRage Message: {0}", result?.message);
+                        }
+                    }
+
+                    if (sonarr.Enabled)
+                    {
+                        var result = sender.SendToSonarr(sonarr, r);
+                        if (result != null)
+                        {
+                            r.Approved = true;
+                            updatedRequests.Add(r);
+                        }
+                        else
+                        {
+                            Log.Error("Could not approve and send the TV {0} to Sonarr!", r.Title);
+                        }
+                    }
                 }
             }
             try
@@ -208,7 +288,6 @@ namespace PlexRequests.UI.Modules
 
         }
 
-
         private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
         { 
             Log.Info("Adding movie to CP : {0}", r.Title);
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index f56ac9b40..b5e8b2e99 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -42,6 +42,7 @@ using PlexRequests.Helpers;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Services.Notification;
 using PlexRequests.Store;
+using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
 
 namespace PlexRequests.UI.Modules
@@ -51,7 +52,7 @@ namespace PlexRequests.UI.Modules
         public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings> cpSettings,
             ISettingsService<PlexRequestSettings> prSettings, IAvailabilityChecker checker,
             IRequestService request, ISonarrApi sonarrApi, ISettingsService<SonarrSettings> sonarrSettings,
-            ICouchPotatoApi cpApi) : base("search")
+            ISettingsService<SickRageSettings> sickRageService, ICouchPotatoApi cpApi, ISickRageApi srApi) : base("search")
         {
             CpService = cpSettings;
             PrService = prSettings;
@@ -63,6 +64,8 @@ namespace PlexRequests.UI.Modules
             SonarrApi = sonarrApi;
             SonarrService = sonarrSettings;
             CouchPotatoApi = cpApi;
+            SickRageService = sickRageService;
+            SickrageApi = srApi;
 
             Get["/"] = parameters => RequestLoad();
 
@@ -79,11 +82,13 @@ namespace PlexRequests.UI.Modules
         private ICouchPotatoApi CouchPotatoApi { get; }
         private ISonarrApi SonarrApi { get; }
         private TheTvDbApi TvApi { get; }
+        private ISickRageApi SickrageApi { get; }
         private IRequestService RequestService { get; }
         private ICacheProvider Cache { get; }
         private ISettingsService<CouchPotatoSettings> CpService { get; }
         private ISettingsService<PlexRequestSettings> PrService { get; }
         private ISettingsService<SonarrSettings> SonarrService { get; }
+        private ISettingsService<SickRageSettings> SickRageService { get; }
         private IAvailabilityChecker Checker { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
         private string AuthToken => Cache.GetOrSet(CacheKeys.TvDbToken, TvApi.Authenticate, 50);
@@ -124,7 +129,7 @@ namespace PlexRequests.UI.Modules
                     // http://thetvdb.com/banners/_cache/posters/ID-1.jpg
                     Banner = t.show.image?.medium,
                     FirstAired = t.show.premiered,
-                    Id = t.show.id,
+                    Id = t.show.externals?.thetvdb ?? 0,
                     ImdbId = t.show.externals?.imdb,
                     Network = t.show.network?.name,
                     NetworkId = t.show.network?.id.ToString(),
@@ -133,7 +138,7 @@ namespace PlexRequests.UI.Modules
                     Runtime = t.show.runtime.ToString(),
                     SeriesId = t.show.id,
                     SeriesName = t.show.name,
-                    
+
                     Status = t.show.status,
                 });
             }
@@ -186,12 +191,12 @@ namespace PlexRequests.UI.Modules
             Log.Trace("Getting movie info from TheMovieDb");
             Log.Trace(movieInfo.DumpJson);
 
-//#if !DEBUG
+            //#if !DEBUG
             if (CheckIfTitleExistsInPlex(movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString()))
             {
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{movieInfo.Title} is already in Plex!" });
             }
-//#endif
+            //#endif
 
             var model = new RequestedModel
             {
@@ -215,7 +220,7 @@ namespace PlexRequests.UI.Modules
             if (!settings.RequireApproval)
             {
                 Log.Info("Adding movie to CP (No approval required)");
-                var result = CouchPotatoApi.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri,cpSettings.ProfileId);
+                var result = CouchPotatoApi.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri, cpSettings.ProfileId);
                 Log.Debug("Adding movie to CP result {0}", result);
                 if (result)
                 {
@@ -260,21 +265,21 @@ namespace PlexRequests.UI.Modules
 
             var tvApi = new TvMazeApi();
 
-            var showInfo = tvApi.ShowLookup(showId);
+            var showInfo = tvApi.ShowLookupByTheTvDbId(showId);
 
-//#if !DEBUG
-            if (CheckIfTitleExistsInPlex(showInfo.name, showInfo.premiered.Substring(0,4))) // Take only the year Format = 2014-01-01
+            //#if !DEBUG
+            if (CheckIfTitleExistsInPlex(showInfo.name, showInfo.premiered?.Substring(0, 4))) // Take only the year Format = 2014-01-01
             {
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.name} is already in Plex!" });
             }
-//#endif
+            //#endif
 
             DateTime firstAir;
             DateTime.TryParse(showInfo.premiered, out firstAir);
 
             var model = new RequestedModel
             {
-                ProviderId = showInfo.id,
+                ProviderId = showInfo.externals?.thetvdb ?? 0,
                 Type = RequestType.TvShow,
                 Overview = showInfo.summary.RemoveHtml(),
                 PosterPath = showInfo.image?.medium,
@@ -293,20 +298,39 @@ namespace PlexRequests.UI.Modules
             if (!settings.RequireApproval)
             {
                 var sonarrSettings = SonarrService.GetSettings();
-                int qualityProfile;
-                int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
-                var result = SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
-                    sonarrSettings.SeasonFolders, sonarrSettings.RootPath, model.LatestTv, sonarrSettings.ApiKey,
-                    sonarrSettings.FullUri);
-                if (result != null)
+                var sender = new TvSender(SonarrApi, SickrageApi);
+                if (sonarrSettings.Enabled)
                 {
-                    model.Approved = true;
-                    Log.Debug("Adding tv to database requests (No approval required)");
-                    RequestService.AddRequest(model);
+                    var result = sender.SendToSonarr(sonarrSettings, model);
+                    if (result != null)
+                    {
+                        model.Approved = true;
+                        Log.Debug("Adding tv to database requests (No approval required & Sonarr)");
+                        RequestService.AddRequest(model);
+
+                        return Response.AsJson(new JsonResponseModel { Result = true });
+                    }
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to Sonarr! Please check your settings." });
 
-                    return Response.AsJson(new JsonResponseModel { Result = true });
                 }
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
+
+                var srSettings = SickRageService.GetSettings();
+                if (srSettings.Enabled)
+                {
+                    var result = sender.SendToSickRage(srSettings, model);
+                    if (result?.result == "success")
+                    {
+                        model.Approved = true;
+                        Log.Debug("Adding tv to database requests (No approval required & SickRage)");
+                        RequestService.AddRequest(model);
+
+                        return Response.AsJson(new JsonResponseModel { Result = true });
+                    }
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = result?.message != null ? "<b>Message From SickRage: </b>" + result.message : "Something went wrong adding the movie to SickRage! Please check your settings." });
+                }
+
+                return Response.AsJson("The request of TV Shows is not correctly set up. Please contact your admin.");
+
             }
 
             RequestService.AddRequest(model);
@@ -314,15 +338,30 @@ namespace PlexRequests.UI.Modules
 
             return Response.AsJson(new { Result = true });
         }
-        private string GetTvDbAuthToken(TheTvDbApi api)
-        {
-            return Cache.GetOrSet(CacheKeys.TvDbToken, api.Authenticate, 50);
-        }
 
         private bool CheckIfTitleExistsInPlex(string title, string year)
         {
             var result = Checker.IsAvailable(title, year);
             return result;
         }
+
+        private Response SendToSickRage(SickRageSettings sickRageSettings, RequestedModel model)
+        {
+            var result = SickrageApi.AddSeries(model.ProviderId, model.LatestTv, sickRageSettings.QualityProfile,
+                           sickRageSettings.ApiKey, sickRageSettings.FullUri);
+
+            Log.Trace("SickRage Result: ");
+            Log.Trace(result.DumpJson());
+
+            if (result?.result == "success")
+            {
+                model.Approved = true;
+                Log.Debug("Adding tv to database requests (No approval required & SickRage)");
+                RequestService.AddRequest(model);
+
+                return Response.AsJson(new JsonResponseModel { Result = true });
+            }
+            return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to SickRage! Please check your settings." });
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index a5eed1bcf..69af5770c 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -160,6 +160,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Helpers\TvSender.cs" />
     <Compile Include="Helpers\ValidationHelper.cs" />
     <Compile Include="Validators\PushbulletSettingsValidator.cs" />
     <Compile Include="Validators\EmailNotificationSettingsValidator.cs" />
diff --git a/PlexRequests.UI/Views/Admin/Sickrage.cshtml b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
index 34b17bb49..e03f6a458 100644
--- a/PlexRequests.UI/Views/Admin/Sickrage.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
@@ -68,15 +68,15 @@
                 <label for="profiles" class="control-label">Quality Profiles</label>
                 <div id="profiles">
                     <select class="form-control" value="selected">
-                        <option selected="selected" value="default">Use Deafult</option>
-                        <option value="sdtv">SD TV</option>
-                        <option value="sddvd">SD DVD</option>
-                        <option value="hdtv">HD TV</option>
-                        <option value="rawhdtv">Raw HD TV</option>
-                        <option value="hdwebdl">HD Web DL</option>
-                        <option value="fullhdwebdl">Full HD Web DL</option>
-                        <option value="hdbluray">HD Bluray</option>
-                        <option value="fullhdbluray">Full HD Bluray</option>
+                        <option id="default" value="default">Use Deafult</option>
+                        <option id="sdtv" value="sdtv">SD TV</option>
+                        <option id="sddvd" value="sddvd">SD DVD</option>
+                        <option id="hdtv" value="hdtv">HD TV</option>
+                        <option id="rawhdtv" value="rawhdtv">Raw HD TV</option>
+                        <option id="hdwebdl" value="hdwebdl">HD Web DL</option>
+                        <option id="fullhdwebdl" value="fullhdwebdl">Full HD Web DL</option>
+                        <option id="hdbluray" value="hdbluray">HD Bluray</option>
+                        <option id="fullhdbluray" value="fullhdbluray">Full HD Bluray</option>
                     </select>
                 </div>
             </div>
@@ -100,10 +100,17 @@
 
 
 <script>
-    $(function () {
+    $(function() {
 
-        
-        $('#save').click(function(e) {
+        @if (!string.IsNullOrEmpty(Model.QualityProfile))
+        {
+    <text>
+        var qualitySelected = '@Model.QualityProfile';
+        $('#' + qualitySelected).prop("selected", "selected");
+        </text>
+        }
+
+        $('#save').click(function (e) {
             e.preventDefault();
             var port = $('#portNumber').val();
             if (isNaN(port)) {
@@ -136,44 +143,12 @@
             });
         });
 
-        $('#getProfiles').click(function (e) {
-            e.preventDefault();
-            if (!$('#Ip').val()) {
-                generateNotify("Please enter a valid IP/Hostname.", "warning");
-                return;
-            }
-            if (!$('#portNumber').val()) {
-                generateNotify("Please enter a valid Port Number.", "warning");
-                return;
-            }
-            if (!$('#ApiKey').val()) {
-                generateNotify("Please enter a valid ApiKey.", "warning");
-                return;
-            }
-            var $form = $("#mainForm");
-            $.ajax({
-                type: $form.prop("method"),
-                data: $form.serialize(),
-                url: "sonarrprofiles",
-                dataType: "json",
-                success: function (response) {
-                    response.forEach(function (result) {
-                        $("#select").append("<option value='" + result.id + "'>" + result.name + "</option>");
-                    });
-                },
-                error: function (e) {
-                    console.log(e);
-                    generateNotify("Something went wrong!", "danger");
-                }
-            });
-        });
-
-        $('#testSonarr').click(function (e) {
+        $('#testSickRage').click(function (e) {
             e.preventDefault();
             var $form = $("#mainForm");
             $.ajax({
                 type: $form.prop("method"),
-                url: "/test/sonarr",
+                url: "/test/sickrage",
                 data: $form.serialize(),
                 dataType: "json",
                 success: function (response) {
diff --git a/PlexRequests.UI/Views/Admin/Sonarr.cshtml b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
index 192161a23..5185e8ff4 100644
--- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
@@ -146,11 +146,6 @@
                 generateNotify("Something went wrong!", "danger");
             }
         });
-
-
-
-
-
         </text>
     }
 
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index c33e71b5e..22354440c 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -95,7 +95,7 @@
                 </div>
                 <div>Requested By: {{requestedBy}}</div>
                 <div>Requested Date: {{requestedDate}}</div>
-                <div id="issueArea">
+                <div id="issueArea{{requestId}}">
                     {{#if otherMessage}}
                     <div>Message: {{otherMessage}}</div>
                     {{else}}

From f2f74f7ec43a8a2a02e57297c0b2f90d0bb5b470 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Sat, 19 Mar 2016 14:26:05 +0000
Subject: [PATCH 14/23] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8b78102a0..c685705e7 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,8 @@ Just run `PlexRequests.exe`! (Mono compatible `mono PlexRequests.exe`)
 To configure PlexRequests you need to register an admin user by clicking on Admin (top right) and press the Register link.
 You will then have a admin menu option once registered where you can setup Sonarr, Couchpotato and any other settings.
 
+Looking for a Docker Image? Well [rogueosb](https://github.com/rogueosb/) has created a docker image for us, You can find it [here](https://github.com/rogueosb/docker-plexrequestsnet) :smile:
+
 # Contributors
 
 We are looking for any contributions to the project! Just pick up a task, if you have any questions ask and i'll get straight on it!

From 6f8dc7c2245d108f203d748c138a2dfc5caf76b6 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 15:49:02 +0000
Subject: [PATCH 15/23] Fixed an issue where the default quality on Sickrage
 wouldn't work

---
 PlexRequests.Api/SickrageApi.cs | 5 ++++-
 PlexRequests.Core/Setup.cs      | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs
index a28ac21bf..f81693f5d 100644
--- a/PlexRequests.Api/SickrageApi.cs
+++ b/PlexRequests.Api/SickrageApi.cs
@@ -64,7 +64,10 @@ namespace PlexRequests.Api
             request.AddQueryParameter("tvdbid", tvdbId.ToString());
             request.AddQueryParameter("status", status);
             request.AddQueryParameter("future_status", futureStatus);
-            request.AddQueryParameter("initial", quality);
+            if (!quality.Equals("default", StringComparison.CurrentCultureIgnoreCase))
+            {
+                request.AddQueryParameter("initial", quality);
+            }
 
             var obj = Api.Execute<SickRageTvAdd>(request, baseUrl);
 
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 7cab60066..04ce5b9db 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -121,6 +121,12 @@ namespace PlexRequests.Core
                 result.Add(id);
             }
 
+            foreach (var source in requestedModels.Where(x => x.Type== RequestType.Movie))
+            {
+                var id = jsonRepo.AddRequest(source);
+                result.Add(id);
+            }
+
 
             if (result.Any(x => x == -1))
             {

From d1adae15381b9a31ec6d5e42da1fcad8ad3709ea Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 15:57:39 +0000
Subject: [PATCH 16/23] When we do a batch update we need to reset the cache

---
 PlexRequests.Store/Repository/RequestJsonRepository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PlexRequests.Store/Repository/RequestJsonRepository.cs b/PlexRequests.Store/Repository/RequestJsonRepository.cs
index cacd2356e..d02a111b0 100644
--- a/PlexRequests.Store/Repository/RequestJsonRepository.cs
+++ b/PlexRequests.Store/Repository/RequestJsonRepository.cs
@@ -112,8 +112,8 @@ namespace PlexRequests.Store.Repository
 
         public bool UpdateAll(IEnumerable<RequestBlobs> entity)
         {
+            ResetCache();
             var result = new HashSet<bool>();
-
             using (var db = Db.DbConnection())
             {
                 db.Open();

From 8b76732ee872f466f1654b19e377d1f8b544b898 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 16:11:00 +0000
Subject: [PATCH 17/23] Updated the build version ready for the next release

---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 88e18e130..bad7139a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,11 +1,11 @@
-version: 1.3.{build}
+version: 1.4.{build}
 configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '1.3.0'
+  assembly_version: '1.4.0'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.3.0'
+  assembly_informational_version: '1.4.0'
 before_build:
 - cmd: appveyor-retry nuget restore
 build:
@@ -18,7 +18,7 @@ after_build:
     
 deploy:
 - provider: GitHub
-  release: PlexRequests $(appveyor_build_version)
+  release: PlexRequests v$(appveyor_build_version)
   auth_token:
     secure: jDpp1/WUQl3uN41fNI3VeZoRZbDiDfs3GPQ1v+C5ZNE3cWdnUvuJfCCfUbYUV1Rp
   draft: true

From 792bbf5f952b322df340422b356de2fd7e5e16a8 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Sat, 19 Mar 2016 16:42:11 +0000
Subject: [PATCH 18/23] This fixes #36

---
 PlexRequests.Store/SqlTables.sql              |  21 ----
 PlexRequests.UI.Tests/UserLoginModuleTests.cs | 111 +++++++++++++++++-
 PlexRequests.UI/Modules/UserLoginModule.cs    |  17 ++-
 3 files changed, 122 insertions(+), 27 deletions(-)

diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index a6e696fba..23d49a87c 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -36,24 +36,3 @@ CREATE TABLE IF NOT EXISTS Log
     CallSite							varchar(100) NOT NULL,
     Exception							varchar(100) NOT NULL
 );
-
-CREATE TABLE IF NOT EXISTS Requested
-(
-	Id									INTEGER PRIMARY KEY AUTOINCREMENT,
-	Type								INTEGER NOT NULL,
-	ProviderId							INTEGER NOT NULL,
-	ImdbId varchar(50),
-	Overview varchar(50),
-	Title varchar(50) NOT NULL,
-	PosterPath varchar(50) NOT NULL,
-	ReleaseDate varchar(50) NOT NULL,
-	Status varchar(50) NOT NULL,
-	AdminNote varchar(50),
-	Approved INTEGER NOT NULL,
-	LatestTv INTEGER NOT NULL,
-	RequestedBy varchar(50),
-	RequestedDate varchar(50) NOT NULL,
-	Available INTEGER(50),
-	Issues INTEGER,
-	OtherMessage varchar(50)
-);
\ No newline at end of file
diff --git a/PlexRequests.UI.Tests/UserLoginModuleTests.cs b/PlexRequests.UI.Tests/UserLoginModuleTests.cs
index 6b4e0b4d3..338949b00 100644
--- a/PlexRequests.UI.Tests/UserLoginModuleTests.cs
+++ b/PlexRequests.UI.Tests/UserLoginModuleTests.cs
@@ -36,7 +36,6 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 
 using PlexRequests.Api.Interfaces;
-using PlexRequests.Api.Models;
 using PlexRequests.Api.Models.Plex;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
@@ -81,7 +80,7 @@ namespace PlexRequests.UI.Tests
                 with.Header("Accept", "application/json");
                 with.FormValue("Username", "abc");
             });
-            
+
             Assert.That(HttpStatusCode.OK, Is.EqualTo(result.StatusCode));
             Assert.That(result.Context.Request.Session[SessionKeys.UsernameKey], Is.EqualTo("abc"));
 
@@ -142,6 +141,7 @@ namespace PlexRequests.UI.Tests
 
             AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
             PlexMock.Setup(x => x.GetUsers(It.IsAny<string>())).Returns(plexFriends);
+            PlexMock.Setup(x => x.GetAccount(It.IsAny<string>())).Returns(new PlexAccount());
 
             var bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -188,6 +188,7 @@ namespace PlexRequests.UI.Tests
 
             AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
             PlexMock.Setup(x => x.GetUsers(It.IsAny<string>())).Returns(plexFriends);
+            PlexMock.Setup(x => x.GetAccount(It.IsAny<string>())).Returns(new PlexAccount());
 
             var bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -245,6 +246,7 @@ namespace PlexRequests.UI.Tests
             AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
             PlexMock.Setup(x => x.GetUsers(It.IsAny<string>())).Returns(plexFriends);
             PlexMock.Setup(x => x.SignIn(It.IsAny<string>(), It.IsAny<string>())).Returns(plexAuth);
+            PlexMock.Setup(x => x.GetAccount(It.IsAny<string>())).Returns(new PlexAccount());
 
             var bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -376,7 +378,7 @@ namespace PlexRequests.UI.Tests
                 with.RootPathProvider<TestRootPathProvider>();
             });
 
-            bootstrapper.WithSession(new Dictionary<string, object> { {SessionKeys.UsernameKey, "abc"} });
+            bootstrapper.WithSession(new Dictionary<string, object> { { SessionKeys.UsernameKey, "abc" } });
 
             var browser = new Browser(bootstrapper);
             var result = browser.Get("/userlogin/logout", with =>
@@ -388,5 +390,108 @@ namespace PlexRequests.UI.Tests
             Assert.That(HttpStatusCode.SeeOther, Is.EqualTo(result.StatusCode));
             Assert.That(result.Context.Request.Session[SessionKeys.UsernameKey], Is.Null);
         }
+
+        [Test]
+        public void LoginWithOwnerUsernameSuccessfully()
+        {
+            var expectedSettings = new AuthenticationSettings { UserAuthentication = true, PlexAuthToken = "abc" };
+            var plexFriends = new PlexFriends
+            {
+                User = new[]
+                {
+                    new UserFriends()
+                }
+            };
+
+            var account = new PlexAccount { Username = "Jamie" };
+            AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
+            PlexMock.Setup(x => x.GetUsers(It.IsAny<string>())).Returns(plexFriends);
+            PlexMock.Setup(x => x.GetAccount(It.IsAny<string>())).Returns(account);
+            PlexMock.Setup(x => x.SignIn(It.IsAny<string>(), It.IsAny<string>())).Returns(new PlexAuthentication { user = new User { username = "Jamie" } });
+
+            var bootstrapper = new ConfigurableBootstrapper(with =>
+            {
+                with.Module<UserLoginModule>();
+                with.Dependency(AuthMock.Object);
+                with.Dependency(PlexMock.Object);
+                with.RootPathProvider<TestRootPathProvider>();
+            });
+
+            bootstrapper.WithSession(new Dictionary<string, object>());
+
+            var browser = new Browser(bootstrapper);
+            var result = browser.Post("/userlogin", with =>
+            {
+                with.HttpRequest();
+                with.Header("Accept", "application/json");
+                with.FormValue("Username", "Jamie");
+            });
+
+            Assert.That(HttpStatusCode.OK, Is.EqualTo(result.StatusCode));
+            Assert.That(result.Context.Request.Session[SessionKeys.UsernameKey], Is.EqualTo("Jamie"));
+
+            var body = JsonConvert.DeserializeObject<JsonResponseModel>(result.Body.AsString());
+            Assert.That(body.Result, Is.EqualTo(true));
+            AuthMock.Verify(x => x.GetSettings(), Times.Once);
+            PlexMock.Verify(x => x.SignIn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+            PlexMock.Verify(x => x.GetUsers(It.IsAny<string>()), Times.Once);
+        }
+
+        [Test]
+        public void LoginWithOwnerUsernameAndPasswordSuccessfully()
+        {
+            var expectedSettings = new AuthenticationSettings { UserAuthentication = true, UsePassword = true, PlexAuthToken = "abc" };
+            var plexFriends = new PlexFriends
+            {
+                User = new[]
+                {
+                    new UserFriends()
+                }
+            };
+            var plexAuth = new PlexAuthentication
+            {
+                user = new User
+                {
+                    authentication_token = "abc",
+                    username = "Jamie"
+                }
+            };
+
+            var account = new PlexAccount { Username = "Jamie" };
+
+            AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
+            PlexMock.Setup(x => x.GetUsers(It.IsAny<string>())).Returns(plexFriends);
+            PlexMock.Setup(x => x.SignIn(It.IsAny<string>(), It.IsAny<string>())).Returns(plexAuth);
+            PlexMock.Setup(x => x.GetAccount(It.IsAny<string>())).Returns(account);
+
+            var bootstrapper = new ConfigurableBootstrapper(with =>
+            {
+                with.Module<UserLoginModule>();
+                with.Dependency(AuthMock.Object);
+                with.Dependency(PlexMock.Object);
+                with.RootPathProvider<TestRootPathProvider>();
+            });
+
+            bootstrapper.WithSession(new Dictionary<string, object>());
+
+            var browser = new Browser(bootstrapper);
+            var result = browser.Post("/userlogin", with =>
+            {
+                with.HttpRequest();
+                with.Header("Accept", "application/json");
+                with.FormValue("Username", "jamie");
+                with.FormValue("Password", "abc");
+            });
+
+
+            Assert.That(HttpStatusCode.OK, Is.EqualTo(result.StatusCode));
+            Assert.That(result.Context.Request.Session[SessionKeys.UsernameKey], Is.EqualTo("jamie"));
+
+            var body = JsonConvert.DeserializeObject<JsonResponseModel>(result.Body.AsString());
+            Assert.That(body.Result, Is.EqualTo(true));
+            AuthMock.Verify(x => x.GetSettings(), Times.Once);
+            PlexMock.Verify(x => x.SignIn(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+            PlexMock.Verify(x => x.GetUsers(It.IsAny<string>()), Times.Never);
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index 224f86d5e..cfadd2b8f 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -101,7 +102,7 @@ namespace PlexRequests.UI.Modules
                 if (signedIn.user?.authentication_token != null)
                 {
                     Log.Debug("Correct credentials, checking if the user is account owner or in the friends list");
-                    if (CheckIfUserIsOwner(settings.PlexAuthToken, username))
+                    if (CheckIfUserIsOwner(settings.PlexAuthToken, signedIn.user?.username))
                     {
                         Log.Debug("User is the account owner");
                         authenticated = true;
@@ -117,6 +118,11 @@ namespace PlexRequests.UI.Modules
             {
                 Log.Debug("Need to auth");
                 authenticated = CheckIfUserIsInPlexFriends(username, settings.PlexAuthToken);
+                if (CheckIfUserIsOwner(settings.PlexAuthToken, username))
+                {
+                    Log.Debug("User is the account owner");
+                    authenticated = true;
+                }
                 Log.Debug("Friends list result = {0}", authenticated);
             }
             else if(!settings.UserAuthentication) // No auth, let them pass!
@@ -152,7 +158,11 @@ namespace PlexRequests.UI.Modules
         private bool CheckIfUserIsOwner(string authToken, string userName)
         {
             var userAccount = Api.GetAccount(authToken);
-            return userAccount.Username == userName;
+            if (userAccount == null)
+            {
+                return false;
+            }
+            return userAccount.Username != null && userAccount.Username.Equals(userName, StringComparison.CurrentCultureIgnoreCase);
         }
 
         private bool CheckIfUserIsInPlexFriends(string username, string authToken)
@@ -160,7 +170,8 @@ namespace PlexRequests.UI.Modules
             var users = Api.GetUsers(authToken);
             Log.Debug("Plex Users: ");
             Log.Debug(users.DumpJson());
-            return users.User.Any(x => x.Username == username);
+            var allUsers = users.User?.Where(x => !string.IsNullOrEmpty(x.Username));
+            return allUsers != null && allUsers.Any(x => x.Username.Equals(username, StringComparison.CurrentCultureIgnoreCase));
         }
 
         private bool IsUserInDeniedList(string username, AuthenticationSettings settings)

From 08cfc31970a94b37931e275ca9173379eb2cb05f Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Sun, 20 Mar 2016 10:30:17 +0000
Subject: [PATCH 19/23] Update AvailabilityUpdateService.cs

Fixed the bug
---
 PlexRequests.Services/AvailabilityUpdateService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Services/AvailabilityUpdateService.cs b/PlexRequests.Services/AvailabilityUpdateService.cs
index a8bd6f336..0774307e6 100644
--- a/PlexRequests.Services/AvailabilityUpdateService.cs
+++ b/PlexRequests.Services/AvailabilityUpdateService.cs
@@ -50,7 +50,7 @@ namespace PlexRequests.Services
         {
             ConfigurationReader = new ConfigurationReader();
             var repo = new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider());
-            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new RequestService(new GenericRepository<RequestedModel>(new DbConfiguration(new SqliteFactory()))), new PlexApi());
+            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new JsonRequestService(new RequestJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())), new PlexApi());
             HostingEnvironment.RegisterObject(this);
         }
 
@@ -82,4 +82,4 @@ namespace PlexRequests.Services
     {
         void Start(Configuration c);
     }
-}
\ No newline at end of file
+}

From d18534cf3f2fc253e864dc35e3676185fa3d4f95 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Sun, 20 Mar 2016 10:56:15 +0000
Subject: [PATCH 20/23] Update appveyor.yml

---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index bad7139a5..6be053264 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,9 +3,9 @@ configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '1.4.0'
+  assembly_version: '1.4.1'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.4.0'
+  assembly_informational_version: '1.4.1'
 before_build:
 - cmd: appveyor-retry nuget restore
 build:

From 895a0c50eb6830b0f804960cb2bbab56bc3c6c38 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Mon, 21 Mar 2016 14:23:55 +0000
Subject: [PATCH 21/23] Added a subdir to CP, SickRage, Sonarr and Plex #43

---
 .../SettingModels/CouchPotatoSettings.cs      |  6 ++++++
 .../SettingModels/PlexSettings.cs             |  6 ++++++
 .../SettingModels/SickRageSettings.cs         |  6 ++++++
 .../SettingModels/SonarrSettings.cs           |  6 ++++++
 PlexRequests.Helpers.Tests/UriHelperTests.cs  | 19 ++++++++++++++++++-
 PlexRequests.Helpers/UriHelper.cs             | 19 +++++++++++++++++++
 .../Views/Admin/CouchPotato.cshtml            |  6 ++++++
 PlexRequests.UI/Views/Admin/Plex.cshtml       |  6 ++++++
 PlexRequests.UI/Views/Admin/Sickrage.cshtml   |  7 +++++++
 PlexRequests.UI/Views/Admin/Sonarr.cshtml     |  6 ++++++
 10 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
index 7c18ca5d7..ff7ea01a5 100644
--- a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
+++ b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
@@ -38,12 +38,18 @@ namespace PlexRequests.Core.SettingModels
         public string ApiKey { get; set; }
         public bool Ssl { get; set; }
         public string ProfileId { get; set; }
+        public string SubDir { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
+                if (!string.IsNullOrEmpty(SubDir))
+                {
+                    var formattedSubDir = Ip.ReturnUriWithSubDir(Port, Ssl, SubDir);
+                    return formattedSubDir;
+                }
                 var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
diff --git a/PlexRequests.Core/SettingModels/PlexSettings.cs b/PlexRequests.Core/SettingModels/PlexSettings.cs
index 89bc01931..fa39af857 100644
--- a/PlexRequests.Core/SettingModels/PlexSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexSettings.cs
@@ -36,12 +36,18 @@ namespace PlexRequests.Core.SettingModels
         public string Ip { get; set; }
         public int Port { get; set; }
         public bool Ssl { get; set; }
+        public string SubDir { get; set; }
        
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
+                if (!string.IsNullOrEmpty(SubDir))
+                {
+                    var formattedSubDir = Ip.ReturnUriWithSubDir(Port, Ssl, SubDir);
+                    return formattedSubDir;
+                }
                 var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
diff --git a/PlexRequests.Core/SettingModels/SickRageSettings.cs b/PlexRequests.Core/SettingModels/SickRageSettings.cs
index 344e41434..657de3b50 100644
--- a/PlexRequests.Core/SettingModels/SickRageSettings.cs
+++ b/PlexRequests.Core/SettingModels/SickRageSettings.cs
@@ -39,12 +39,18 @@ namespace PlexRequests.Core.SettingModels
         public string ApiKey { get; set; }
         public string QualityProfile { get; set; }
         public bool Ssl { get; set; }
+        public string SubDir { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
+                if (!string.IsNullOrEmpty(SubDir))
+                {
+                    var formattedSubDir = Ip.ReturnUriWithSubDir(Port, Ssl, SubDir);
+                    return formattedSubDir;
+                }
                 var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
diff --git a/PlexRequests.Core/SettingModels/SonarrSettings.cs b/PlexRequests.Core/SettingModels/SonarrSettings.cs
index 2c128f993..3c680e0e5 100644
--- a/PlexRequests.Core/SettingModels/SonarrSettings.cs
+++ b/PlexRequests.Core/SettingModels/SonarrSettings.cs
@@ -41,12 +41,18 @@ namespace PlexRequests.Core.SettingModels
         public bool SeasonFolders { get; set; }
         public string RootPath { get; set; }
         public bool Ssl { get; set; }
+        public string SubDir { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
+                if (!string.IsNullOrEmpty(SubDir))
+                {
+                    var formattedSubDir = Ip.ReturnUriWithSubDir(Port, Ssl, SubDir);
+                    return formattedSubDir;
+                }
                 var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
diff --git a/PlexRequests.Helpers.Tests/UriHelperTests.cs b/PlexRequests.Helpers.Tests/UriHelperTests.cs
index 7c767dfd0..93fb32997 100644
--- a/PlexRequests.Helpers.Tests/UriHelperTests.cs
+++ b/PlexRequests.Helpers.Tests/UriHelperTests.cs
@@ -26,6 +26,7 @@
 #endregion
 
 using System;
+using System.Linq.Expressions;
 using NUnit.Framework;
 
 namespace PlexRequests.Helpers.Tests
@@ -35,7 +36,7 @@ namespace PlexRequests.Helpers.Tests
     {
         [TestCaseSource(nameof(UriData))]
         public void CreateUri1(string uri, Uri expected)
-        { 
+        {
             var result = uri.ReturnUri();
 
             Assert.That(result, Is.EqualTo(expected));
@@ -58,6 +59,14 @@ namespace PlexRequests.Helpers.Tests
             Assert.That(result, Is.EqualTo(expected));
         }
 
+        [TestCaseSource(nameof(UriDataWithSubDir))]
+        public void CreateUriWithSubDir(string uri, int port, bool ssl, string subDir, Uri expected)
+        {
+            var result = uri.ReturnUriWithSubDir(port, ssl, subDir);
+
+            Assert.That(result, Is.EqualTo(expected));
+        }
+
         static readonly object[] UriData =
         {
             new object[] { "google.com", new Uri("http://google.com/"),  },
@@ -84,5 +93,13 @@ namespace PlexRequests.Helpers.Tests
             new object[] {"http://www.google.com/id=2", 443, new Uri("http://www.google.com:443/id=2") },
             new object[] {"https://www.google.com/id=2", 443, new Uri("https://www.google.com:443/id=2") },
         };
+
+        static readonly object[] UriDataWithSubDir =
+{
+            new object[] {"www.google.com", 80,         false,"test", new Uri("http://www.google.com:80/test"),  },
+            new object[] {"www.google.com", 443,        false,"test", new Uri("http://www.google.com:443/test") },
+            new object[] {"http://www.google.com", 443, true,"test", new Uri("https://www.google.com:443/test") },
+            new object[] {"https://www.google.com", 443,true,"test", new Uri("https://www.google.com:443/test") },
+        };
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Helpers/UriHelper.cs b/PlexRequests.Helpers/UriHelper.cs
index c33d5ddf4..707f70436 100644
--- a/PlexRequests.Helpers/UriHelper.cs
+++ b/PlexRequests.Helpers/UriHelper.cs
@@ -53,7 +53,10 @@ namespace PlexRequests.Helpers
         /// </summary>
         /// <param name="val">The value.</param>
         /// <param name="port">The port.</param>
+        /// <param name="ssl">if set to <c>true</c> [SSL].</param>
+        /// <param name="subdir">The subdir.</param>
         /// <returns></returns>
+        /// <exception cref="ApplicationSettingsException">The URI is null, please check your settings to make sure you have configured the applications correctly.</exception>
         /// <exception cref="System.Exception"></exception>
         public static Uri ReturnUri(this string val, int port, bool ssl = default(bool))
         {
@@ -93,5 +96,21 @@ namespace PlexRequests.Helpers
                 throw new Exception(exception.Message, exception);
             }
         }
+
+        public static Uri ReturnUriWithSubDir(this string val, int port, bool ssl, string subDir)
+        {
+            var uriBuilder = new UriBuilder(val);
+            if (ssl)
+            {
+                uriBuilder.Scheme = Uri.UriSchemeHttps;
+            }
+            if (!string.IsNullOrEmpty(subDir))
+            {
+                uriBuilder.Path = subDir;
+            }
+            uriBuilder.Port = port;
+
+            return uriBuilder.Uri;
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
index 4be47db0a..9e0aff8ef 100644
--- a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
+++ b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
@@ -51,6 +51,12 @@
                     </label>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="SubDir" class="control-label">CouchPotato SubDirectory</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
+                </div>
+            </div>
 
 
             <div class="form-group">
diff --git a/PlexRequests.UI/Views/Admin/Plex.cshtml b/PlexRequests.UI/Views/Admin/Plex.cshtml
index fca742fdf..af3702a63 100644
--- a/PlexRequests.UI/Views/Admin/Plex.cshtml
+++ b/PlexRequests.UI/Views/Admin/Plex.cshtml
@@ -43,6 +43,12 @@
                     </label>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="SubDir" class="control-label">Plex SubDirectory</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
+                </div>
+            </div>
             <div class="form-group">
                 <div>
                     <button id="testPlex" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
diff --git a/PlexRequests.UI/Views/Admin/Sickrage.cshtml b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
index e03f6a458..15d57d873 100644
--- a/PlexRequests.UI/Views/Admin/Sickrage.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sickrage.cshtml
@@ -64,6 +64,13 @@
                     </label>
                 </div>
             </div>
+
+            <div class="form-group">
+                <label for="SubDir" class="control-label">SickRage SubDirectory</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
+                </div>
+            </div>
             <div class="form-group">
                 <label for="profiles" class="control-label">Quality Profiles</label>
                 <div id="profiles">
diff --git a/PlexRequests.UI/Views/Admin/Sonarr.cshtml b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
index 5185e8ff4..454f06578 100644
--- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
@@ -64,6 +64,12 @@
                     </label>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="SubDir" class="control-label">Sonarr SubDirectory</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
+                </div>
+            </div>
             <div class="form-group">
                 <div>
                     <button type="submit" id="getProfiles" class="btn btn-primary-outline">Get Quality Profiles</button>

From bbe2bcbfed45bb5b8edd597fe78d655d285a20cf Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Mon, 21 Mar 2016 17:18:57 +0000
Subject: [PATCH 22/23] Started #57, currently there is a bug where the TV list
 won't filter

---
 PlexRequests.UI/Content/custom.css          |    3 +
 PlexRequests.UI/Content/custom.min.css      |    2 +-
 PlexRequests.UI/Content/custom.scss         |    4 +
 PlexRequests.UI/Content/jquery.mixitup.js   | 2098 +++++++++++++++++++
 PlexRequests.UI/Content/requests.js         |   18 +
 PlexRequests.UI/PlexRequests.UI.csproj      |    3 +
 PlexRequests.UI/Views/Requests/Index.cshtml |   46 +-
 PlexRequests.UI/Views/Shared/_Layout.cshtml |    1 +
 8 files changed, 2164 insertions(+), 11 deletions(-)
 create mode 100644 PlexRequests.UI/Content/jquery.mixitup.js

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index a8c70de18..c571269b4 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -120,3 +120,6 @@ label {
   background-color: #5cb85c !important;
   border-color: #5cb85c !important; }
 
+#movieList .mix {
+  display: none; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 37bb1257f..8385aac7b 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index a87a44a97..e1944c04c 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -157,3 +157,7 @@ label {
     background-color: $success-colour $i;
     border-color: $success-colour $i;
 }
+
+#movieList .mix{
+	display: none;
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/jquery.mixitup.js b/PlexRequests.UI/Content/jquery.mixitup.js
new file mode 100644
index 000000000..b23a60279
--- /dev/null
+++ b/PlexRequests.UI/Content/jquery.mixitup.js
@@ -0,0 +1,2098 @@
+/**!
+ * MixItUp v2.1.11
+ *
+ * @copyright Copyright 2015 KunkaLabs Limited.
+ * @author    KunkaLabs Limited.
+ * @link      https://mixitup.kunkalabs.com
+ *
+ * @license   Commercial use requires a commercial license.
+ *            https://mixitup.kunkalabs.com/licenses/
+ *
+ *            Non-commercial use permitted under terms of CC-BY-NC license.
+ *            http://creativecommons.org/licenses/by-nc/3.0/
+ */
+
+(function($, undf){
+	'use strict';
+
+	/**
+	 * MixItUp Constructor Function
+	 * @constructor
+	 * @extends jQuery
+	 */
+
+	$.MixItUp = function(){
+		var self = this;
+
+		self._execAction('_constructor', 0);
+
+		$.extend(self, {
+
+			/* Public Properties
+			---------------------------------------------------------------------- */
+
+			selectors: {
+				target: '.mix',
+				filter: '.filter',
+				sort: '.sort'
+			},
+
+			animation: {
+				enable: true,
+				effects: 'fade scale',
+				duration: 600,
+				easing: 'ease',
+				perspectiveDistance: '3000',
+				perspectiveOrigin: '50% 50%',
+				queue: true,
+				queueLimit: 1,
+				animateChangeLayout: false,
+				animateResizeContainer: true,
+				animateResizeTargets: false,
+				staggerSequence: false,
+				reverseOut: false
+			},
+
+			callbacks: {
+				onMixLoad: false,
+				onMixStart: false,
+				onMixBusy: false,
+				onMixEnd: false,
+				onMixFail: false,
+				_user: false
+			},
+
+			controls: {
+				enable: true,
+				live: false,
+				toggleFilterButtons: false,
+				toggleLogic: 'or',
+				activeClass: 'active'
+			},
+
+			layout: {
+				display: 'inline-block',
+				containerClass: '',
+				containerClassFail: 'fail'
+			},
+
+			load: {
+				filter: 'all',
+				sort: false
+			},
+
+			/* Private Properties
+			---------------------------------------------------------------------- */
+
+			_$body: null,
+			_$container: null,
+			_$targets: null,
+			_$parent: null,
+			_$sortButtons: null,
+			_$filterButtons: null,
+
+			_suckMode: false,
+			_mixing: false,
+			_sorting: false,
+			_clicking: false,
+			_loading: true,
+			_changingLayout: false,
+			_changingClass: false,
+			_changingDisplay: false,
+
+			_origOrder: [],
+			_startOrder: [],
+			_newOrder: [],
+			_activeFilter: null,
+			_toggleArray: [],
+			_toggleString: '',
+			_activeSort: 'default:asc',
+			_newSort: null,
+			_startHeight: null,
+			_newHeight: null,
+			_incPadding: true,
+			_newDisplay: null,
+			_newClass: null,
+			_targetsBound: 0,
+			_targetsDone: 0,
+			_queue: [],
+
+			_$show: $(),
+			_$hide: $()
+		});
+
+		self._execAction('_constructor', 1);
+	};
+
+	/**
+	 * MixItUp Prototype
+	 * @override
+	 */
+
+	$.MixItUp.prototype = {
+		constructor: $.MixItUp,
+
+		/* Static Properties
+		---------------------------------------------------------------------- */
+
+		_instances: {},
+		_handled: {
+			_filter: {},
+			_sort: {}
+		},
+		_bound: {
+			_filter: {},
+			_sort: {}
+		},
+		_actions: {},
+		_filters: {},
+
+		/* Static Methods
+		---------------------------------------------------------------------- */
+
+		/**
+		 * Extend
+		 * @since 2.1.0
+		 * @param {object} new properties/methods
+		 * @extends {object} prototype
+		 */
+
+		extend: function(extension){
+			for(var key in extension){
+				$.MixItUp.prototype[key] = extension[key];
+			}
+		},
+
+		/**
+		 * Add Action
+		 * @since 2.1.0
+		 * @param {string} hook name
+		 * @param {string} namespace
+		 * @param {function} function to execute
+		 * @param {number} priority
+		 * @extends {object} $.MixItUp.prototype._actions
+		 */
+
+		addAction: function(hook, name, func, priority){
+			$.MixItUp.prototype._addHook('_actions', hook, name, func, priority);
+		},
+
+		/**
+		 * Add Filter
+		 * @since 2.1.0
+		 * @param {string} hook name
+		 * @param {string} namespace
+		 * @param {function} function to execute
+		 * @param {number} priority
+		 * @extends {object} $.MixItUp.prototype._filters
+		 */
+
+		addFilter: function(hook, name, func, priority){
+			$.MixItUp.prototype._addHook('_filters', hook, name, func, priority);
+		},
+
+		/**
+		 * Add Hook
+		 * @since 2.1.0
+		 * @param {string} type of hook
+		 * @param {string} hook name
+		 * @param {function} function to execute
+		 * @param {number} priority
+		 * @extends {object} $.MixItUp.prototype._filters
+		 */
+
+		_addHook: function(type, hook, name, func, priority){
+			var collection = $.MixItUp.prototype[type],
+				obj = {};
+
+			priority = (priority === 1 || priority === 'post') ? 'post' : 'pre';
+
+			obj[hook] = {};
+			obj[hook][priority] = {};
+			obj[hook][priority][name] = func;
+
+			$.extend(true, collection, obj);
+		},
+
+
+		/* Private Methods
+		---------------------------------------------------------------------- */
+
+		/**
+		 * Initialise
+		 * @since 2.0.0
+		 * @param {object} domNode
+		 * @param {object} config
+		 */
+
+		_init: function(domNode, config){
+			var self = this;
+
+			self._execAction('_init', 0, arguments);
+
+			config && $.extend(true, self, config);
+
+			self._$body = $('body');
+			self._domNode = domNode;
+			self._$container = $(domNode);
+			self._$container.addClass(self.layout.containerClass);
+			self._id = domNode.id;
+
+			self._platformDetect();
+
+			self._brake = self._getPrefixedCSS('transition', 'none');
+
+			self._refresh(true);
+
+			self._$parent = self._$targets.parent().length ? self._$targets.parent() : self._$container;
+
+			if(self.load.sort){
+				self._newSort = self._parseSort(self.load.sort);
+				self._newSortString = self.load.sort;
+				self._activeSort = self.load.sort;
+				self._sort();
+				self._printSort();
+			}
+
+			self._activeFilter = self.load.filter === 'all' ?
+				self.selectors.target :
+				self.load.filter === 'none' ?
+					'' :
+					self.load.filter;
+
+			self.controls.enable && self._bindHandlers();
+
+			if(self.controls.toggleFilterButtons){
+				self._buildToggleArray();
+
+				for(var i = 0; i < self._toggleArray.length; i++){
+					self._updateControls({filter: self._toggleArray[i], sort: self._activeSort}, true);
+				};
+			} else if(self.controls.enable){
+				self._updateControls({filter: self._activeFilter, sort: self._activeSort});
+			}
+
+			self._filter();
+
+			self._init = true;
+
+			self._$container.data('mixItUp',self);
+
+			self._execAction('_init', 1, arguments);
+
+			self._buildState();
+
+			self._$targets.css(self._brake);
+
+			self._goMix(self.animation.enable);
+		},
+
+		/**
+		 * Platform Detect
+		 * @since 2.0.0
+		 */
+
+		_platformDetect: function(){
+			var self = this,
+				vendorsTrans = ['Webkit', 'Moz', 'O', 'ms'],
+				vendorsRAF = ['webkit', 'moz'],
+				chrome = window.navigator.appVersion.match(/Chrome\/(\d+)\./) || false,
+				ff = typeof InstallTrigger !== 'undefined',
+				prefix = function(el){
+					for (var i = 0; i < vendorsTrans.length; i++){
+						if (vendorsTrans[i] + 'Transition' in el.style){
+							return {
+								prefix: '-'+vendorsTrans[i].toLowerCase()+'-',
+								vendor: vendorsTrans[i]
+							};
+						};
+					};
+					return 'transition' in el.style ? '' : false;
+				},
+				transPrefix = prefix(self._domNode);
+
+			self._execAction('_platformDetect', 0);
+
+			self._chrome = chrome ? parseInt(chrome[1], 10) : false;
+			self._ff = ff ? parseInt(window.navigator.userAgent.match(/rv:([^)]+)\)/)[1]) : false;
+			self._prefix = transPrefix.prefix;
+			self._vendor = transPrefix.vendor;
+			self._suckMode = window.atob && self._prefix ? false : true;
+
+			self._suckMode && (self.animation.enable = false);
+			(self._ff && self._ff <= 4) && (self.animation.enable = false);
+
+			/* Polyfills
+			---------------------------------------------------------------------- */
+
+			/**
+			 * window.requestAnimationFrame
+			 */
+
+			for(var x = 0; x < vendorsRAF.length && !window.requestAnimationFrame; x++){
+				window.requestAnimationFrame = window[vendorsRAF[x]+'RequestAnimationFrame'];
+			}
+
+			/**
+			 * Object.getPrototypeOf
+			 */
+
+			if(typeof Object.getPrototypeOf !== 'function'){
+				if(typeof 'test'.__proto__ === 'object'){
+					Object.getPrototypeOf = function(object){
+						return object.__proto__;
+					};
+				} else {
+					Object.getPrototypeOf = function(object){
+						return object.constructor.prototype;
+					};
+				}
+			}
+
+			/**
+			 * Element.nextElementSibling
+			 */
+
+			if(self._domNode.nextElementSibling === undf){
+				Object.defineProperty(Element.prototype, 'nextElementSibling',{
+					get: function(){
+						var el = this.nextSibling;
+
+						while(el){
+							if(el.nodeType ===1){
+								return el;
+							}
+							el = el.nextSibling;
+						}
+						return null;
+					}
+				});
+			}
+
+			self._execAction('_platformDetect', 1);
+		},
+
+		/**
+		 * Refresh
+		 * @since 2.0.0
+		 * @param {boolean} init
+		 * @param {boolean} force
+		 */
+
+		_refresh: function(init, force){
+			var self = this;
+
+			self._execAction('_refresh', 0, arguments);
+
+			self._$targets = self._$container.find(self.selectors.target);
+
+			for(var i = 0; i < self._$targets.length; i++){
+				var target = self._$targets[i];
+
+				if(target.dataset === undf || force){
+
+					target.dataset = {};
+
+					for(var j = 0; j < target.attributes.length; j++){
+
+						var attr = target.attributes[j],
+							name = attr.name,
+							val = attr.value;
+
+						if(name.indexOf('data-') > -1){
+							var dataName = self._helpers._camelCase(name.substring(5,name.length));
+							target.dataset[dataName] = val;
+						}
+					}
+				}
+
+				if(target.mixParent === undf){
+					target.mixParent = self._id;
+				}
+			}
+
+			if(
+				(self._$targets.length && init) ||
+				(!self._origOrder.length && self._$targets.length)
+			){
+				self._origOrder = [];
+
+				for(var i = 0; i < self._$targets.length; i++){
+					var target = self._$targets[i];
+
+					self._origOrder.push(target);
+				}
+			}
+
+			self._execAction('_refresh', 1, arguments);
+		},
+
+		/**
+		 * Bind Handlers
+		 * @since 2.0.0
+		 */
+
+		_bindHandlers: function(){
+			var self = this,
+				filters = $.MixItUp.prototype._bound._filter,
+				sorts = $.MixItUp.prototype._bound._sort;
+
+			self._execAction('_bindHandlers', 0);
+
+			if(self.controls.live){
+				self._$body
+					.on('click.mixItUp.'+self._id, self.selectors.sort, function(){
+						self._processClick($(this), 'sort');
+					})
+					.on('click.mixItUp.'+self._id, self.selectors.filter, function(){
+						self._processClick($(this), 'filter');
+					});
+			} else {
+				self._$sortButtons = $(self.selectors.sort);
+				self._$filterButtons = $(self.selectors.filter);
+
+				self._$sortButtons.on('click.mixItUp.'+self._id, function(){
+					self._processClick($(this), 'sort');
+				});
+
+				self._$filterButtons.on('click.mixItUp.'+self._id, function(){
+					self._processClick($(this), 'filter');
+				});
+			}
+
+			filters[self.selectors.filter] = (filters[self.selectors.filter] === undf) ? 1 : filters[self.selectors.filter] + 1;
+			sorts[self.selectors.sort] = (sorts[self.selectors.sort] === undf) ? 1 : sorts[self.selectors.sort] + 1;
+
+			self._execAction('_bindHandlers', 1);
+		},
+
+		/**
+		 * Process Click
+		 * @since 2.0.0
+		 * @param {object} $button
+		 * @param {string} type
+		 */
+
+		_processClick: function($button, type){
+			var self = this,
+				trackClick = function($button, type, off){
+					var proto = $.MixItUp.prototype;
+
+					proto._handled['_'+type][self.selectors[type]] = (proto._handled['_'+type][self.selectors[type]] === undf) ?
+						1 :
+						proto._handled['_'+type][self.selectors[type]] + 1;
+
+					if(proto._handled['_'+type][self.selectors[type]] === proto._bound['_'+type][self.selectors[type]]){
+						$button[(off ? 'remove' : 'add')+'Class'](self.controls.activeClass);
+						delete proto._handled['_'+type][self.selectors[type]];
+					}
+				};
+
+			self._execAction('_processClick', 0, arguments);
+
+			if(!self._mixing || (self.animation.queue && self._queue.length < self.animation.queueLimit)){
+				self._clicking = true;
+
+				if(type === 'sort'){
+					var sort = $button.attr('data-sort');
+
+					if(!$button.hasClass(self.controls.activeClass) || sort.indexOf('random') > -1){
+						$(self.selectors.sort).removeClass(self.controls.activeClass);
+						trackClick($button, type);
+						self.sort(sort);
+					}
+				}
+
+				if(type === 'filter') {
+					var filter = $button.attr('data-filter'),
+						ndx,
+						seperator = self.controls.toggleLogic === 'or' ? ',' : '';
+
+					if(!self.controls.toggleFilterButtons){
+						if(!$button.hasClass(self.controls.activeClass)){
+							$(self.selectors.filter).removeClass(self.controls.activeClass);
+							trackClick($button, type);
+							self.filter(filter);
+						}
+					} else {
+						self._buildToggleArray();
+
+						if(!$button.hasClass(self.controls.activeClass)){
+							trackClick($button, type);
+
+							self._toggleArray.push(filter);
+						} else {
+							trackClick($button, type, true);
+							ndx = self._toggleArray.indexOf(filter);
+							self._toggleArray.splice(ndx, 1);
+						}
+
+						self._toggleArray = $.grep(self._toggleArray,function(n){return(n);});
+
+						self._toggleString = self._toggleArray.join(seperator);
+
+						self.filter(self._toggleString);
+					}
+				}
+
+				self._execAction('_processClick', 1, arguments);
+			} else {
+				if(typeof self.callbacks.onMixBusy === 'function'){
+					self.callbacks.onMixBusy.call(self._domNode, self._state, self);
+				}
+				self._execAction('_processClickBusy', 1, arguments);
+			}
+		},
+
+		/**
+		 * Build Toggle Array
+		 * @since 2.0.0
+		 */
+
+		_buildToggleArray: function(){
+			var self = this,
+				activeFilter = self._activeFilter.replace(/\s/g, '');
+
+			self._execAction('_buildToggleArray', 0, arguments);
+
+			if(self.controls.toggleLogic === 'or'){
+				self._toggleArray = activeFilter.split(',');
+			} else {
+				self._toggleArray = activeFilter.split('.');
+
+				!self._toggleArray[0] && self._toggleArray.shift();
+
+				for(var i = 0, filter; filter = self._toggleArray[i]; i++){
+					self._toggleArray[i] = '.'+filter;
+				}
+			}
+
+			self._execAction('_buildToggleArray', 1, arguments);
+		},
+
+		/**
+		 * Update Controls
+		 * @since 2.0.0
+		 * @param {object} command
+		 * @param {boolean} multi
+		 */
+
+		_updateControls: function(command, multi){
+			var self = this,
+				output = {
+					filter: command.filter,
+					sort: command.sort
+				},
+				update = function($el, filter){
+					try {
+						(multi && type === 'filter' && !(output.filter === 'none' || output.filter === '')) ?
+								$el.filter(filter).addClass(self.controls.activeClass) :
+								$el.removeClass(self.controls.activeClass).filter(filter).addClass(self.controls.activeClass);
+					} catch(e) {}
+				},
+				type = 'filter',
+				$el = null;
+
+			self._execAction('_updateControls', 0, arguments);
+
+			(command.filter === undf) && (output.filter = self._activeFilter);
+			(command.sort === undf) && (output.sort = self._activeSort);
+			(output.filter === self.selectors.target) && (output.filter = 'all');
+
+			for(var i = 0; i < 2; i++){
+				$el = self.controls.live ? $(self.selectors[type]) : self['_$'+type+'Buttons'];
+				$el && update($el, '[data-'+type+'="'+output[type]+'"]');
+				type = 'sort';
+			}
+
+			self._execAction('_updateControls', 1, arguments);
+		},
+
+		/**
+		 * Filter (private)
+		 * @since 2.0.0
+		 */
+
+		_filter: function(){
+			var self = this;
+
+			self._execAction('_filter', 0);
+
+			for(var i = 0; i < self._$targets.length; i++){
+				var $target = $(self._$targets[i]);
+
+				if($target.is(self._activeFilter)){
+					self._$show = self._$show.add($target);
+				} else {
+					self._$hide = self._$hide.add($target);
+				}
+			}
+
+			self._execAction('_filter', 1);
+		},
+
+		/**
+		 * Sort (private)
+		 * @since 2.0.0
+		 */
+
+		_sort: function(){
+			var self = this,
+				arrayShuffle = function(oldArray){
+					var newArray = oldArray.slice(),
+						len = newArray.length,
+						i = len;
+
+					while(i--){
+						var p = parseInt(Math.random()*len);
+						var t = newArray[i];
+						newArray[i] = newArray[p];
+						newArray[p] = t;
+					};
+					return newArray;
+				};
+
+			self._execAction('_sort', 0);
+
+			self._startOrder = [];
+
+			for(var i = 0; i < self._$targets.length; i++){
+				var target = self._$targets[i];
+
+				self._startOrder.push(target);
+			}
+
+			switch(self._newSort[0].sortBy){
+				case 'default':
+					self._newOrder = self._origOrder;
+					break;
+				case 'random':
+					self._newOrder = arrayShuffle(self._startOrder);
+					break;
+				case 'custom':
+					self._newOrder = self._newSort[0].order;
+					break;
+				default:
+					self._newOrder = self._startOrder.concat().sort(function(a, b){
+						return self._compare(a, b);
+					});
+			}
+
+			self._execAction('_sort', 1);
+		},
+
+		/**
+		 * Compare Algorithm
+		 * @since 2.0.0
+		 * @param {string|number} a
+		 * @param {string|number} b
+		 * @param {number} depth (recursion)
+		 * @return {number}
+		 */
+
+		_compare: function(a, b, depth){
+			depth = depth ? depth : 0;
+
+			var self = this,
+				order = self._newSort[depth].order,
+				getData = function(el){
+					return el.dataset[self._newSort[depth].sortBy] || 0;
+				},
+				attrA = isNaN(getData(a) * 1) ? getData(a).toLowerCase() : getData(a) * 1,
+				attrB = isNaN(getData(b) * 1) ? getData(b).toLowerCase() : getData(b) * 1;
+
+			if(attrA < attrB)
+				return order === 'asc' ? -1 : 1;
+			if(attrA > attrB)
+				return order === 'asc' ? 1 : -1;
+			if(attrA === attrB && self._newSort.length > depth+1)
+				return self._compare(a, b, depth+1);
+
+			return 0;
+		},
+
+		/**
+		 * Print Sort
+		 * @since 2.0.0
+		 * @param {boolean} reset
+		 */
+
+		_printSort: function(reset){
+			var self = this,
+				order = reset ? self._startOrder : self._newOrder,
+				targets = self._$parent[0].querySelectorAll(self.selectors.target),
+				nextSibling = targets.length ? targets[targets.length -1].nextElementSibling : null,
+				frag = document.createDocumentFragment();
+
+			self._execAction('_printSort', 0, arguments);
+
+			for(var i = 0; i < targets.length; i++){
+				var target = targets[i],
+					whiteSpace = target.nextSibling;
+
+				if(target.style.position === 'absolute') continue;
+
+				if(whiteSpace && whiteSpace.nodeName === '#text'){
+					self._$parent[0].removeChild(whiteSpace);
+				}
+
+				self._$parent[0].removeChild(target);
+			}
+
+			for(var i = 0; i < order.length; i++){
+				var el = order[i];
+
+				if(self._newSort[0].sortBy === 'default' && self._newSort[0].order === 'desc' && !reset){
+					var firstChild = frag.firstChild;
+					frag.insertBefore(el, firstChild);
+					frag.insertBefore(document.createTextNode(' '), el);
+				} else {
+					frag.appendChild(el);
+					frag.appendChild(document.createTextNode(' '));
+				}
+			}
+
+			nextSibling ?
+				self._$parent[0].insertBefore(frag, nextSibling) :
+				self._$parent[0].appendChild(frag);
+
+			self._execAction('_printSort', 1, arguments);
+		},
+
+		/**
+		 * Parse Sort
+		 * @since 2.0.0
+		 * @param {string} sortString
+		 * @return {array} newSort
+		 */
+
+		_parseSort: function(sortString){
+			var self = this,
+				rules = typeof sortString === 'string' ? sortString.split(' ') : [sortString],
+				newSort = [];
+
+			for(var i = 0; i < rules.length; i++){
+				var rule = typeof sortString === 'string' ? rules[i].split(':') : ['custom', rules[i]],
+					ruleObj = {
+						sortBy: self._helpers._camelCase(rule[0]),
+						order: rule[1] || 'asc'
+					};
+
+				newSort.push(ruleObj);
+
+				if(ruleObj.sortBy === 'default' || ruleObj.sortBy === 'random') break;
+			}
+
+			return self._execFilter('_parseSort', newSort, arguments);
+		},
+
+		/**
+		 * Parse Effects
+		 * @since 2.0.0
+		 * @return {object} effects
+		 */
+
+		_parseEffects: function(){
+			var self = this,
+				effects = {
+					opacity: '',
+					transformIn: '',
+					transformOut: '',
+					filter: ''
+				},
+				parse = function(effect, extract, reverse){
+					if(self.animation.effects.indexOf(effect) > -1){
+						if(extract){
+							var propIndex = self.animation.effects.indexOf(effect+'(');
+							if(propIndex > -1){
+								var str = self.animation.effects.substring(propIndex),
+									match = /\(([^)]+)\)/.exec(str),
+									val = match[1];
+
+									return {val: val};
+							}
+						}
+						return true;
+					} else {
+						return false;
+					}
+				},
+				negate = function(value, invert){
+					if(invert){
+						return value.charAt(0) === '-' ? value.substr(1, value.length) : '-'+value;
+					} else {
+						return value;
+					}
+				},
+				buildTransform = function(key, invert){
+					var transforms = [
+						['scale', '.01'],
+						['translateX', '20px'],
+						['translateY', '20px'],
+						['translateZ', '20px'],
+						['rotateX', '90deg'],
+						['rotateY', '90deg'],
+						['rotateZ', '180deg'],
+					];
+
+					for(var i = 0; i < transforms.length; i++){
+						var prop = transforms[i][0],
+							def = transforms[i][1],
+							inverted = invert && prop !== 'scale';
+
+						effects[key] += parse(prop) ? prop+'('+negate(parse(prop, true).val || def, inverted)+') ' : '';
+					}
+				};
+
+			effects.opacity = parse('fade') ? parse('fade',true).val || '0' : '1';
+
+			buildTransform('transformIn');
+
+			self.animation.reverseOut ? buildTransform('transformOut', true) : (effects.transformOut = effects.transformIn);
+
+			effects.transition = {};
+
+			effects.transition = self._getPrefixedCSS('transition','all '+self.animation.duration+'ms '+self.animation.easing+', opacity '+self.animation.duration+'ms linear');
+
+			self.animation.stagger = parse('stagger') ? true : false;
+			self.animation.staggerDuration = parseInt(parse('stagger') ? (parse('stagger',true).val ? parse('stagger',true).val : 100) : 100);
+
+			return self._execFilter('_parseEffects', effects);
+		},
+
+		/**
+		 * Build State
+		 * @since 2.0.0
+		 * @param {boolean} future
+		 * @return {object} futureState
+		 */
+
+		_buildState: function(future){
+			var self = this,
+				state = {};
+
+			self._execAction('_buildState', 0);
+
+			state = {
+				activeFilter: self._activeFilter === '' ? 'none' : self._activeFilter,
+				activeSort: future && self._newSortString ? self._newSortString : self._activeSort,
+				fail: !self._$show.length && self._activeFilter !== '',
+				$targets: self._$targets,
+				$show: self._$show,
+				$hide: self._$hide,
+				totalTargets: self._$targets.length,
+				totalShow: self._$show.length,
+				totalHide: self._$hide.length,
+				display: future && self._newDisplay ? self._newDisplay : self.layout.display
+			};
+
+			if(future){
+				return self._execFilter('_buildState', state);
+			} else {
+				self._state = state;
+
+				self._execAction('_buildState', 1);
+			}
+		},
+
+		/**
+		 * Go Mix
+		 * @since 2.0.0
+		 * @param {boolean} animate
+		 */
+
+		_goMix: function(animate){
+			var self = this,
+				phase1 = function(){
+					if(self._chrome && (self._chrome === 31)){
+						chromeFix(self._$parent[0]);
+					}
+
+					self._setInter();
+
+					phase2();
+				},
+				phase2 = function(){
+					var scrollTop = window.pageYOffset,
+						scrollLeft = window.pageXOffset,
+						docHeight = document.documentElement.scrollHeight;
+
+					self._getInterMixData();
+
+					self._setFinal();
+
+					self._getFinalMixData();
+
+					(window.pageYOffset !== scrollTop) && window.scrollTo(scrollLeft, scrollTop);
+
+					self._prepTargets();
+
+					if(window.requestAnimationFrame){
+						requestAnimationFrame(phase3);
+					} else {
+						setTimeout(function(){
+							phase3();
+						},20);
+					}
+				},
+				phase3 = function(){
+					self._animateTargets();
+
+					if(self._targetsBound === 0){
+						self._cleanUp();
+					}
+				},
+				chromeFix = function(grid){
+					var parent = grid.parentElement,
+						placeholder = document.createElement('div'),
+						frag = document.createDocumentFragment();
+
+					parent.insertBefore(placeholder, grid);
+					frag.appendChild(grid);
+					parent.replaceChild(grid, placeholder);
+				},
+				futureState = self._buildState(true);
+
+			self._execAction('_goMix', 0, arguments);
+
+			!self.animation.duration && (animate = false);
+
+			self._mixing = true;
+
+			self._$container.removeClass(self.layout.containerClassFail);
+
+			if(typeof self.callbacks.onMixStart === 'function'){
+				self.callbacks.onMixStart.call(self._domNode, self._state, futureState, self);
+			}
+
+			self._$container.trigger('mixStart', [self._state, futureState, self]);
+
+			self._getOrigMixData();
+
+			if(animate && !self._suckMode){
+
+				window.requestAnimationFrame ?
+					requestAnimationFrame(phase1) :
+					phase1();
+
+			} else {
+				self._cleanUp();
+			}
+
+			self._execAction('_goMix', 1, arguments);
+		},
+
+		/**
+		 * Get Target Data
+		 * @since 2.0.0
+		 */
+
+		_getTargetData: function(el, stage){
+			var self = this,
+				elStyle;
+
+			el.dataset[stage+'PosX'] = el.offsetLeft;
+			el.dataset[stage+'PosY'] = el.offsetTop;
+
+			if(self.animation.animateResizeTargets){
+				elStyle = !self._suckMode ?
+					window.getComputedStyle(el) :
+					{
+						marginBottom: '',
+						marginRight: ''
+					};
+
+				el.dataset[stage+'MarginBottom'] = parseInt(elStyle.marginBottom);
+				el.dataset[stage+'MarginRight'] = parseInt(elStyle.marginRight);
+				el.dataset[stage+'Width'] = el.offsetWidth;
+				el.dataset[stage+'Height'] = el.offsetHeight;
+			}
+		},
+
+		/**
+		 * Get Original Mix Data
+		 * @since 2.0.0
+		 */
+
+		_getOrigMixData: function(){
+			var self = this,
+				parentStyle = !self._suckMode ? window.getComputedStyle(self._$parent[0]) : {boxSizing: ''},
+				parentBS = parentStyle.boxSizing || parentStyle[self._vendor+'BoxSizing'];
+
+			self._incPadding = (parentBS === 'border-box');
+
+			self._execAction('_getOrigMixData', 0);
+
+			!self._suckMode && (self.effects = self._parseEffects());
+
+			self._$toHide = self._$hide.filter(':visible');
+			self._$toShow = self._$show.filter(':hidden');
+			self._$pre = self._$targets.filter(':visible');
+
+			self._startHeight = self._incPadding ?
+				self._$parent.outerHeight() :
+				self._$parent.height();
+
+			for(var i = 0; i < self._$pre.length; i++){
+				var el = self._$pre[i];
+
+				self._getTargetData(el, 'orig');
+			}
+
+			self._execAction('_getOrigMixData', 1);
+		},
+
+		/**
+		 * Set Intermediate Positions
+		 * @since 2.0.0
+		 */
+
+		_setInter: function(){
+			var self = this;
+
+			self._execAction('_setInter', 0);
+
+			if(self._changingLayout && self.animation.animateChangeLayout){
+				self._$toShow.css('display',self._newDisplay);
+
+				if(self._changingClass){
+					self._$container
+						.removeClass(self.layout.containerClass)
+						.addClass(self._newClass);
+				}
+			} else {
+				self._$toShow.css('display', self.layout.display);
+			}
+
+			self._execAction('_setInter', 1);
+		},
+
+		/**
+		 * Get Intermediate Mix Data
+		 * @since 2.0.0
+		 */
+
+		_getInterMixData: function(){
+			var self = this;
+
+			self._execAction('_getInterMixData', 0);
+
+			for(var i = 0; i < self._$toShow.length; i++){
+				var el = self._$toShow[i];
+
+				self._getTargetData(el, 'inter');
+			}
+
+			for(var i = 0; i < self._$pre.length; i++){
+				var el = self._$pre[i];
+
+				self._getTargetData(el, 'inter');
+			}
+
+			self._execAction('_getInterMixData', 1);
+		},
+
+		/**
+		 * Set Final Positions
+		 * @since 2.0.0
+		 */
+
+		_setFinal: function(){
+			var self = this;
+
+			self._execAction('_setFinal', 0);
+
+			self._sorting && self._printSort();
+
+			self._$toHide.removeStyle('display');
+
+			if(self._changingLayout && self.animation.animateChangeLayout){
+				self._$pre.css('display',self._newDisplay);
+			}
+
+			self._execAction('_setFinal', 1);
+		},
+
+		/**
+		 * Get Final Mix Data
+		 * @since 2.0.0
+		 */
+
+		_getFinalMixData: function(){
+			var self = this;
+
+			self._execAction('_getFinalMixData', 0);
+
+			for(var i = 0; i < self._$toShow.length; i++){
+				var el = self._$toShow[i];
+
+				self._getTargetData(el, 'final');
+			}
+
+			for(var i = 0; i < self._$pre.length; i++){
+				var el = self._$pre[i];
+
+				self._getTargetData(el, 'final');
+			}
+
+			self._newHeight = self._incPadding ?
+				self._$parent.outerHeight() :
+				self._$parent.height();
+
+			self._sorting && self._printSort(true);
+
+			self._$toShow.removeStyle('display');
+
+			self._$pre.css('display',self.layout.display);
+
+			if(self._changingClass && self.animation.animateChangeLayout){
+				self._$container
+					.removeClass(self._newClass)
+					.addClass(self.layout.containerClass);
+			}
+
+			self._execAction('_getFinalMixData', 1);
+		},
+
+		/**
+		 * Prepare Targets
+		 * @since 2.0.0
+		 */
+
+		_prepTargets: function(){
+			var self = this,
+				transformCSS = {
+					_in: self._getPrefixedCSS('transform', self.effects.transformIn),
+					_out: self._getPrefixedCSS('transform', self.effects.transformOut)
+				};
+
+			self._execAction('_prepTargets', 0);
+
+			if(self.animation.animateResizeContainer){
+				self._$parent.css('height',self._startHeight+'px');
+			}
+
+			for(var i = 0; i < self._$toShow.length; i++){
+				var el = self._$toShow[i],
+					$el = $(el);
+
+				el.style.opacity = self.effects.opacity;
+				el.style.display = (self._changingLayout && self.animation.animateChangeLayout) ?
+					self._newDisplay :
+					self.layout.display;
+
+				$el.css(transformCSS._in);
+
+				if(self.animation.animateResizeTargets){
+					el.style.width = el.dataset.finalWidth+'px';
+					el.style.height = el.dataset.finalHeight+'px';
+					el.style.marginRight = -(el.dataset.finalWidth - el.dataset.interWidth) + (el.dataset.finalMarginRight * 1)+'px';
+					el.style.marginBottom = -(el.dataset.finalHeight - el.dataset.interHeight) + (el.dataset.finalMarginBottom * 1)+'px';
+				}
+			}
+
+			for(var i = 0; i < self._$pre.length; i++){
+				var el = self._$pre[i],
+					$el = $(el),
+					translate = {
+						x: el.dataset.origPosX - el.dataset.interPosX,
+						y: el.dataset.origPosY - el.dataset.interPosY
+					},
+					transformCSS = self._getPrefixedCSS('transform','translate('+translate.x+'px,'+translate.y+'px)');
+
+				$el.css(transformCSS);
+
+				if(self.animation.animateResizeTargets){
+					el.style.width = el.dataset.origWidth+'px';
+					el.style.height = el.dataset.origHeight+'px';
+
+					if(el.dataset.origWidth - el.dataset.finalWidth){
+						el.style.marginRight = -(el.dataset.origWidth - el.dataset.interWidth) + (el.dataset.origMarginRight * 1)+'px';
+					}
+
+					if(el.dataset.origHeight - el.dataset.finalHeight){
+						el.style.marginBottom = -(el.dataset.origHeight - el.dataset.interHeight) + (el.dataset.origMarginBottom * 1) +'px';
+					}
+				}
+			}
+
+			self._execAction('_prepTargets', 1);
+		},
+
+		/**
+		 * Animate Targets
+		 * @since 2.0.0
+		 */
+
+		_animateTargets: function(){
+			var self = this;
+
+			self._execAction('_animateTargets', 0);
+
+			self._targetsDone = 0;
+			self._targetsBound = 0;
+
+			self._$parent
+				.css(self._getPrefixedCSS('perspective', self.animation.perspectiveDistance+'px'))
+				.css(self._getPrefixedCSS('perspective-origin', self.animation.perspectiveOrigin));
+
+			if(self.animation.animateResizeContainer){
+				self._$parent
+					.css(self._getPrefixedCSS('transition','height '+self.animation.duration+'ms ease'))
+					.css('height',self._newHeight+'px');
+			}
+
+			for(var i = 0; i < self._$toShow.length; i++){
+				var el = self._$toShow[i],
+					$el = $(el),
+					translate = {
+						x: el.dataset.finalPosX - el.dataset.interPosX,
+						y: el.dataset.finalPosY - el.dataset.interPosY
+					},
+					delay = self._getDelay(i),
+					toShowCSS = {};
+
+				el.style.opacity = '';
+
+				for(var j = 0; j < 2; j++){
+					var a = j === 0 ? a = self._prefix : '';
+
+					if(self._ff && self._ff <= 20){
+						toShowCSS[a+'transition-property'] = 'all';
+						toShowCSS[a+'transition-timing-function'] = self.animation.easing+'ms';
+						toShowCSS[a+'transition-duration'] = self.animation.duration+'ms';
+					}
+
+					toShowCSS[a+'transition-delay'] = delay+'ms';
+					toShowCSS[a+'transform'] = 'translate('+translate.x+'px,'+translate.y+'px)';
+				}
+
+				if(self.effects.transform || self.effects.opacity){
+					self._bindTargetDone($el);
+				}
+
+				(self._ff && self._ff <= 20) ?
+					$el.css(toShowCSS) :
+					$el.css(self.effects.transition).css(toShowCSS);
+			}
+
+			for(var i = 0; i < self._$pre.length; i++){
+				var el = self._$pre[i],
+					$el = $(el),
+					translate = {
+						x: el.dataset.finalPosX - el.dataset.interPosX,
+						y: el.dataset.finalPosY - el.dataset.interPosY
+					},
+					delay = self._getDelay(i);
+
+				if(!(
+					el.dataset.finalPosX === el.dataset.origPosX &&
+					el.dataset.finalPosY === el.dataset.origPosY
+				)){
+					self._bindTargetDone($el);
+				}
+
+				$el.css(self._getPrefixedCSS('transition', 'all '+self.animation.duration+'ms '+self.animation.easing+' '+delay+'ms'));
+				$el.css(self._getPrefixedCSS('transform', 'translate('+translate.x+'px,'+translate.y+'px)'));
+
+				if(self.animation.animateResizeTargets){
+					if(el.dataset.origWidth - el.dataset.finalWidth && el.dataset.finalWidth * 1){
+						el.style.width = el.dataset.finalWidth+'px';
+						el.style.marginRight = -(el.dataset.finalWidth - el.dataset.interWidth)+(el.dataset.finalMarginRight * 1)+'px';
+					}
+
+					if(el.dataset.origHeight - el.dataset.finalHeight && el.dataset.finalHeight * 1){
+						el.style.height = el.dataset.finalHeight+'px';
+						el.style.marginBottom = -(el.dataset.finalHeight - el.dataset.interHeight)+(el.dataset.finalMarginBottom * 1) +'px';
+					}
+				}
+			}
+
+			if(self._changingClass){
+				self._$container
+					.removeClass(self.layout.containerClass)
+					.addClass(self._newClass);
+			}
+
+			for(var i = 0; i < self._$toHide.length; i++){
+				var el = self._$toHide[i],
+					$el = $(el),
+					delay = self._getDelay(i),
+					toHideCSS = {};
+
+				for(var j = 0; j<2; j++){
+					var a = j === 0 ? a = self._prefix : '';
+
+					toHideCSS[a+'transition-delay'] = delay+'ms';
+					toHideCSS[a+'transform'] = self.effects.transformOut;
+					toHideCSS.opacity = self.effects.opacity;
+				}
+
+				$el.css(self.effects.transition).css(toHideCSS);
+
+				if(self.effects.transform || self.effects.opacity){
+					self._bindTargetDone($el);
+				};
+			}
+
+			self._execAction('_animateTargets', 1);
+
+		},
+
+		/**
+		 * Bind Targets TransitionEnd
+		 * @since 2.0.0
+		 * @param {object} $el
+		 */
+
+		_bindTargetDone: function($el){
+			var self = this,
+				el = $el[0];
+
+			self._execAction('_bindTargetDone', 0, arguments);
+
+			if(!el.dataset.bound){
+
+				el.dataset.bound = true;
+				self._targetsBound++;
+
+				$el.on('webkitTransitionEnd.mixItUp transitionend.mixItUp',function(e){
+					if(
+						(e.originalEvent.propertyName.indexOf('transform') > -1 ||
+						e.originalEvent.propertyName.indexOf('opacity') > -1) &&
+						$(e.originalEvent.target).is(self.selectors.target)
+					){
+						$el.off('.mixItUp');
+						el.dataset.bound = '';
+						self._targetDone();
+					}
+				});
+			}
+
+			self._execAction('_bindTargetDone', 1, arguments);
+		},
+
+		/**
+		 * Target Done
+		 * @since 2.0.0
+		 */
+
+		_targetDone: function(){
+			var self = this;
+
+			self._execAction('_targetDone', 0);
+
+			self._targetsDone++;
+
+			(self._targetsDone === self._targetsBound) && self._cleanUp();
+
+			self._execAction('_targetDone', 1);
+		},
+
+		/**
+		 * Clean Up
+		 * @since 2.0.0
+		 */
+
+		_cleanUp: function(){
+			var self = this,
+				targetStyles = self.animation.animateResizeTargets ?
+					'transform opacity width height margin-bottom margin-right' :
+					'transform opacity',
+				unBrake = function(){
+					self._$targets.removeStyle('transition', self._prefix);
+				};
+
+			self._execAction('_cleanUp', 0);
+
+			!self._changingLayout ?
+				self._$show.css('display',self.layout.display) :
+				self._$show.css('display',self._newDisplay);
+
+			self._$targets.css(self._brake);
+
+			self._$targets
+				.removeStyle(targetStyles, self._prefix)
+				.removeAttr('data-inter-pos-x data-inter-pos-y data-final-pos-x data-final-pos-y data-orig-pos-x data-orig-pos-y data-orig-height data-orig-width data-final-height data-final-width data-inter-width data-inter-height data-orig-margin-right data-orig-margin-bottom data-inter-margin-right data-inter-margin-bottom data-final-margin-right data-final-margin-bottom');
+
+			self._$hide.removeStyle('display');
+
+			self._$parent.removeStyle('height transition perspective-distance perspective perspective-origin-x perspective-origin-y perspective-origin perspectiveOrigin', self._prefix);
+
+			if(self._sorting){
+				self._printSort();
+				self._activeSort = self._newSortString;
+				self._sorting = false;
+			}
+
+			if(self._changingLayout){
+				if(self._changingDisplay){
+					self.layout.display = self._newDisplay;
+					self._changingDisplay = false;
+				}
+
+				if(self._changingClass){
+					self._$parent.removeClass(self.layout.containerClass).addClass(self._newClass);
+					self.layout.containerClass = self._newClass;
+					self._changingClass = false;
+				}
+
+				self._changingLayout = false;
+			}
+
+			self._refresh();
+
+			self._buildState();
+
+			if(self._state.fail){
+				self._$container.addClass(self.layout.containerClassFail);
+			}
+
+			self._$show = $();
+			self._$hide = $();
+
+			if(window.requestAnimationFrame){
+				requestAnimationFrame(unBrake);
+			}
+
+			self._mixing = false;
+
+			if(typeof self.callbacks._user === 'function'){
+				self.callbacks._user.call(self._domNode, self._state, self);
+			}
+
+			if(typeof self.callbacks.onMixEnd === 'function'){
+				self.callbacks.onMixEnd.call(self._domNode, self._state, self);
+			}
+
+			self._$container.trigger('mixEnd', [self._state, self]);
+
+			if(self._state.fail){
+				(typeof self.callbacks.onMixFail === 'function') && self.callbacks.onMixFail.call(self._domNode, self._state, self);
+				self._$container.trigger('mixFail', [self._state, self]);
+			}
+
+			if(self._loading){
+				(typeof self.callbacks.onMixLoad === 'function') && self.callbacks.onMixLoad.call(self._domNode, self._state, self);
+				self._$container.trigger('mixLoad', [self._state, self]);
+			}
+
+			if(self._queue.length){
+				self._execAction('_queue', 0);
+
+				self.multiMix(self._queue[0][0],self._queue[0][1],self._queue[0][2]);
+				self._queue.splice(0, 1);
+			}
+
+			self._execAction('_cleanUp', 1);
+
+			self._loading = false;
+		},
+
+		/**
+		 * Get Prefixed CSS
+		 * @since 2.0.0
+		 * @param {string} property
+		 * @param {string} value
+		 * @param {boolean} prefixValue
+		 * @return {object} styles
+		 */
+
+		_getPrefixedCSS: function(property, value, prefixValue){
+			var self = this,
+				styles = {},
+				prefix = '',
+				i = -1;
+
+			for(i = 0; i < 2; i++){
+				prefix = i === 0 ? self._prefix : '';
+				prefixValue ? styles[prefix+property] = prefix+value : styles[prefix+property] = value;
+			}
+
+			return self._execFilter('_getPrefixedCSS', styles, arguments);
+		},
+
+		/**
+		 * Get Delay
+		 * @since 2.0.0
+		 * @param {number} i
+		 * @return {number} delay
+		 */
+
+		_getDelay: function(i){
+			var self = this,
+				n = typeof self.animation.staggerSequence === 'function' ? self.animation.staggerSequence.call(self._domNode, i, self._state) : i,
+				delay = self.animation.stagger ? n * self.animation.staggerDuration : 0;
+
+			return self._execFilter('_getDelay', delay, arguments);
+		},
+
+		/**
+		 * Parse MultiMix Arguments
+		 * @since 2.0.0
+		 * @param {array} args
+		 * @return {object} output
+		 */
+
+		_parseMultiMixArgs: function(args){
+			var self = this,
+				output = {
+					command: null,
+					animate: self.animation.enable,
+					callback: null
+				};
+
+			for(var i = 0; i < args.length; i++){
+				var arg = args[i];
+
+				if(arg !== null){
+					if(typeof arg === 'object' || typeof arg === 'string'){
+						output.command = arg;
+					} else if(typeof arg === 'boolean'){
+						output.animate = arg;
+					} else if(typeof arg === 'function'){
+						output.callback = arg;
+					}
+				}
+			}
+
+			return self._execFilter('_parseMultiMixArgs', output, arguments);
+		},
+
+		/**
+		 * Parse Insert Arguments
+		 * @since 2.0.0
+		 * @param {array} args
+		 * @return {object} output
+		 */
+
+		_parseInsertArgs: function(args){
+			var self = this,
+				output = {
+					index: 0,
+					$object: $(),
+					multiMix: {filter: self._state.activeFilter},
+					callback: null
+				};
+
+			for(var i = 0; i < args.length; i++){
+				var arg = args[i];
+
+				if(typeof arg === 'number'){
+					output.index = arg;
+				} else if(typeof arg === 'object' && arg instanceof $){
+					output.$object = arg;
+				} else if(typeof arg === 'object' && self._helpers._isElement(arg)){
+					output.$object = $(arg);
+				} else if(typeof arg === 'object' && arg !== null){
+					output.multiMix = arg;
+				} else if(typeof arg === 'boolean' && !arg){
+					output.multiMix = false;
+				} else if(typeof arg === 'function'){
+					output.callback = arg;
+				}
+			}
+
+			return self._execFilter('_parseInsertArgs', output, arguments);
+		},
+
+		/**
+		 * Execute Action
+		 * @since 2.0.0
+		 * @param {string} methodName
+		 * @param {boolean} isPost
+		 * @param {array} args
+		 */
+
+		_execAction: function(methodName, isPost, args){
+			var self = this,
+				context = isPost ? 'post' : 'pre';
+
+			if(!self._actions.isEmptyObject && self._actions.hasOwnProperty(methodName)){
+				for(var key in self._actions[methodName][context]){
+					self._actions[methodName][context][key].call(self, args);
+				}
+			}
+		},
+
+		/**
+		 * Execute Filter
+		 * @since 2.0.0
+		 * @param {string} methodName
+		 * @param {mixed} value
+		 * @return {mixed} value
+		 */
+
+		_execFilter: function(methodName, value, args){
+			var self = this;
+
+			if(!self._filters.isEmptyObject && self._filters.hasOwnProperty(methodName)){
+				for(var key in self._filters[methodName]){
+					return self._filters[methodName][key].call(self, args);
+				}
+			} else {
+				return value;
+			}
+		},
+
+		/* Helpers
+		---------------------------------------------------------------------- */
+
+		_helpers: {
+
+			/**
+			 * CamelCase
+			 * @since 2.0.0
+			 * @param {string}
+			 * @return {string}
+			 */
+
+			_camelCase: function(string){
+				return string.replace(/-([a-z])/g, function(g){
+						return g[1].toUpperCase();
+				});
+			},
+
+			/**
+			 * Is Element
+			 * @since 2.1.3
+			 * @param {object} element to test
+			 * @return {boolean}
+			 */
+
+			_isElement: function(el){
+				if(window.HTMLElement){
+					return el instanceof HTMLElement;
+				} else {
+					return (
+						el !== null &&
+						el.nodeType === 1 &&
+						el.nodeName === 'string'
+					);
+				}
+			}
+		},
+
+		/* Public Methods
+		---------------------------------------------------------------------- */
+
+		/**
+		 * Is Mixing
+		 * @since 2.0.0
+		 * @return {boolean}
+		 */
+
+		isMixing: function(){
+			var self = this;
+
+			return self._execFilter('isMixing', self._mixing);
+		},
+
+		/**
+		 * Filter (public)
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		filter: function(){
+			var self = this,
+				args = self._parseMultiMixArgs(arguments);
+
+			self._clicking && (self._toggleString = '');
+
+			self.multiMix({filter: args.command}, args.animate, args.callback);
+		},
+
+		/**
+		 * Sort (public)
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		sort: function(){
+			var self = this,
+				args = self._parseMultiMixArgs(arguments);
+
+			self.multiMix({sort: args.command}, args.animate, args.callback);
+		},
+
+		/**
+		 * Change Layout (public)
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		changeLayout: function(){
+			var self = this,
+				args = self._parseMultiMixArgs(arguments);
+
+			self.multiMix({changeLayout: args.command}, args.animate, args.callback);
+		},
+
+		/**
+		 * MultiMix
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		multiMix: function(){
+			var self = this,
+				args = self._parseMultiMixArgs(arguments);
+
+			self._execAction('multiMix', 0, arguments);
+
+			if(!self._mixing){
+				if(self.controls.enable && !self._clicking){
+					self.controls.toggleFilterButtons && self._buildToggleArray();
+					self._updateControls(args.command, self.controls.toggleFilterButtons);
+				}
+
+				(self._queue.length < 2) && (self._clicking = false);
+
+				delete self.callbacks._user;
+				if(args.callback) self.callbacks._user = args.callback;
+
+				var sort = args.command.sort,
+					filter = args.command.filter,
+					changeLayout = args.command.changeLayout;
+
+				self._refresh();
+
+				if(sort){
+					self._newSort = self._parseSort(sort);
+					self._newSortString = sort;
+
+					self._sorting = true;
+					self._sort();
+				}
+
+				if(filter !== undf){
+					filter = (filter === 'all') ? self.selectors.target : filter;
+
+					self._activeFilter = filter;
+				}
+
+				self._filter();
+
+				if(changeLayout){
+					self._newDisplay = (typeof changeLayout === 'string') ? changeLayout : changeLayout.display || self.layout.display;
+					self._newClass = changeLayout.containerClass || '';
+
+					if(
+						self._newDisplay !== self.layout.display ||
+						self._newClass !== self.layout.containerClass
+					){
+						self._changingLayout = true;
+
+						self._changingClass = (self._newClass !== self.layout.containerClass);
+						self._changingDisplay = (self._newDisplay !== self.layout.display);
+					}
+				}
+
+				self._$targets.css(self._brake);
+
+				self._goMix(args.animate ^ self.animation.enable ? args.animate : self.animation.enable);
+
+				self._execAction('multiMix', 1, arguments);
+
+			} else {
+				if(self.animation.queue && self._queue.length < self.animation.queueLimit){
+					self._queue.push(arguments);
+
+					(self.controls.enable && !self._clicking) && self._updateControls(args.command);
+
+					self._execAction('multiMixQueue', 1, arguments);
+
+				} else {
+					if(typeof self.callbacks.onMixBusy === 'function'){
+						self.callbacks.onMixBusy.call(self._domNode, self._state, self);
+					}
+					self._$container.trigger('mixBusy', [self._state, self]);
+
+					self._execAction('multiMixBusy', 1, arguments);
+				}
+			}
+		},
+
+		/**
+		 * Insert
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		insert: function(){
+			var self = this,
+				args = self._parseInsertArgs(arguments),
+				callback = (typeof args.callback === 'function') ? args.callback : null,
+				frag = document.createDocumentFragment(),
+				target = (function(){
+					self._refresh();
+
+					if(self._$targets.length){
+						return (args.index < self._$targets.length || !self._$targets.length) ?
+							self._$targets[args.index] :
+							self._$targets[self._$targets.length-1].nextElementSibling;
+					} else {
+						return self._$parent[0].children[0];
+					}
+				})();
+
+			self._execAction('insert', 0, arguments);
+
+			if(args.$object){
+				for(var i = 0; i < args.$object.length; i++){
+					var el = args.$object[i];
+
+					frag.appendChild(el);
+					frag.appendChild(document.createTextNode(' '));
+				}
+
+				self._$parent[0].insertBefore(frag, target);
+			}
+
+			self._execAction('insert', 1, arguments);
+
+			if(typeof args.multiMix === 'object'){
+				self.multiMix(args.multiMix, callback);
+			}
+		},
+
+		/**
+		 * Prepend
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		prepend: function(){
+			var self = this,
+				args = self._parseInsertArgs(arguments);
+
+			self.insert(0, args.$object, args.multiMix, args.callback);
+		},
+
+		/**
+		 * Append
+		 * @since 2.0.0
+		 * @param {array} arguments
+		 */
+
+		append: function(){
+			var self = this,
+				args = self._parseInsertArgs(arguments);
+
+			self.insert(self._state.totalTargets, args.$object, args.multiMix, args.callback);
+		},
+
+		/**
+		 * Get Option
+		 * @since 2.0.0
+		 * @param {string} string
+		 * @return {mixed} value
+		 */
+
+		getOption: function(string){
+			var self = this,
+				getProperty = function(obj, prop){
+					var parts = prop.split('.'),
+						last = parts.pop(),
+						l = parts.length,
+						i = 1,
+						current = parts[0] || prop;
+
+					while((obj = obj[current]) && i < l){
+						current = parts[i];
+						i++;
+					}
+
+					if(obj !== undf){
+						return obj[last] !== undf ? obj[last] : obj;
+					}
+				};
+
+			return string ? self._execFilter('getOption', getProperty(self, string), arguments) : self;
+		},
+
+		/**
+		 * Set Options
+		 * @since 2.0.0
+		 * @param {object} config
+		 */
+
+		setOptions: function(config){
+			var self = this;
+
+			self._execAction('setOptions', 0, arguments);
+
+			typeof config === 'object' && $.extend(true, self, config);
+
+			self._execAction('setOptions', 1, arguments);
+		},
+
+		/**
+		 * Get State
+		 * @since 2.0.0
+		 * @return {object} state
+		 */
+
+		getState: function(){
+			var self = this;
+
+			return self._execFilter('getState', self._state, self);
+		},
+
+		/**
+		 * Force Refresh
+		 * @since 2.1.2
+		 */
+
+		forceRefresh: function(){
+			var self = this;
+
+			self._refresh(false, true);
+		},
+
+		/**
+		 * Destroy
+		 * @since 2.0.0
+		 * @param {boolean} hideAll
+		 */
+
+		destroy: function(hideAll){
+			var self = this,
+				filters = $.MixItUp.prototype._bound._filter,
+				sorts = $.MixItUp.prototype._bound._sort;
+
+			self._execAction('destroy', 0, arguments);
+
+			self._$body
+				.add($(self.selectors.sort))
+				.add($(self.selectors.filter))
+				.off('.mixItUp');
+
+			for(var i = 0; i < self._$targets.length; i++){
+				var target = self._$targets[i];
+
+				hideAll && (target.style.display = '');
+
+				delete target.mixParent;
+			}
+
+			self._execAction('destroy', 1, arguments);
+
+			if(filters[self.selectors.filter] && filters[self.selectors.filter] > 1) {
+				filters[self.selectors.filter]--;
+			} else if(filters[self.selectors.filter] === 1) {
+				delete filters[self.selectors.filter];
+			}
+
+			if(sorts[self.selectors.sort] && sorts[self.selectors.sort] > 1) {
+				sorts[self.selectors.sort]--;
+			} else if(sorts[self.selectors.sort] === 1) {
+				delete sorts[self.selectors.sort];
+			}
+
+			delete $.MixItUp.prototype._instances[self._id];
+		}
+
+	};
+
+	/* jQuery Methods
+	---------------------------------------------------------------------- */
+
+	/**
+	 * jQuery .mixItUp() method
+	 * @since 2.0.0
+	 * @extends $.fn
+	 */
+
+	$.fn.mixItUp = function(){
+		var args = arguments,
+			dataReturn = [],
+			eachReturn,
+			_instantiate = function(domNode, settings){
+				var instance = new $.MixItUp(),
+					rand = function(){
+						return ('00000'+(Math.random()*16777216<<0).toString(16)).substr(-6).toUpperCase();
+					};
+
+				instance._execAction('_instantiate', 0, arguments);
+
+				domNode.id = !domNode.id ? 'MixItUp'+rand() : domNode.id;
+
+				if(!instance._instances[domNode.id]){
+					instance._instances[domNode.id] = instance;
+					instance._init(domNode, settings);
+				}
+
+				instance._execAction('_instantiate', 1, arguments);
+			};
+
+		eachReturn = this.each(function(){
+			if(args && typeof args[0] === 'string'){
+				var instance = $.MixItUp.prototype._instances[this.id];
+				if(args[0] === 'isLoaded'){
+					dataReturn.push(instance ? true : false);
+				} else {
+					var data = instance[args[0]](args[1], args[2], args[3]);
+					if(data !== undf)dataReturn.push(data);
+				}
+			} else {
+				_instantiate(this, args[0]);
+			}
+		});
+
+		if(dataReturn.length){
+			return dataReturn.length > 1 ? dataReturn : dataReturn[0];
+		} else {
+			return eachReturn;
+		}
+	};
+
+	/**
+	 * jQuery .removeStyle() method
+	 * @since 2.0.0
+	 * @extends $.fn
+	 */
+
+	$.fn.removeStyle = function(style, prefix){
+		prefix = prefix ? prefix : '';
+
+		return this.each(function(){
+			var el = this,
+				styles = style.split(' ');
+
+			for(var i = 0; i < styles.length; i++){
+				for(var j = 0; j < 4; j++){
+					switch (j) {
+						case 0:
+							var prop = styles[i];
+							break;
+						case 1:
+							var prop = $.MixItUp.prototype._helpers._camelCase(prop);
+							break;
+						case 2:
+							var prop = prefix+styles[i];
+							break;
+						case 3:
+							var prop = $.MixItUp.prototype._helpers._camelCase(prefix+styles[i]);
+					}
+
+					if(
+						el.style[prop] !== undf &&
+						typeof el.style[prop] !== 'unknown' &&
+						el.style[prop].length > 0
+					){
+						el.style[prop] = '';
+					}
+
+					if(!prefix && j === 1)break;
+				}
+			}
+
+			if(el.attributes && el.attributes.style && el.attributes.style !== undf && el.attributes.style.value === ''){
+				el.attributes.removeNamedItem('style');
+			}
+		});
+	};
+
+})(jQuery);
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 1a387b86c..1d44e0625 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -13,6 +13,7 @@ var tvimer = 0;
 movieLoad();
 tvLoad();
 
+
 // Approve all
 $('#approveAll').click(function () {
     $.ajax({
@@ -274,6 +275,15 @@ function movieLoad() {
             var html = searchTemplate(context);
             $("#movieList").append(html);
         });
+        $('#movieList').mixItUp({
+            layout: {
+                display: 'block'
+            },
+            load: {
+                filter: 'all'
+            }
+        });
+
     });
 };
 
@@ -286,6 +296,14 @@ function tvLoad() {
             var html = searchTemplate(context);
             $("#tvList").append(html);
         });
+        $('#tvList').mixItUp({
+            layout: {
+                display: 'block'
+            },
+            load: {
+                filter: 'all'
+            }
+        });
     });
 };
 
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index 69af5770c..33633179e 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -223,6 +223,9 @@
     <Content Include="Content\jquery-2.2.1.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\jquery.mixitup.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\pace.css">
       <DependentUpon>pace.scss</DependentUpon>
     </Content>
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 22354440c..1465935f5 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -23,12 +23,37 @@
 
     <!-- Tab panes -->
     <div class="tab-content">
+        <div class="btn-group col-sm-push-10">
+            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                Filter
+                <i class="fa fa-filter"></i>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" class="filter" data-filter="all">All</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-true">Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-false">Not Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".available-true">Available</a></li>
+                <li><a href="#" class="filter" data-filter=".available-false">Not Available</a></li>
+            </ul>
+        </div>
+        <div class="btn-group col-sm-push-10">
+            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                Order
+                <i class="fa fa-sort"></i>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a href="#" class="sort" data-sort="default">Default</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date</a></li>
+            </ul>
+        </div>
         @if (Model.SearchForMovies)
         {
-    <!-- Movie tab -->
+
+            <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
-                <br />
-                <br />
+
+                <br/>
+                <br/>
                 <!-- Movie content -->
                 <div id="movieList">
                 </div>
@@ -37,10 +62,11 @@
 
         @if (Model.SearchForTvShows)
         {
-    <!-- TV tab -->
+            <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
-                <br />
-                <br />
+
+                <br/>
+                <br/>
                 <!-- TV content -->
                 <div id="tvList">
                 </div>
@@ -52,7 +78,7 @@
 
 
 <script id="search-template" type="text/x-handlebars-template">
-    <div id="{{requestId}}Template">
+    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestId}}" data-requester="{{requestedBy}}">
         <div class="row">
             <div class="col-sm-2">
                 {{#if_eq type "movie"}}
@@ -118,7 +144,7 @@
                 {{/if_eq}}
                 <form method="POST" action="/requests/delete" id="delete{{requestId}}">
                     <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
-                    <button id="{{requestId}}" style="text-align: right" class="btn btn-sm btn-danger-outline delete" type="submit"><i class="fa fa-plus"></i> Remove</button>
+                    <button id="{{requestId}}" style="text-align: right" class="btn btn-sm btn-danger-outline delete" type="submit"><i class="fa fa-minus"></i> Remove</button>
                 </form>
 
                 <form method="POST" action="/requests/clearissues" id="clear{{requestId}}">
@@ -129,9 +155,9 @@
                 <form method="POST" action="/requests/changeavailability" id="change{{requestId}}">
                     <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
                     {{#if_eq available true}}
-                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change" type="submit">Mark Unavailable</button>
+                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change" type="submit"><i class="fa fa-minus"></i> Mark Unavailable</button>
                     {{else}}
-                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change" type="submit">Mark Available</button>
+                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change" type="submit"><i class="fa fa-plus"></i> Mark Available</button>
                     {{/if_eq}}
                 </form>
 
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index c69538555..d4c94f6b9 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -20,6 +20,7 @@
     <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>
 </head>
 <body>
 

From af6deec3f09fcf5217d047876c111fa7247063f8 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Mon, 21 Mar 2016 19:05:01 +0000
Subject: [PATCH 23/23] Got the filter working on both movie and tv #57

---
 PlexRequests.UI/Content/custom.css          |  3 +++
 PlexRequests.UI/Content/custom.min.css      |  2 +-
 PlexRequests.UI/Content/custom.scss         |  3 +++
 PlexRequests.UI/Content/requests.js         | 25 +++++++++++++--------
 PlexRequests.UI/Views/Requests/Index.cshtml | 11 ++++-----
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index c571269b4..a517cc508 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -123,3 +123,6 @@ label {
 #movieList .mix {
   display: none; }
 
+#tvList .mix {
+  display: none; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 8385aac7b..45dc19440 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index e1944c04c..11c81ec37 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -160,4 +160,7 @@ label {
 
 #movieList .mix{
 	display: none;
+}
+#tvList .mix{
+	display: none;
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 1d44e0625..68b942bdb 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -14,6 +14,22 @@ movieLoad();
 tvLoad();
 
 
+$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+    var target = $(e.target).attr('href');
+    if (target === "#TvShowTab") {
+        if (!$('#tvList').mixItUp('isLoaded')) {
+            $('#tvList').mixItUp({
+                layout: {
+                    display: 'block'
+                },
+                load: {
+                    filter: 'all'
+                }
+            });
+        }
+    }
+});
+
 // Approve all
 $('#approveAll').click(function () {
     $.ajax({
@@ -283,7 +299,6 @@ function movieLoad() {
                 filter: 'all'
             }
         });
-
     });
 };
 
@@ -296,14 +311,6 @@ function tvLoad() {
             var html = searchTemplate(context);
             $("#tvList").append(html);
         });
-        $('#tvList').mixItUp({
-            layout: {
-                display: 'block'
-            },
-            load: {
-                filter: 'all'
-            }
-        });
     });
 };
 
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 1465935f5..5c1f38431 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -22,7 +22,7 @@
     </ul>
 
     <!-- Tab panes -->
-    <div class="tab-content">
+    <div class="tab-content contentList">
         <div class="btn-group col-sm-push-10">
             <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                 Filter
@@ -78,7 +78,7 @@
 
 
 <script id="search-template" type="text/x-handlebars-template">
-    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestId}}" data-requester="{{requestedBy}}">
+    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}">
         <div class="row">
             <div class="col-sm-2">
                 {{#if_eq type "movie"}}
@@ -176,16 +176,15 @@
                             <li><a id="{{requestId}}" issue-select="2" class="dropdownIssue" href="#">Wrong Content</a></li>
                             <li><a id="{{requestId}}" issue-select="3" class="dropdownIssue" href="#">Playback Issues</a></li>
                             <li><a id="{{requestId}}" issue-select="4" class="dropdownIssue" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#myModal">Other</a></li>
-                            {{#if_eq admin true}}
-                            <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
 
+                            {{#if_eq admin true}}
+                                <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
                             {{/if_eq}}
                         </ul>
                     </div>
                 </form>
 
             </div>
-            @* // TODO add Issues to the view *@
         </div>
         <hr />
     </div>
@@ -234,3 +233,5 @@
 </div>
 
 <script src="/Content/requests.js" type="text/javascript"></script>
+
+