Merge pull request #1 from tidusjar/dev

Dev

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" />

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; }
+    }
+}

PlexRequests.Api/TvMazeApi.cs

@@ -56,5 +56,18 @@ namespace PlexRequests.Api
             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));
+        }
+
     }
 }

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";
     }
 }

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 @@ namespace PlexRequests.Core.Tests
             Assert.That(status, Is.Not.Null);
         }
     }
-}
+}

PlexRequests.Core/SettingModels/CouchPotatoSettings.cs

@@ -36,13 +36,14 @@ namespace PlexRequests.Core.SettingModels
         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;
             }
         }

PlexRequests.Core/SettingModels/SonarrSettings.cs

@@ -39,13 +39,14 @@ namespace PlexRequests.Core.SettingModels
         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;
             }
         }

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."));
+        }
+    }
+}

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" />

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;
+        }
+    }
+}

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" />

PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs

@@ -55,7 +55,7 @@ namespace PlexRequests.Services.Tests
             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 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch {Video = new List<Video> {new Video {Title = "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 @@ namespace PlexRequests.Services.Tests
 
             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 @@ namespace PlexRequests.Services.Tests
             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 @@ namespace PlexRequests.Services.Tests
 
             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 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title" } } };
+            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 @@ namespace PlexRequests.Services.Tests
 
             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);
         }

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);
     }
 }

PlexRequests.Services/PlexAvailabilityChecker.cs

@@ -85,9 +85,10 @@ namespace PlexRequests.Services
         /// 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 @@ namespace PlexRequests.Services
             }
 
             var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-            var result = results.Video?.FirstOrDefault(x => x.Title == title);
+            var result = results.Video?.FirstOrDefault(x => x.Title == title && x.Year == year);
-            var directoryTitle = results.Directory?.Title == title;
+            var directoryTitle = results.Directory?.Title == title && results.Directory?.Year == year;
             return result?.Title != null || directoryTitle;
         }
 

PlexRequests.UI/Modules/RequestsModule.cs

@@ -114,7 +114,7 @@ namespace PlexRequests.UI.Modules
                 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,

PlexRequests.UI/Modules/SearchModule.cs

@@ -126,9 +126,9 @@ namespace PlexRequests.UI.Modules
                     FirstAired = t.show.premiered,
                     Id = t.show.id,
                     ImdbId = t.show.externals?.imdb,
-                    Network = t.show.network.name,
+                    Network = t.show.network?.name,
-                    NetworkId = t.show.network.id.ToString(),
+                    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,
@@ -186,12 +186,12 @@ namespace PlexRequests.UI.Modules
             Log.Trace("Getting movie info from TheMovieDb");
             Log.Trace(movieInfo.DumpJson);
 
-#if !DEBUG
+//#if !DEBUG
-            if (CheckIfTitleExistsInPlex(movieInfo.Title))
+            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 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "TV Show has already been requested!" });
             }
 
-            var tvApi = new TheTvDbApi();
+            var tvApi = new TvMazeApi();
-            var token = GetTvDbAuthToken(tvApi);
 
-            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,
+                Overview = showInfo.summary.RemoveHtml(),
-                PosterPath = "http://image.tmdb.org/t/p/w150/" + showInfo.banner, // This is incorrect
+                PosterPath = showInfo.image?.medium,
-                Title = showInfo.seriesName,
+                Title = showInfo.name,
                 ReleaseDate = firstAir,
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
@@ -320,9 +319,9 @@ namespace PlexRequests.UI.Modules
             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;
         }
     }

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>

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>

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>

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