From f5cb4d6879a741682bfc7225df24397f19c74e1e Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Thu, 17 Mar 2016 21:53:45 +0000
Subject: [PATCH 01/30] fixed #25

---
 PlexRequests.Api.Models/Plex/PlexSearch.cs    | 70 +++++++++++++++++++
 PlexRequests.Api/ApiRequest.cs                |  2 +-
 .../PlexAvailabilityCheckerTests.cs           | 21 ++++++
 .../PlexAvailabilityChecker.cs                |  5 +-
 PlexRequests.UI/Modules/SearchModule.cs       |  4 +-
 5 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/PlexRequests.Api.Models/Plex/PlexSearch.cs b/PlexRequests.Api.Models/Plex/PlexSearch.cs
index 1d19b18bd..f95efce64 100644
--- a/PlexRequests.Api.Models/Plex/PlexSearch.cs
+++ b/PlexRequests.Api.Models/Plex/PlexSearch.cs
@@ -238,9 +238,79 @@ public class Provider
         public string Type { get; set; }
     }
 
+    [XmlRoot(ElementName = "Directory")]
+    public class Directory1
+    {
+        [XmlElement(ElementName = "Genre")]
+        public List<Genre> Genre { get; set; }
+        [XmlElement(ElementName = "Role")]
+        public List<Role> Role { get; set; }
+        [XmlAttribute(AttributeName = "allowSync")]
+        public string AllowSync { get; set; }
+        [XmlAttribute(AttributeName = "librarySectionID")]
+        public string LibrarySectionID { get; set; }
+        [XmlAttribute(AttributeName = "librarySectionTitle")]
+        public string LibrarySectionTitle { get; set; }
+        [XmlAttribute(AttributeName = "librarySectionUUID")]
+        public string LibrarySectionUUID { get; set; }
+        [XmlAttribute(AttributeName = "personal")]
+        public string Personal { get; set; }
+        [XmlAttribute(AttributeName = "sourceTitle")]
+        public string SourceTitle { get; set; }
+        [XmlAttribute(AttributeName = "ratingKey")]
+        public string RatingKey { get; set; }
+        [XmlAttribute(AttributeName = "key")]
+        public string Key { get; set; }
+        [XmlAttribute(AttributeName = "studio")]
+        public string Studio { get; set; }
+        [XmlAttribute(AttributeName = "type")]
+        public string Type { get; set; }
+        [XmlAttribute(AttributeName = "title")]
+        public string Title { get; set; }
+        [XmlAttribute(AttributeName = "contentRating")]
+        public string ContentRating { get; set; }
+        [XmlAttribute(AttributeName = "summary")]
+        public string Summary { get; set; }
+        [XmlAttribute(AttributeName = "index")]
+        public string Index { get; set; }
+        [XmlAttribute(AttributeName = "rating")]
+        public string Rating { get; set; }
+        [XmlAttribute(AttributeName = "viewCount")]
+        public string ViewCount { get; set; }
+        [XmlAttribute(AttributeName = "lastViewedAt")]
+        public string LastViewedAt { get; set; }
+        [XmlAttribute(AttributeName = "year")]
+        public string Year { get; set; }
+        [XmlAttribute(AttributeName = "thumb")]
+        public string Thumb { get; set; }
+        [XmlAttribute(AttributeName = "art")]
+        public string Art { get; set; }
+        [XmlAttribute(AttributeName = "banner")]
+        public string Banner { get; set; }
+        [XmlAttribute(AttributeName = "theme")]
+        public string Theme { get; set; }
+        [XmlAttribute(AttributeName = "duration")]
+        public string Duration { get; set; }
+        [XmlAttribute(AttributeName = "originallyAvailableAt")]
+        public string OriginallyAvailableAt { get; set; }
+        [XmlAttribute(AttributeName = "leafCount")]
+        public string LeafCount { get; set; }
+        [XmlAttribute(AttributeName = "viewedLeafCount")]
+        public string ViewedLeafCount { get; set; }
+        [XmlAttribute(AttributeName = "childCount")]
+        public string ChildCount { get; set; }
+        [XmlAttribute(AttributeName = "addedAt")]
+        public string AddedAt { get; set; }
+        [XmlAttribute(AttributeName = "updatedAt")]
+        public string UpdatedAt { get; set; }
+    }
+
+
     [XmlRoot(ElementName = "MediaContainer")]
     public class PlexSearch
     {
+        [XmlElement(ElementName = "Directory")]
+        public Directory1 Directory { get; set; }
         [XmlElement(ElementName = "Video")]
         public List<Video> Video { get; set; }
         [XmlElement(ElementName = "Provider")]
diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs
index f79c2e3dc..62391386b 100644
--- a/PlexRequests.Api/ApiRequest.cs
+++ b/PlexRequests.Api/ApiRequest.cs
@@ -98,13 +98,13 @@ public T ExecuteXml<T>(IRestRequest request, Uri baseUri) where T : class
 
             try
             {
-
                 var json = JsonConvert.DeserializeObject<T>(response.Content);
                 return json;
             }
             catch (Exception e)
             {
                 Log.Fatal(e);
+                Log.Info(response.Content);
                 throw;
             }
         }
diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
index ed70fcf7d..0a1a157c0 100644
--- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
+++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
@@ -79,6 +79,27 @@ public void IsAvailableTest()
             Assert.That(result, Is.True);
         }
 
+        [Test]
+        public void IsAvailableDirectoryTitleTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Directory = new Directory1 {Title = "title"} };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title");
+
+            Assert.That(result, Is.True);
+        }
+
         [Test]
         public void IsNotAvailableTest()
         {
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index c9ae0d6af..d450e364d 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -98,8 +98,9 @@ public bool IsAvailable(string title)
             }
 
             var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-            var result = results.Video.FirstOrDefault(x => x.Title == title);
-            return result?.Title != null;
+            var result = results.Video?.FirstOrDefault(x => x.Title == title);
+            var directoryTitle = results.Directory?.Title == title;
+            return result?.Title != null || directoryTitle;
         }
 
         private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth, IEnumerable<RequestedModel> requests)
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index e96a5e753..44c7a83a3 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -267,12 +267,12 @@ private Response RequestTvShow(int showId, bool latest)
 
             var showInfo = tvApi.GetInformation(showId, token).data;
 
-#if !DEBUG
+//#if !DEBUG
             if (CheckIfTitleExistsInPlex(showInfo.seriesName))
             {
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.seriesName} is already in Plex!" });
             }
-#endif
+//#endif
 
             DateTime firstAir;
             DateTime.TryParse(showInfo.firstAired, out firstAir);

From 5f26aecb98f86febdd529d97c96dd14db9afbf59 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 11:06:27 +0000
Subject: [PATCH 02/30] Switched over to the new service

---
 PlexRequests.Core/IRequestService.cs               |  4 ++--
 PlexRequests.Core/JsonRequestService.cs            | 13 ++++++++-----
 PlexRequests.Core/RequestService.cs                |  9 ++++-----
 .../Repository/RequestJsonRepository.cs            |  3 ++-
 PlexRequests.UI/Bootstrapper.cs                    |  2 +-
 PlexRequests.UI/Modules/ApprovalModule.cs          | 12 ++++++------
 PlexRequests.UI/Modules/RequestsModule.cs          | 14 +++++++-------
 PlexRequests.UI/Program.cs                         |  1 -
 8 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs
index 18c8485e9..d8b1b1739 100644
--- a/PlexRequests.Core/IRequestService.cs
+++ b/PlexRequests.Core/IRequestService.cs
@@ -34,8 +34,8 @@ public interface IRequestService
     {
         long AddRequest(int providerId, RequestedModel model);
         bool CheckRequest(int providerId);
-        void DeleteRequest(int tmdbId);
-        void UpdateRequest(RequestedModel model);
+        void DeleteRequest(RequestedModel request);
+        bool UpdateRequest(RequestedModel model);
         RequestedModel Get(int id);
         IEnumerable<RequestedModel> GetAll();
         bool BatchUpdate(List<RequestedModel> model);
diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index f7b5097a4..450dc8822 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -44,6 +44,9 @@ public JsonRequestService(IRequestRepository repo)
         private IRequestRepository Repo { get; }
         public long AddRequest(int providerId, RequestedModel model)
         {
+            var latestId = Repo.GetAll().OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
+            var newId = latestId + 1;
+            model.Id = newId;
             var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId};
 
            return Repo.Insert(entity);
@@ -55,16 +58,16 @@ public bool CheckRequest(int providerId)
             return blobs.Any(x => x.ProviderId == providerId);
         }
 
-        public void DeleteRequest(int tmdbId)
+        public void DeleteRequest(RequestedModel request)
         {
-            var blob = Repo.GetAll().FirstOrDefault(x => x.ProviderId == tmdbId);
+            var blob = Repo.Get(request.Id);
             Repo.Delete(blob);
         }
 
-        public void UpdateRequest(RequestedModel model)
+        public bool UpdateRequest(RequestedModel model)
         {
             var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id};
-            Repo.Update(entity);
+            return Repo.Update(entity);
         }
 
         public RequestedModel Get(int id)
@@ -85,7 +88,7 @@ public IEnumerable<RequestedModel> GetAll()
 
         public bool BatchUpdate(List<RequestedModel> model)
         {
-            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId }).ToList();
+            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId, Id = m.Id}).ToList();
             return Repo.UpdateAll(entities);
         }
 
diff --git a/PlexRequests.Core/RequestService.cs b/PlexRequests.Core/RequestService.cs
index 22164fabd..99ab20bf4 100644
--- a/PlexRequests.Core/RequestService.cs
+++ b/PlexRequests.Core/RequestService.cs
@@ -50,16 +50,15 @@ public bool CheckRequest(int providerId)
             return Repo.GetAll().Any(x => x.ProviderId == providerId);
         }
 
-        public void DeleteRequest(int tmdbId)
+        public void DeleteRequest(RequestedModel model)
         {
-            var entity = Repo.GetAll().FirstOrDefault(x => x.ProviderId == tmdbId);
+            var entity = Repo.Get(model.Id);
             Repo.Delete(entity);
         }
 
-        public void UpdateRequest(RequestedModel model)
+        public bool UpdateRequest(RequestedModel model)
         {
-
-            Repo.Update(model);
+            return Repo.Update(model);
         }
 
         /// <summary>
diff --git a/PlexRequests.Store/Repository/RequestJsonRepository.cs b/PlexRequests.Store/Repository/RequestJsonRepository.cs
index 85b1781bb..54bdfd282 100644
--- a/PlexRequests.Store/Repository/RequestJsonRepository.cs
+++ b/PlexRequests.Store/Repository/RequestJsonRepository.cs
@@ -53,7 +53,8 @@ public long Insert(RequestBlobs entity)
             ResetCache();
             using (var con = Db.DbConnection())
             {
-                return con.Insert(entity);
+                var id = con.Insert(entity);
+                return id;
             }
         }
 
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 2082f585d..cba01fd25 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -76,7 +76,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na
             container.Register<ISettingsService<EmailNotificationSettings>, SettingsServiceV2<EmailNotificationSettings>>();
             container.Register<ISettingsService<PushbulletNotificationSettings>, SettingsServiceV2<PushbulletNotificationSettings>>();
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
-            container.Register<IRequestService, RequestService>();
+            container.Register<IRequestService, JsonRequestService>();
 
             container.Register<IAvailabilityChecker, PlexAvailabilityChecker>();
             container.Register<IConfigurationReader, ConfigurationReader>();
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index 57bddf2cd..ca3a4bcdb 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -44,7 +44,7 @@ namespace PlexRequests.UI.Modules
     public class ApprovalModule : BaseModule
     {
 
-        public ApprovalModule(IRepository<RequestedModel> service, ISettingsService<CouchPotatoSettings> cpService, ICouchPotatoApi cpApi, ISonarrApi sonarrApi,
+        public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSettings> cpService, ICouchPotatoApi cpApi, ISonarrApi sonarrApi,
             ISettingsService<SonarrSettings> sonarrSettings) : base("approval")
         {
             this.RequiresAuthentication();
@@ -59,12 +59,12 @@ public ApprovalModule(IRepository<RequestedModel> service, ISettingsService<Couc
             Post["/approveall"] = x => ApproveAll();
         }
 
-        private IRepository<RequestedModel> Service { get; set; }
+        private IRequestService Service { get; }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
-        private ISettingsService<SonarrSettings> SonarrSettings { get; set; }
+        private ISettingsService<SonarrSettings> SonarrSettings { get; }
         private ISettingsService<CouchPotatoSettings> CpService { get; }
-        private ISonarrApi SonarrApi { get; set; }
+        private ISonarrApi SonarrApi { get; }
         private ICouchPotatoApi CpApi { get; }
 
         /// <summary>
@@ -135,7 +135,7 @@ private Response RequestMovieAndUpdateStatus(RequestedModel request)
                 request.Approved = true;
 
                 // Update the record
-                var inserted = Service.Update(request);
+                var inserted = Service.UpdateRequest(request);
 
                 return Response.AsJson(inserted
                     ? new JsonResponseModel {Result = true}
@@ -195,7 +195,7 @@ private Response ApproveAll()
             try
             {
 
-                var result = Service.UpdateAll(updatedRequests); return Response.AsJson(result
+                var result = Service.BatchUpdate(updatedRequests); return Response.AsJson(result
                  ? new JsonResponseModel { Result = true }
                  : new JsonResponseModel { Result = false, Message = "We could not approve all of the requests. Please try again or check the logs." });
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 68c997560..6b06f657d 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -45,7 +45,7 @@ namespace PlexRequests.UI.Modules
     public class RequestsModule : BaseModule
     {
 
-        public RequestsModule(IRepository<RequestedModel> service, ISettingsService<PlexRequestSettings> prSettings, ISettingsService<PlexSettings> plex) : base("requests")
+        public RequestsModule(IRequestService service, ISettingsService<PlexRequestSettings> prSettings, ISettingsService<PlexSettings> plex) : base("requests")
         {
             Service = service;
             PrSettings = prSettings;
@@ -64,7 +64,7 @@ public RequestsModule(IRepository<RequestedModel> service, ISettingsService<Plex
             Post["/addnote"] = _ => AddNote((int)Request.Form.requestId, (string)Request.Form.noteArea);
         }
 
-        private IRepository<RequestedModel> Service { get; }
+        private IRequestService Service { get; }
         private ISettingsService<PlexRequestSettings> PrSettings { get; }
         private ISettingsService<PlexSettings> PlexSettings { get; }
 
@@ -140,7 +140,7 @@ private Response DeleteRequest(int requestid)
             }
 
             var currentEntity = Service.Get(requestid);
-            Service.Delete(currentEntity);
+            Service.DeleteRequest(currentEntity);
             return Response.AsJson(new JsonResponseModel { Result = true });
         }
 
@@ -165,7 +165,7 @@ private Response ReportIssue(int requestId, IssueState issue, string comment)
                 : string.Empty;
 
 
-            var result = Service.Update(originalRequest);
+            var result = Service.UpdateRequest(originalRequest);
             return Response.AsJson(result
                 ? new JsonResponseModel { Result = true }
                 : new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" });
@@ -186,7 +186,7 @@ private Response ClearIssue(int requestId)
             originalRequest.Issues = IssueState.None;
             originalRequest.OtherMessage = string.Empty;
 
-            var result = Service.Update(originalRequest);
+            var result = Service.UpdateRequest(originalRequest);
             return Response.AsJson(result
                                        ? new JsonResponseModel { Result = true }
                                        : new JsonResponseModel { Result = false, Message = "Could not clear issue, please try again or check the logs" });
@@ -202,7 +202,7 @@ private Response ChangeRequestAvailability(int requestId, bool available)
 
             originalRequest.Available = available;
 
-            var result = Service.Update(originalRequest);
+            var result = Service.UpdateRequest(originalRequest);
             return Response.AsJson(result
                                        ? new { Result = true, Available = available, Message = string.Empty }
                                        : new { Result = false, Available = false, Message = "Could not update the availability, please try again or check the logs" });
@@ -218,7 +218,7 @@ private Response AddNote(int requestId, string noteArea)
 
             originalRequest.AdminNote = noteArea;
 
-            var result = Service.Update(originalRequest);
+            var result = Service.UpdateRequest(originalRequest);
             return Response.AsJson(result
                                        ? new JsonResponseModel { Result = true }
                                        : new JsonResponseModel { Result = false, Message = "Could not update the notes, please try again or check the logs" });
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 9db2c673b..8a7d5a6ce 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -71,7 +71,6 @@ static void Main(string[] args)
             if (string.IsNullOrEmpty(uri))
                 uri = GetStartupUri();
 
-;
             var options = new StartOptions(uri)
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"

From f7b32ca9dcf65b9eee154f6e0c871069362f54b3 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 11:07:46 +0000
Subject: [PATCH 03/30] Updated the Dapper.Contrib package, it had a bug where
 it wasn't returning the correct Id from inserts

---
 PlexRequests.Store/PlexRequests.Store.csproj | 2 +-
 PlexRequests.Store/packages.config           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/PlexRequests.Store.csproj
index 1344e2d4e..45ae52a0b 100644
--- a/PlexRequests.Store/PlexRequests.Store.csproj
+++ b/PlexRequests.Store/PlexRequests.Store.csproj
@@ -36,7 +36,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Dapper.Contrib, Version=1.40.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapper.Contrib.1.42\lib\net45\Dapper.Contrib.dll</HintPath>
+      <HintPath>..\packages\Dapper.Contrib.1.43\lib\net45\Dapper.Contrib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Data.Sqlite">
diff --git a/PlexRequests.Store/packages.config b/PlexRequests.Store/packages.config
index 9243e5e7f..6ecb34bd0 100644
--- a/PlexRequests.Store/packages.config
+++ b/PlexRequests.Store/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Dapper" version="1.42" targetFramework="net452" />
-  <package id="Dapper.Contrib" version="1.42" targetFramework="net452" />
+  <package id="Dapper.Contrib" version="1.43" targetFramework="net46" />
   <package id="NLog" version="4.2.3" targetFramework="net452" />
 </packages>
\ No newline at end of file

From 5dd9857011021e6e8072e53339cf0ca4e0e002e1 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 11:51:35 +0000
Subject: [PATCH 04/30] Modified the adding of request to update the model with
 the added ID

---
 PlexRequests.Core/JsonRequestService.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 450dc8822..9980b1648 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -44,12 +44,16 @@ public JsonRequestService(IRequestRepository repo)
         private IRequestRepository Repo { get; }
         public long AddRequest(int providerId, RequestedModel model)
         {
-            var latestId = Repo.GetAll().OrderByDescending(x => x.Id).Select(x => x.Id).FirstOrDefault();
-            var newId = latestId + 1;
-            model.Id = newId;
             var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId};
 
-           return Repo.Insert(entity);
+           var id = Repo.Insert(entity);
+
+            model.Id = (int)id;
+
+            entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id};
+            var result = Repo.Update(entity);
+
+            return result ? id : -1;
         }
 
         public bool CheckRequest(int providerId)

From ce416ae046d17617ac742d3d0c66ab4b3b0271d7 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 11:53:07 +0000
Subject: [PATCH 05/30] Updated the way we add requests

---
 PlexRequests.Core/JsonRequestService.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 9980b1648..67163e6e7 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -44,13 +44,13 @@ public JsonRequestService(IRequestRepository repo)
         private IRequestRepository Repo { get; }
         public long AddRequest(int providerId, RequestedModel model)
         {
-            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId};
-
-           var id = Repo.Insert(entity);
+            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId };
+            var id = Repo.Insert(entity);
 
+            // TODO Keep an eye on this, since we are now doing 2 DB update for 1 single request, inserting and then updating
             model.Id = (int)id;
 
-            entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id};
+            entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id };
             var result = Repo.Update(entity);
 
             return result ? id : -1;
@@ -70,7 +70,7 @@ public void DeleteRequest(RequestedModel request)
 
         public bool UpdateRequest(RequestedModel model)
         {
-            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id};
+            var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId, Id = model.Id };
             return Repo.Update(entity);
         }
 
@@ -92,7 +92,7 @@ public IEnumerable<RequestedModel> GetAll()
 
         public bool BatchUpdate(List<RequestedModel> model)
         {
-            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId, Id = m.Id}).ToList();
+            var entities = model.Select(m => new RequestBlobs { Type = m.Type, Content = ReturnBytes(m), ProviderId = m.ProviderId, Id = m.Id }).ToList();
             return Repo.UpdateAll(entities);
         }
 

From b62b7c1305fde1470e1a2a0692e1590bb2d6943c Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 12:25:16 +0000
Subject: [PATCH 06/30] Added migration code and cleaned up the DB

---
 PlexRequests.Core/IRequestService.cs         |  2 +-
 PlexRequests.Core/JsonRequestService.cs      |  2 +-
 PlexRequests.Core/RequestService.cs          |  2 +-
 PlexRequests.Core/Setup.cs                   | 27 ++++++++++++++
 PlexRequests.Store/PlexRequests.Store.csproj |  1 -
 PlexRequests.Store/SettingsModel.cs          | 38 --------------------
 PlexRequests.Store/SqlTables.sql             | 30 ----------------
 PlexRequests.UI/Modules/SearchModule.cs      |  8 ++---
 8 files changed, 34 insertions(+), 76 deletions(-)
 delete mode 100644 PlexRequests.Store/SettingsModel.cs

diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs
index d8b1b1739..fb68fab37 100644
--- a/PlexRequests.Core/IRequestService.cs
+++ b/PlexRequests.Core/IRequestService.cs
@@ -32,7 +32,7 @@ namespace PlexRequests.Core
 {
     public interface IRequestService
     {
-        long AddRequest(int providerId, RequestedModel model);
+        long AddRequest(RequestedModel model);
         bool CheckRequest(int providerId);
         void DeleteRequest(RequestedModel request);
         bool UpdateRequest(RequestedModel model);
diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 67163e6e7..1a99569d3 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -42,7 +42,7 @@ public JsonRequestService(IRequestRepository repo)
             Repo = repo;
         }
         private IRequestRepository Repo { get; }
-        public long AddRequest(int providerId, RequestedModel model)
+        public long AddRequest(RequestedModel model)
         {
             var entity = new RequestBlobs { Type = model.Type, Content = ReturnBytes(model), ProviderId = model.ProviderId };
             var id = Repo.Insert(entity);
diff --git a/PlexRequests.Core/RequestService.cs b/PlexRequests.Core/RequestService.cs
index 99ab20bf4..7788b6436 100644
--- a/PlexRequests.Core/RequestService.cs
+++ b/PlexRequests.Core/RequestService.cs
@@ -40,7 +40,7 @@ public RequestService(IRepository<RequestedModel> db)
     
         private IRepository<RequestedModel> Repo { get; set; }
 
-        public long AddRequest(int providerId, RequestedModel model)
+        public long AddRequest(RequestedModel model)
         {
             return Repo.Insert(model);
         }
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 3866bad6a..1d50794aa 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -24,6 +24,9 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+using System.Collections.Generic;
+using System.Linq;
+
 using Mono.Data.Sqlite;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
@@ -46,6 +49,7 @@ public string SetupDb()
                 CreateDefaultSettingsPage();
             }
 
+            MigrateDb();
             return Db.DbConnection().ConnectionString;
         }
 
@@ -63,5 +67,28 @@ private void CreateDefaultSettingsPage()
             var s = new SettingsServiceV2<PlexRequestSettings>(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
             s.SaveSettings(defaultSettings);
         }
+
+        private void MigrateDb()
+        {
+            var repo = new GenericRepository<RequestedModel>(Db);
+            var records = repo.GetAll();
+            var requestedModels = records as RequestedModel[] ?? records.ToArray();
+            if(!requestedModels.Any())
+            { return; }
+
+            var jsonRepo = new JsonRequestService(new RequestJsonRepository(Db, new MemoryCacheProvider()));
+            var result = new List<long>();
+            foreach (var r in requestedModels)
+            {
+                var id = jsonRepo.AddRequest(r);
+                result.Add(id);
+            }
+
+            if (result.Any(x => x == -1))
+            {
+                throw new SqliteException("Could not migrate the DB!");
+            }
+            
+        }
     }
 }
diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/PlexRequests.Store.csproj
index 45ae52a0b..3772c77a4 100644
--- a/PlexRequests.Store/PlexRequests.Store.csproj
+++ b/PlexRequests.Store/PlexRequests.Store.csproj
@@ -68,7 +68,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repository\SettingsJsonRepository.cs" />
     <Compile Include="Repository\RequestJsonRepository.cs" />
-    <Compile Include="SettingsModel.cs" />
     <Compile Include="GenericRepository.cs" />
     <Compile Include="RequestedModel.cs" />
     <Compile Include="UserRepository.cs" />
diff --git a/PlexRequests.Store/SettingsModel.cs b/PlexRequests.Store/SettingsModel.cs
deleted file mode 100644
index 3c8913cd3..000000000
--- a/PlexRequests.Store/SettingsModel.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: SettingsModel.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 Dapper.Contrib.Extensions;
-
-namespace PlexRequests.Store
-{
-    [Table("Settings")]
-    public class SettingsModel : Entity
-    {
-        public int Port { get; set; }
-        public bool UserAuthentication { get; set; }
-        public string PlexAuthToken { get; set; }
-    }
-}
diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index dee07581d..d696da6b4 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -8,36 +8,6 @@ CREATE TABLE IF NOT EXISTS User
     Password							varchar(100) NOT NULL
 );
 
-CREATE TABLE IF NOT EXISTS Settings
-(
-	Id									INTEGER PRIMARY KEY AUTOINCREMENT,
-    Port								INTEGER NOT NULL,
-	UserAuthentication					INTEGER NOT NULL,
-	PlexAuthToken						varchar(50)				
-);
-
-
-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)
-
-);
 
 CREATE TABLE IF NOT EXISTS GlobalSettings
 (
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 44c7a83a3..6556f2e3c 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -225,7 +225,7 @@ private Response RequestMovie(int movieId)
                 {
                     model.Approved = true;
                     Log.Debug("Adding movie to database requests (No approval required)");
-                    RequestService.AddRequest(movieId, model);
+                    RequestService.AddRequest(model);
 
                     return Response.AsJson(new JsonResponseModel { Result = true });
                 }
@@ -235,7 +235,7 @@ private Response RequestMovie(int movieId)
             try
             {
                 Log.Debug("Adding movie to database requests");
-                var id = RequestService.AddRequest(movieId, model);
+                var id = RequestService.AddRequest(model);
 
                 NotificationService.Publish(model.Title, model.RequestedBy);
 
@@ -307,14 +307,14 @@ private Response RequestTvShow(int showId, bool latest)
                 {
                     model.Approved = true;
                     Log.Debug("Adding tv to database requests (No approval required)");
-                    RequestService.AddRequest(showId, model);
+                    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 CouchPotato! Please check your settings." });
             }
 
-            RequestService.AddRequest(showId, model);
+            RequestService.AddRequest(model);
             NotificationService.Publish(model.Title, model.RequestedBy);
 
             return Response.AsJson(new { Result = true });

From 2e8bb783d9dd4a08a3061562a378eac82d2c7095 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 13:52:10 +0000
Subject: [PATCH 07/30] Fixed #16 and #30

We are now using the new request service and storing the requests as json blobs

Added the db migration code. This can be removed in the next few builds.
---
 PlexRequests.Core/Setup.cs                  | 17 +++++++++++++++--
 PlexRequests.UI/Content/requests.js         |  2 +-
 PlexRequests.UI/Views/Requests/Index.cshtml |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 1d50794aa..4681dd3b4 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -68,7 +68,7 @@ private void CreateDefaultSettingsPage()
             s.SaveSettings(defaultSettings);
         }
 
-        private void MigrateDb()
+        private void MigrateDb() // TODO: Remove when no longer needed
         {
             var repo = new GenericRepository<RequestedModel>(Db);
             var records = repo.GetAll();
@@ -88,7 +88,20 @@ private void MigrateDb()
             {
                 throw new SqliteException("Could not migrate the DB!");
             }
-            
+
+
+            if (result.Count != requestedModels.Length)
+            {
+                throw new SqliteException("Could not migrate the DB! count is different");
+            }
+
+
+            // Now delete the old requests
+            foreach (var oldRequest in requestedModels)
+            {
+                repo.Delete(oldRequest);
+            }
+
         }
     }
 }
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 8c83f3328..5e26fc4a7 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -108,7 +108,7 @@ $(".theNoteSaveButton").click(function (e) {
             if (checkJsonResponse(response)) {
                 generateNotify("Success! Added Note.", "success");
                 $("#myModal").modal("hide");
-                $('#adminNotesArea').html("<div>Note from Admin: " + comment + "</div>");
+                $('#adminNotesArea' + e.target.value).html("<div>Note from Admin: " + comment + "</div>");
             }
         },
         error: function (e) {
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 7de26fd08..5181b38c0 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -102,7 +102,7 @@
                     <div>Issue: {{issues}}</div>
                     {{/if}}
                 </div>
-                <div id="adminNotesArea">
+                <div id="adminNotesArea{{requestId}}">
                     {{#if adminNote}}
                     <div>Note from Admin: {{adminNote}}</div>
                     {{/if}}

From 2c3262665209d3422d3621d032c10b8e46b39bd2 Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 14:00:34 +0000
Subject: [PATCH 08/30] Update README.md

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

diff --git a/README.md b/README.md
index e73e40abc..156a1af34 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@ I wanted to write a similar application in .Net!
 
 #Features
 
-* Integration with [TheMovieDB](https://www.themoviedb.org/) for all Movies and TV shows
+* Integration with [TheMovieDB](https://www.themoviedb.org/) for all Movies
+* Integration with [TheTvDb](http://thetvdb.com/) for all TV shows! (soon to be changed [#21](https://github.com/tidusjar/PlexRequests.Net/issues/21))
 * Secure authentication
 * [Sonarr](https://sonarr.tv/) integration (SickRage/Sickbeard TBD)
 * [CouchPotato](https://couchpota.to/) integration

From 55f296b9a40e256551787c227dc93b9decb006b3 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 14:39:04 +0000
Subject: [PATCH 09/30] Added TVMaze to the search. #21

---
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api.Models/Tv/TvMazeSearch.cs    | 97 +++++++++++++++++++
 PlexRequests.Api/PlexRequests.Api.csproj      |  2 +
 PlexRequests.Api/TvMazeApi.cs                 | 60 ++++++++++++
 PlexRequests.Api/TvMazeBase.cs                | 33 +++++++
 .../Models/SearchTvShowViewModel.cs           |  2 -
 PlexRequests.UI/Modules/SearchModule.cs       | 44 ++++-----
 PlexRequests.UI/Views/Search/Index.cshtml     |  2 +-
 8 files changed, 214 insertions(+), 27 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Tv/TvMazeSearch.cs
 create mode 100644 PlexRequests.Api/TvMazeApi.cs
 create mode 100644 PlexRequests.Api/TvMazeBase.cs

diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 402d1192a..fee0b033c 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -60,6 +60,7 @@
     <Compile Include="Sonarr\SonarrProfile.cs" />
     <Compile Include="Sonarr\SystemStatus.cs" />
     <Compile Include="Tv\Authentication.cs" />
+    <Compile Include="Tv\TvMazeSearch.cs" />
     <Compile Include="Tv\TvSearchResult.cs" />
     <Compile Include="Tv\TvShow.cs" />
     <Compile Include="Tv\TvShowImages.cs" />
diff --git a/PlexRequests.Api.Models/Tv/TvMazeSearch.cs b/PlexRequests.Api.Models/Tv/TvMazeSearch.cs
new file mode 100644
index 000000000..399154c57
--- /dev/null
+++ b/PlexRequests.Api.Models/Tv/TvMazeSearch.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PlexRequests.Api.Models.Tv
+{
+    public class Schedule
+    {
+        public string time { get; set; }
+        public List<object> days { get; set; }
+    }
+
+    public class Rating
+    {
+        public double? average { get; set; }
+    }
+
+    public class Country
+    {
+        public string name { get; set; }
+        public string code { get; set; }
+        public string timezone { get; set; }
+    }
+
+    public class Network
+    {
+        public int id { get; set; }
+        public string name { get; set; }
+        public Country country { get; set; }
+    }
+
+    public class Externals
+    {
+        public int? tvrage { get; set; }
+        public int? thetvdb { get; set; }
+        public string imdb { get; set; }
+    }
+
+    public class Image
+    {
+        public string medium { get; set; }
+        public string original { get; set; }
+    }
+
+    public class Self
+    {
+        public string href { get; set; }
+    }
+
+    public class Previousepisode
+    {
+        public string href { get; set; }
+    }
+
+    public class Nextepisode
+    {
+        public string href { get; set; }
+    }
+
+    public class Links
+    {
+        public Self self { get; set; }
+        public Previousepisode previousepisode { get; set; }
+        public Nextepisode nextepisode { get; set; }
+    }
+
+    public class Show
+    {
+        public int id { get; set; }
+        public string url { get; set; }
+        public string name { get; set; }
+        public string type { get; set; }
+        public string language { get; set; }
+        public List<object> genres { get; set; }
+        public string status { get; set; }
+        public int? runtime { get; set; }
+        public string premiered { get; set; }
+        public Schedule schedule { get; set; }
+        public Rating rating { get; set; }
+        public int weight { get; set; }
+        public Network network { get; set; }
+        public object webChannel { get; set; }
+        public Externals externals { get; set; }
+        public Image image { get; set; }
+        public string summary { get; set; }
+        public int updated { get; set; }
+        public Links _links { get; set; }
+    }
+
+    public class TvMazeSearch
+    {
+        public double score { get; set; }
+        public Show show { get; set; }
+    }
+}
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index aea64364e..5157e905c 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -81,6 +81,8 @@
     <Compile Include="TvBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TheTvDbApi.cs" />
+    <Compile Include="TvMazeApi.cs" />
+    <Compile Include="TvMazeBase.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/PlexRequests.Api/TvMazeApi.cs b/PlexRequests.Api/TvMazeApi.cs
new file mode 100644
index 000000000..6af8c51a2
--- /dev/null
+++ b/PlexRequests.Api/TvMazeApi.cs
@@ -0,0 +1,60 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: TvMazeApi.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.Models.Tv;
+
+using RestSharp;
+
+namespace PlexRequests.Api
+{
+    public class TvMazeApi : TvMazeBase
+    {
+        public TvMazeApi()
+        {
+            Api = new ApiRequest();
+        }
+        private ApiRequest Api { get;  }
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+        public List<TvMazeSearch> Search(string searchTerm)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "search/shows?q={searchTerm}"
+            };
+            request.AddUrlSegment("searchTerm", searchTerm);
+            request.AddHeader("Content-Type", "application/json");
+
+            return Api.Execute<List<TvMazeSearch>>(request, new Uri(Uri));
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/TvMazeBase.cs b/PlexRequests.Api/TvMazeBase.cs
new file mode 100644
index 000000000..1526603bc
--- /dev/null
+++ b/PlexRequests.Api/TvMazeBase.cs
@@ -0,0 +1,33 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: TvMazeBase.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
+{
+    public class TvMazeBase
+    {
+        public string Uri = "http://api.tvmaze.com";
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Models/SearchTvShowViewModel.cs b/PlexRequests.UI/Models/SearchTvShowViewModel.cs
index 8e31193fc..ee6de42d1 100644
--- a/PlexRequests.UI/Models/SearchTvShowViewModel.cs
+++ b/PlexRequests.UI/Models/SearchTvShowViewModel.cs
@@ -48,8 +48,6 @@ public class SearchTvShowViewModel
         public string AirsTime { get; set; }
         public string Rating { get; set; }
         public string ImdbId { get; set; }
-        public string Zap2ItId { get; set; }
-        public string Added { get; set; }
         public int SiteRating { get; set; }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 6556f2e3c..e39adca21 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -26,6 +26,9 @@
 #endregion
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
 using Nancy;
 using Nancy.Responses.Negotiation;
 
@@ -104,41 +107,34 @@ private Response SearchMovie(string searchTerm)
         private Response SearchTvShow(string searchTerm)
         {
             Log.Trace("Searching for TV Show {0}", searchTerm);
-            var tvShow = TvApi.SearchTv(searchTerm, AuthToken);
-
-            if (tvShow?.data == null)
+            //var tvShow = TvApi.SearchTv(searchTerm, AuthToken);
+            var tvShow = new TvMazeApi().Search(searchTerm);
+            if (!tvShow.Any())
             {
                 Log.Trace("TV Show data is null");
                 return Response.AsJson("");
             }
             var model = new List<SearchTvShowViewModel>();
 
-            foreach (var t in tvShow.data)
+            foreach (var t in tvShow)
             {
                 model.Add(new SearchTvShowViewModel
                 {
-                    Added = t.added,
-                    AirsDayOfWeek = t.airsDayOfWeek,
-                    AirsTime = t.airsTime,
-                    Aliases = t.aliases,
                     // We are constructing the banner with the id: 
                     // http://thetvdb.com/banners/_cache/posters/ID-1.jpg
-                    Banner = t.id.ToString(),
-                    FirstAired = t.firstAired,
-                    Genre = t.genre,
-                    Id = t.id,
-                    ImdbId = t.imdbId,
-                    LastUpdated = t.lastUpdated,
-                    Network = t.network,
-                    NetworkId = t.networkId,
-                    Overview = t.overview,
-                    Rating = t.rating,
-                    Runtime = t.runtime,
-                    SeriesId = t.id,
-                    SeriesName = t.seriesName,
-                    SiteRating = t.siteRating,
-                    Status = t.status,
-                    Zap2ItId = t.zap2itId
+                    Banner = t.show.image?.medium,
+                    FirstAired = t.show.premiered,
+                    Id = t.show.id,
+                    ImdbId = t.show.externals?.imdb,
+                    Network = t.show.network.name,
+                    NetworkId = t.show.network.id.ToString(),
+                    Overview = t.show.summary,
+                    Rating = t.score.ToString(CultureInfo.CurrentUICulture),
+                    Runtime = t.show.runtime.ToString(),
+                    SeriesId = t.show.id,
+                    SeriesName = t.show.name,
+                    
+                    Status = t.show.status,
                 });
             }
 
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 8c3c491f1..309435839 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -69,7 +69,7 @@
             {{/if_eq}}
             {{#if_eq type "tv"}}
             {{#if posterPath}}
-            <img class="img-responsive" width="150" src="http://thetvdb.com/banners/_cache/posters/{{posterPath}}-1.jpg" alt="poster">
+            <img class="img-responsive" width="150" src="{{posterPath}}" alt="poster">
             {{/if}}
             {{/if_eq}}
 

From e74fd2b441c610492ac6c16c883945661bdbb1fb Mon Sep 17 00:00:00 2001
From: Shannon Barrett <sbarrett00@live.com>
Date: Fri, 18 Mar 2016 11:50:00 -0500
Subject: [PATCH 10/30] Should fix #28

---
 PlexRequests.UI/Views/Shared/_Layout.cshtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 1efb8dff3..c69538555 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -6,6 +6,7 @@
 <head>
     <title>Plex Requests</title>
     <!-- Styles -->
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="~/Content/custom.min.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/bootstrap.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/font-awesome.css" type="text/css"/>
@@ -89,4 +90,4 @@
         @RenderBody()
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From b1d7a3187e6f84d94cb3b83665bdd345fa46e64c Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Fri, 18 Mar 2016 17:15:13 +0000
Subject: [PATCH 11/30] Update StatusCheckerTests.cs

---
 PlexRequests.Core.Tests/StatusCheckerTests.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.Core.Tests/StatusCheckerTests.cs b/PlexRequests.Core.Tests/StatusCheckerTests.cs
index e45b4dcab..da0dd44d7 100644
--- a/PlexRequests.Core.Tests/StatusCheckerTests.cs
+++ b/PlexRequests.Core.Tests/StatusCheckerTests.cs
@@ -34,6 +34,7 @@ namespace PlexRequests.Core.Tests
     public class StatusCheckerTests
     {
         [Test]
+        [Ignore("API Limit")]
         public void CheckStatusTest()
         {
             var checker = new StatusChecker();
@@ -42,4 +43,4 @@ public void CheckStatusTest()
             Assert.That(status, Is.Not.Null);
         }
     }
-}
\ No newline at end of file
+}

From f88c7d7583b0135063503c9014d511ddb524d67b Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:10:01 +0000
Subject: [PATCH 12/30] Almost fully integrated TVMaze #21 and also improved
 the fix for #31

---
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api.Models/Tv/TVMazeShow.cs      | 27 ++++++++++++++++
 PlexRequests.Api/TvMazeApi.cs                 | 13 ++++++++
 PlexRequests.Api/TvMazeBase.cs                |  2 +-
 .../Interfaces/IAvailabilityChecker.cs        |  2 +-
 .../PlexAvailabilityChecker.cs                |  7 +++--
 PlexRequests.UI/Modules/RequestsModule.cs     |  2 +-
 PlexRequests.UI/Modules/SearchModule.cs       | 31 +++++++++----------
 PlexRequests.UI/Views/Requests/Index.cshtml   |  2 +-
 9 files changed, 64 insertions(+), 23 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Tv/TVMazeShow.cs

diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index fee0b033c..402cdd22a 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -61,6 +61,7 @@
     <Compile Include="Sonarr\SystemStatus.cs" />
     <Compile Include="Tv\Authentication.cs" />
     <Compile Include="Tv\TvMazeSearch.cs" />
+    <Compile Include="Tv\TVMazeShow.cs" />
     <Compile Include="Tv\TvSearchResult.cs" />
     <Compile Include="Tv\TvShow.cs" />
     <Compile Include="Tv\TvShowImages.cs" />
diff --git a/PlexRequests.Api.Models/Tv/TVMazeShow.cs b/PlexRequests.Api.Models/Tv/TVMazeShow.cs
new file mode 100644
index 000000000..165658602
--- /dev/null
+++ b/PlexRequests.Api.Models/Tv/TVMazeShow.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace PlexRequests.Api.Models.Tv
+{
+    public class TvMazeShow
+    {
+        public int id { get; set; }
+        public string url { get; set; }
+        public string name { get; set; }
+        public string type { get; set; }
+        public string language { get; set; }
+        public List<string> genres { get; set; }
+        public string status { get; set; }
+        public int runtime { get; set; }
+        public string premiered { get; set; }
+        public Schedule schedule { get; set; }
+        public Rating rating { get; set; }
+        public int weight { get; set; }
+        public Network network { get; set; }
+        public object webChannel { get; set; }
+        public Externals externals { get; set; }
+        public Image image { get; set; }
+        public string summary { get; set; }
+        public int updated { get; set; }
+        public Links _links { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/TvMazeApi.cs b/PlexRequests.Api/TvMazeApi.cs
index 6af8c51a2..5f74ea7f2 100644
--- a/PlexRequests.Api/TvMazeApi.cs
+++ b/PlexRequests.Api/TvMazeApi.cs
@@ -56,5 +56,18 @@ public List<TvMazeSearch> Search(string searchTerm)
             return Api.Execute<List<TvMazeSearch>>(request, new Uri(Uri));
         }
 
+        public TvMazeShow ShowLookup(int showId)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+                Resource = "shows/{id}"
+            };
+            request.AddUrlSegment("id", showId.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.Api/TvMazeBase.cs b/PlexRequests.Api/TvMazeBase.cs
index 1526603bc..d4eddefee 100644
--- a/PlexRequests.Api/TvMazeBase.cs
+++ b/PlexRequests.Api/TvMazeBase.cs
@@ -28,6 +28,6 @@ namespace PlexRequests.Api
 {
     public class TvMazeBase
     {
-        public string Uri = "http://api.tvmaze.com";
+        protected string Uri = "http://api.tvmaze.com";
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs b/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs
index 41185118e..02d8e8d57 100644
--- a/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs
+++ b/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs
@@ -29,6 +29,6 @@ namespace PlexRequests.Services.Interfaces
     public interface IAvailabilityChecker
     {
         void CheckAndUpdateAll(long check);
-        bool IsAvailable(string title);
+        bool IsAvailable(string title, string year);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index d450e364d..999c7d697 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -85,9 +85,10 @@ public void CheckAndUpdateAll(long check)
         /// Determines whether the specified search term is available.
         /// </summary>
         /// <param name="title">The search term.</param>
+        /// <param name="year">The year.</param>
         /// <returns></returns>
         /// <exception cref="ApplicationSettingsException">The settings are not configured for Plex or Authentication</exception>
-        public bool IsAvailable(string title)
+        public bool IsAvailable(string title, string year)
         {
             var plexSettings = Plex.GetSettings();
             var authSettings = Auth.GetSettings();
@@ -98,8 +99,8 @@ public bool IsAvailable(string title)
             }
 
             var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-            var result = results.Video?.FirstOrDefault(x => x.Title == title);
-            var directoryTitle = results.Directory?.Title == title;
+            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;
         }
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 6b06f657d..4f534e0b9 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -114,7 +114,7 @@ private Response GetTvShows()
                 Status = tv.Status,
                 ImdbId = tv.ImdbId,
                 Id = tv.Id,
-                PosterPath = tv.ProviderId.ToString(),
+                PosterPath = tv.PosterPath,
                 ReleaseDate = tv.ReleaseDate.Humanize(),
                 RequestedDate = tv.RequestedDate.Humanize(),
                 Approved = tv.Approved,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index e39adca21..c406daf1e 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -126,8 +126,8 @@ private Response SearchTvShow(string searchTerm)
                     FirstAired = t.show.premiered,
                     Id = t.show.id,
                     ImdbId = t.show.externals?.imdb,
-                    Network = t.show.network.name,
-                    NetworkId = t.show.network.id.ToString(),
+                    Network = t.show.network?.name,
+                    NetworkId = t.show.network?.id.ToString(),
                     Overview = t.show.summary,
                     Rating = t.score.ToString(CultureInfo.CurrentUICulture),
                     Runtime = t.show.runtime.ToString(),
@@ -186,12 +186,12 @@ private Response RequestMovie(int movieId)
             Log.Trace("Getting movie info from TheMovieDb");
             Log.Trace(movieInfo.DumpJson);
 
-#if !DEBUG
-            if (CheckIfTitleExistsInPlex(movieInfo.Title))
+//#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
             {
@@ -258,28 +258,27 @@ private Response RequestTvShow(int showId, bool latest)
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "TV Show has already been requested!" });
             }
 
-            var tvApi = new TheTvDbApi();
-            var token = GetTvDbAuthToken(tvApi);
+            var tvApi = new TvMazeApi();
 
-            var showInfo = tvApi.GetInformation(showId, token).data;
+            var showInfo = tvApi.ShowLookup(showId);
 
 //#if !DEBUG
-            if (CheckIfTitleExistsInPlex(showInfo.seriesName))
+            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.seriesName} is already in Plex!" });
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.name} is already in Plex!" });
             }
 //#endif
 
             DateTime firstAir;
-            DateTime.TryParse(showInfo.firstAired, out firstAir);
+            DateTime.TryParse(showInfo.premiered, out firstAir);
 
             var model = new RequestedModel
             {
                 ProviderId = showInfo.id,
                 Type = RequestType.TvShow,
-                Overview = showInfo.overview,
-                PosterPath = "http://image.tmdb.org/t/p/w150/" + showInfo.banner, // This is incorrect
-                Title = showInfo.seriesName,
+                Overview = showInfo.summary,
+                PosterPath = showInfo.image?.medium,
+                Title = showInfo.name,
                 ReleaseDate = firstAir,
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
@@ -320,9 +319,9 @@ private string GetTvDbAuthToken(TheTvDbApi api)
             return Cache.GetOrSet(CacheKeys.TvDbToken, api.Authenticate, 50);
         }
 
-        private bool CheckIfTitleExistsInPlex(string title)
+        private bool CheckIfTitleExistsInPlex(string title, string year)
         {
-            var result = Checker.IsAvailable(title);
+            var result = Checker.IsAvailable(title, year);
             return result;
         }
     }
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 5181b38c0..c33e71b5e 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -62,7 +62,7 @@
                 {{/if_eq}}
                 {{#if_eq type "tv"}}
                 {{#if posterPath}}
-                <img class="img-responsive" width="150" src="http://thetvdb.com/banners/_cache/posters/{{posterPath}}-1.jpg" alt="poster">
+                <img class="img-responsive" width="150" src="{{posterPath}}" alt="poster">
                 {{/if}}
                 {{/if_eq}}
             </div>

From 87baf542c584822b63b1b01a57bb23dd4c673e2d Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:12:44 +0000
Subject: [PATCH 13/30] Fixed tests

---
 .../PlexAvailabilityCheckerTests.cs           | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
index 0a1a157c0..117157927 100644
--- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
+++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
@@ -55,7 +55,7 @@ public void IsAvailableWithEmptySettingsTest()
             var plexMock = new Mock<IPlexApi>();
             Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
 
-            Assert.Throws<ApplicationSettingsException>(() => Checker.IsAvailable("title"), "We should be throwing an exception since we cannot talk to the services.");
+            Assert.Throws<ApplicationSettingsException>(() => Checker.IsAvailable("title", "2013"), "We should be throwing an exception since we cannot talk to the services.");
         }
 
         [Test]
@@ -66,7 +66,7 @@ public void IsAvailableTest()
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch {Video = new List<Video> {new Video {Title = "title" } } };
+            var searchResult = new PlexSearch {Video = new List<Video> {new Video {Title = "title", Year = "2011"} } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -74,7 +74,7 @@ public void IsAvailableTest()
 
             Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
 
-            var result = Checker.IsAvailable("title");
+            var result = Checker.IsAvailable("title", "2011");
 
             Assert.That(result, Is.True);
         }
@@ -87,7 +87,7 @@ public void IsAvailableDirectoryTitleTest()
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Directory = new Directory1 {Title = "title"} };
+            var searchResult = new PlexSearch { Directory = new Directory1 {Title = "title", Year = "2013"} };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -95,7 +95,7 @@ public void IsAvailableDirectoryTitleTest()
 
             Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
 
-            var result = Checker.IsAvailable("title");
+            var result = Checker.IsAvailable("title", "2013");
 
             Assert.That(result, Is.True);
         }
@@ -108,7 +108,7 @@ public void IsNotAvailableTest()
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title" } } };
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title", Year = "2011"} } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -116,7 +116,28 @@ public void IsNotAvailableTest()
 
             Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
 
-            var result = Checker.IsAvailable("title");
+            var result = Checker.IsAvailable("title", "2011");
+
+            Assert.That(result, Is.False);
+        }
+
+        [Test]
+        public void IsYearDoesNotMatchTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "title", Year = "2019" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title", "2011");
 
             Assert.That(result, Is.False);
         }

From 87b497e48e6121764aff5bcd4e52c889920a414d Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:36:21 +0000
Subject: [PATCH 14/30] Removed all the html from the new TVMaze api (for
 overview). Added tests to cover the html removal. updated Readme to remove
 TheTVDB

---
 .../HtmlRemoverTests.cs                       | 56 +++++++++++++++++++
 .../PlexRequests.Helpers.Tests.csproj         |  1 +
 PlexRequests.Helpers/HtmlRemover.cs           | 41 ++++++++++++++
 .../PlexRequests.Helpers.csproj               |  1 +
 PlexRequests.UI/Modules/SearchModule.cs       |  4 +-
 README.md                                     |  2 +-
 6 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 PlexRequests.Helpers.Tests/HtmlRemoverTests.cs
 create mode 100644 PlexRequests.Helpers/HtmlRemover.cs

diff --git a/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs b/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs
new file mode 100644
index 000000000..6a56a20ae
--- /dev/null
+++ b/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs
@@ -0,0 +1,56 @@
+#region Copyright
+
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: HtmlRemoverTests.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 NUnit.Framework;
+
+namespace PlexRequests.Helpers.Tests
+{
+    [TestFixture]
+    public class HtmlRemoverTests
+    {
+        [Test]
+        public void RemoveHtmlBasic()
+        {
+            var html = "this is <b>bold</b> <p>para</p> OK!";
+            var result = html.RemoveHtml();
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result, Is.EqualTo("this is bold para OK!"));
+        }
+
+        [Test]
+        public void RemoveHtmlMoreTags()
+        {
+            // Good 'ol Ali G ;)
+            var html = "<p><strong><em>\"Ali G: Rezurection\"</em></strong> includes every episode of <em>Da Ali G Show</em> with new, original introductions by star, creator/writer Sacha Baron Cohen, along with the BAFTA(R) Award-winning English episodes of <em>Da Ali G Show</em> which have never aired on American television and <em>The Best of Ali G</em>.</p>";
+            var result = html.RemoveHtml();
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result, Is.EqualTo("\"Ali G: Rezurection\" includes every episode of Da Ali G Show with new, original introductions by star, creator/writer Sacha Baron Cohen, along with the BAFTA(R) Award-winning English episodes of Da Ali G Show which have never aired on American television and The Best of Ali G."));
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj b/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj
index 54af6aebe..4bacd1b68 100644
--- a/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj
+++ b/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj
@@ -70,6 +70,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
+    <Compile Include="HtmlRemoverTests.cs" />
     <Compile Include="AssemblyHelperTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UriHelperTests.cs" />
diff --git a/PlexRequests.Helpers/HtmlRemover.cs b/PlexRequests.Helpers/HtmlRemover.cs
new file mode 100644
index 000000000..64d23a6de
--- /dev/null
+++ b/PlexRequests.Helpers/HtmlRemover.cs
@@ -0,0 +1,41 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: HtmlRemover.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.Text.RegularExpressions;
+
+namespace PlexRequests.Helpers
+{
+    public static class HtmlRemover
+    {
+        public static string RemoveHtml(this string value)
+        {
+            var step1 = Regex.Replace(value, @"<[^>]+>|&nbsp;", "").Trim();
+            var step2 = Regex.Replace(step1, @"\s{2,}", " ");
+            return step2;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj
index 04d967f00..35d56a192 100644
--- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj
+++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj
@@ -48,6 +48,7 @@
   <ItemGroup>
     <Compile Include="AssemblyHelper.cs" />
     <Compile Include="Exceptions\ApplicationSettingsException.cs" />
+    <Compile Include="HtmlRemover.cs" />
     <Compile Include="ICacheProvider.cs" />
     <Compile Include="LoggingHelper.cs" />
     <Compile Include="MemoryCacheProvider.cs" />
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index c406daf1e..353a99c73 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -128,7 +128,7 @@ private Response SearchTvShow(string searchTerm)
                     ImdbId = t.show.externals?.imdb,
                     Network = t.show.network?.name,
                     NetworkId = t.show.network?.id.ToString(),
-                    Overview = t.show.summary,
+                    Overview = t.show.summary.RemoveHtml(),
                     Rating = t.score.ToString(CultureInfo.CurrentUICulture),
                     Runtime = t.show.runtime.ToString(),
                     SeriesId = t.show.id,
@@ -276,7 +276,7 @@ private Response RequestTvShow(int showId, bool latest)
             {
                 ProviderId = showInfo.id,
                 Type = RequestType.TvShow,
-                Overview = showInfo.summary,
+                Overview = showInfo.summary.RemoveHtml(),
                 PosterPath = showInfo.image?.medium,
                 Title = showInfo.name,
                 ReleaseDate = firstAir,
diff --git a/README.md b/README.md
index 156a1af34..c1667006d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ I wanted to write a similar application in .Net!
 #Features
 
 * Integration with [TheMovieDB](https://www.themoviedb.org/) for all Movies
-* Integration with [TheTvDb](http://thetvdb.com/) for all TV shows! (soon to be changed [#21](https://github.com/tidusjar/PlexRequests.Net/issues/21))
+* Integration with [TVMaze](www.tvmaze.com) for all TV shows!
 * Secure authentication
 * [Sonarr](https://sonarr.tv/) integration (SickRage/Sickbeard TBD)
 * [CouchPotato](https://couchpota.to/) integration

From 76808adba2c141e7376560116b5e24f9b342f02b Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@exclaimer.com>
Date: Fri, 18 Mar 2016 21:39:05 +0000
Subject: [PATCH 15/30] Fixed #33 we now have SSL options for Sonarr and CP

---
 .../SettingModels/CouchPotatoSettings.cs          |  3 ++-
 PlexRequests.Core/SettingModels/SonarrSettings.cs |  3 ++-
 PlexRequests.UI/Views/Admin/CouchPotato.cshtml    | 15 ++++++++++++++-
 PlexRequests.UI/Views/Admin/Sonarr.cshtml         | 15 ++++++++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
index 9b3d9b385..0c4ccd06f 100644
--- a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
+++ b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs
@@ -36,13 +36,14 @@ public class CouchPotatoSettings : Settings
         public string Ip { get; set; }
         public int Port { get; set; }
         public string ApiKey { get; set; }
+        public bool Ssl { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
-                var formatted = Ip.ReturnUri(Port);
+                var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
         }
diff --git a/PlexRequests.Core/SettingModels/SonarrSettings.cs b/PlexRequests.Core/SettingModels/SonarrSettings.cs
index 4441d48d2..15f486d37 100644
--- a/PlexRequests.Core/SettingModels/SonarrSettings.cs
+++ b/PlexRequests.Core/SettingModels/SonarrSettings.cs
@@ -39,13 +39,14 @@ public class SonarrSettings : Settings
         public string QualityProfile { get; set; }
         public bool SeasonFolders { get; set; }
         public string RootPath { get; set; }
+        public bool Ssl { get; set; }
 
         [JsonIgnore]
         public Uri FullUri
         {
             get
             {
-                var formatted = Ip.ReturnUri(Port);
+                var formatted = Ip.ReturnUri(Port, Ssl);
                 return formatted;
             }
         }
diff --git a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
index 986355e1f..0b967436b 100644
--- a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
+++ b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml
@@ -37,7 +37,20 @@
                     <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">
                 <div>
diff --git a/PlexRequests.UI/Views/Admin/Sonarr.cshtml b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
index e7c6cccf0..83a06c443 100644
--- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml
+++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml
@@ -37,7 +37,20 @@
                     <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">
                 <div>
                     <button type="submit" id="getProfiles" class="btn btn-primary-outline">Get Quality Profiles</button>

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 16/30] 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 @@ class Program
         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 @@ static void Main(string[] args)
                     Console.ReadLine();
                     Environment.Exit(1);
                 }
-                uri = $"http://*:{portResult}";
+                port = portResult;
             }
 
             Log.Trace("Getting product version");
@@ -68,19 +68,21 @@ static void Main(string[] args)
             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 @@ private static void WriteOutVersion()
             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 17/30] 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 @@ private void CreateDefaultSettingsPage()
 
         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 18/30] 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 @@ static void Main(string[] args)
             {
                 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 19/30] 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 @@ private void MigrateDb() // TODO: Remove when no longer needed
             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 @@ static void Main(string[] args)
             {
                 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 20/30] 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 @@ static void Main(string[] args)
             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 21/30] 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 @@ public TvMazeShow ShowLookup(int showId)
             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.Linq;
 
 using Mono.Data.Sqlite;
+using PlexRequests.Api;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Store;
@@ -85,14 +86,38 @@ private void MigrateDb() // TODO: Remove when no longer needed
                 // 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 c28a26413aa01e0a18f66fc394caa035587f1ec6 Mon Sep 17 00:00:00 2001
From: Shannon Barrett <shannon.barrett@digintent.com>
Date: Fri, 18 Mar 2016 19:16:29 -0500
Subject: [PATCH 22/30] Should fix issue #36

---
 PlexRequests.Api.Interfaces/IPlexApi.cs       |  2 +-
 PlexRequests.Api.Models/Plex/PlexAccount.cs   | 22 +++++++++++++++++
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api/PlexApi.cs                   | 19 +++++++++++++++
 PlexRequests.Store/SqlTables.sql              | 21 ++++++++++++++++
 PlexRequests.UI/Modules/UserLoginModule.cs    | 24 ++++++++++++++++---
 6 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Plex/PlexAccount.cs

diff --git a/PlexRequests.Api.Interfaces/IPlexApi.cs b/PlexRequests.Api.Interfaces/IPlexApi.cs
index 473bf3237..e0c8029e6 100644
--- a/PlexRequests.Api.Interfaces/IPlexApi.cs
+++ b/PlexRequests.Api.Interfaces/IPlexApi.cs
@@ -37,6 +37,6 @@ public interface IPlexApi
         PlexFriends GetUsers(string authToken);
         PlexSearch SearchContent(string authToken, string searchTerm, Uri plexFullHost);
         PlexStatus GetStatus(string authToken, Uri uri);
-
+        PlexAccount GetAccount(string authToken);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/Plex/PlexAccount.cs b/PlexRequests.Api.Models/Plex/PlexAccount.cs
new file mode 100644
index 000000000..be1fbef24
--- /dev/null
+++ b/PlexRequests.Api.Models/Plex/PlexAccount.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace PlexRequests.Api.Models.Plex
+{
+    [XmlRoot(ElementName = "user")]
+    public class PlexAccount
+    {
+        [XmlAttribute(AttributeName = "id")]
+        public string Id { get; set; }
+        [XmlAttribute(AttributeName = "username")]
+        public string Username { get; set; }
+        [XmlAttribute(AttributeName = "email")]
+        public string Email { get; set; }
+        [XmlAttribute(AttributeName = "authenticationToken")]
+        public string AuthToken { get; set; }
+    }
+}
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 402cdd22a..8a4d30e62 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -49,6 +49,7 @@
     <Compile Include="Movie\CouchPotatoStatus.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
+    <Compile Include="Plex\PlexAccount.cs" />
     <Compile Include="Plex\PlexAuthentication.cs" />
     <Compile Include="Plex\PlexError.cs" />
     <Compile Include="Plex\PlexFriends.cs" />
diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs
index 2308910b7..0c6e2a373 100644
--- a/PlexRequests.Api/PlexApi.cs
+++ b/PlexRequests.Api/PlexApi.cs
@@ -134,6 +134,25 @@ public PlexStatus GetStatus(string authToken, Uri uri)
 
             return users;
         }
+
+        public PlexAccount GetAccount(string authToken)
+        {
+            var request = new RestRequest
+            {
+                Method = Method.GET,
+            };
+
+            request.AddHeader("X-Plex-Client-Identifier", "Test213");
+            request.AddHeader("X-Plex-Product", "Request Plex");
+            request.AddHeader("X-Plex-Version", Version);
+            request.AddHeader("X-Plex-Token", authToken);
+            request.AddHeader("Content-Type", "application/xml");
+
+            var api = new ApiRequest();
+            var account = api.ExecuteXml<PlexAccount>(request, new Uri("https://plex.tv/users/account"));
+
+            return account;
+        }
     }
 }
 
diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index d696da6b4..a6e696fba 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -35,4 +35,25 @@ CREATE TABLE IF NOT EXISTS Log
     Message								varchar(100) NOT NULL,
     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/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index f4901061e..224f86d5e 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -24,6 +24,8 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+
+using System.Collections.Generic;
 using System.Linq;
 
 using Nancy;
@@ -98,9 +100,17 @@ private Response LoginUser()
                 var signedIn = (PlexAuthentication)Api.SignIn(username, password);
                 if (signedIn.user?.authentication_token != null)
                 {
-                    Log.Debug("Correct credentials, checking if the user is in the friends list");
-                    authenticated = CheckIfUserIsInPlexFriends(username, settings.PlexAuthToken);
-                    Log.Debug("Friends list result = {0}", authenticated);
+                    Log.Debug("Correct credentials, checking if the user is account owner or in the friends list");
+                    if (CheckIfUserIsOwner(settings.PlexAuthToken, username))
+                    {
+                        Log.Debug("User is the account owner");
+                        authenticated = true;
+                    }
+                    else
+                    {
+                        authenticated = CheckIfUserIsInPlexFriends(username, settings.PlexAuthToken);
+                        Log.Debug("Friends list result = {0}", authenticated);
+                    }
                 }
             }
             else if(settings.UserAuthentication) // Check against the users in Plex
@@ -127,6 +137,8 @@ private Response LoginUser()
                 : new JsonResponseModel { Result = false, Message = "Incorrect User or Password"});
         }
 
+        
+
         private Response Logout()
         {
             Log.Debug("Logging Out");
@@ -137,6 +149,12 @@ private Response Logout()
             return Context.GetRedirect("~/userlogin");
         }
 
+        private bool CheckIfUserIsOwner(string authToken, string userName)
+        {
+            var userAccount = Api.GetAccount(authToken);
+            return userAccount.Username == userName;
+        }
+
         private bool CheckIfUserIsInPlexFriends(string username, string authToken)
         {
             var users = Api.GetUsers(authToken);

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 23/30] 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 @@ public CouchPotatoApi()
         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 @@ public CouchPotatoStatus GetStatus(Uri url, string apiKey)
 
             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 @@ public class CouchPotatoSettings : Settings
         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 @@ public class AdminModule : NancyModule
         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 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             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 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             PlexApi = plexApi;
             PushbulletService = pbSettings;
             PushbulletApi = pbApi;
+            CpApi = cpApi;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -107,6 +110,7 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             Post["/sonarr"] = _ => SaveSonarr();
 
             Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
+            Post["/cpprofiles"] = _ => GetCpProfiles();
 
             Get["/emailnotification"] = _ => EmailNotifications();
             Post["/emailnotification"] = _ => SaveEmailNotifications();
@@ -354,5 +358,13 @@ private Response SavePushbulletNotifications()
                 ? 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 @@ private Response RequestMovieAndUpdateStatus(RequestedModel request)
             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 @@ private Response ApproveAll()
         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 @@ private Response RequestMovie(int movieId)
             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 24/30] 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 @@ public class AdminModuleTests
         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 @@ public void Setup()
             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 @@ public void Setup()
                 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 25/30] 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 @@ public class AdminModuleTests
         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 @@ public void Setup()
             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 @@ public void Setup()
                 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 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na
             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 @@ public class AdminModule : NancyModule
         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 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             ISettingsService<AuthenticationSettings> auth,
             ISettingsService<PlexSettings> plex,
             ISettingsService<SonarrSettings> sonarr,
+            ISettingsService<SickRageSettings> sickrage,
             ISonarrApi sonarrApi,
             ISettingsService<EmailNotificationSettings> email,
             IPlexApi plexApi,
@@ -85,6 +87,7 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             PushbulletService = pbSettings;
             PushbulletApi = pbApi;
             CpApi = cpApi;
+            SickRageService = sickrage;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -109,6 +112,9 @@ public AdminModule(ISettingsService<PlexRequestSettings> rpService,
             Get["/sonarr"] = _ => Sonarr();
             Post["/sonarr"] = _ => SaveSonarr();
 
+            Get["/sickrage"] = _ => Sickrage();
+            Post["/sickrage"] = _ => SaveSickrage();
+
             Post["/sonarrprofiles"] = _ => GetSonarrQualityProfiles();
             Post["/cpprofiles"] = _ => GetCpProfiles();
 
@@ -283,7 +289,11 @@ private Response SaveSonarr()
             {
                 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 @@ private Response SaveSonarr()
                 : 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 26/30] 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 @@ public static class HtmlRemover
     {
         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 @@ public void IsNotAvailableTest()
             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 @@ public bool IsAvailable(string title, string year)
             {
                 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 @@ public IEnumerable<RequestBlobs> GetAll()
 
         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 @@ public class Bootstrapper : DefaultNancyBootstrapper
         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 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na
             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 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline
             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 @@ public class ApplicationTesterModule : BaseModule
     {
 
         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 @@ public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPle
             SonarrApi = sonarrApi;
             PlexApi = plexApi;
             AuthSettings = authSettings;
+            SickRageApi = srApi;
 
             Post["/cp"] = _ => CouchPotatoTest();
             Post["/sonarr"] = _ => SonarrTest();
             Post["/plex"] = _ => PlexTest();
+            Post["/sickrage"] = _ => SickRageTest();
 
         }
         
@@ -62,6 +64,7 @@ public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPle
         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 @@ private Response SonarrTest()
                : 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 @@ private Response PlexTest()
                : 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 @@ private Response PlexTest()
                 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.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 @@ public class ApprovalModule : BaseModule
     {
 
         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 @@ public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSetti
             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 @@ public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSetti
 
         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 @@ public ApprovalModule(IRequestService service, ISettingsService<CouchPotatoSetti
         /// <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 @@ private Response Approve(int requestId)
 
         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 @@ private Response ApproveAll()
                     }
                     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 @@ private Response ApproveAll()
 
         }
 
-
         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.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 @@ public class SearchModule : BaseModule
         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 @@ public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings>
             SonarrApi = sonarrApi;
             SonarrService = sonarrSettings;
             CouchPotatoApi = cpApi;
+            SickRageService = sickRageService;
+            SickrageApi = srApi;
 
             Get["/"] = parameters => RequestLoad();
 
@@ -79,11 +82,13 @@ public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings>
         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 @@ private Response SearchTvShow(string searchTerm)
                     // 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 @@ private Response SearchTvShow(string searchTerm)
                     Runtime = t.show.runtime.ToString(),
                     SeriesId = t.show.id,
                     SeriesName = t.show.name,
-                    
+
                     Status = t.show.status,
                 });
             }
@@ -186,12 +191,12 @@ private Response RequestMovie(int movieId)
             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 @@ private Response RequestMovie(int movieId)
             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 @@ private Response RequestTvShow(int showId, bool latest)
 
             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 @@ private Response RequestTvShow(int showId, bool latest)
             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 @@ private Response RequestTvShow(int showId, bool latest)
 
             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 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 27/30] 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 @@ public SickRageTvAdd AddSeries(int tvdbId, bool latest, string quality, string a
             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 @@ private void MigrateDb() // TODO: Remove when no longer needed
                 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 28/30] 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 @@ private void ResetCache()
 
         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 29/30] 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 30/30] 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 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 @@ public void LoginWithoutAuthentication()
                 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 @@ public void LoginWithUsernameSuccessfully()
 
             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 @@ public void LoginWithUsernameUnSuccessfully()
 
             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 @@ public void LoginWithUsernameAndPasswordSuccessfully()
             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 @@ public void Logout()
                 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 @@ public void Logout()
             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 @@ private Response LoginUser()
                 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 @@ private Response LoginUser()
             {
                 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 @@ private Response Logout()
         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 @@ private bool CheckIfUserIsInPlexFriends(string username, string authToken)
             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)