From 0f56bfac2f6ff3947eb51f7cfb06baf9ba86cb67 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 30 Dec 2014 09:03:48 -0800 Subject: [PATCH] Revert "Fixed: Breaking trakt API changes (Posters for add series are placeholders for now)" This reverts commit 66ca925b0d4fcd5f7085795b757d8f63b0c1e9a7. --- .../MetadataSourceTests/TraktProxyFixture.cs | 22 +++---- .../MetadataSource/Trakt/Ratings.cs | 2 +- .../MetadataSource/TraktProxy.cs | 57 ++++--------------- src/NzbDrone.Core/Tv/Ratings.cs | 2 +- src/UI/AddSeries/EmptyViewTemplate.hbs | 2 +- 5 files changed, 25 insertions(+), 60 deletions(-) diff --git a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs index 87c40fa08..2e5710e46 100644 --- a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs +++ b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs @@ -27,9 +27,9 @@ namespace NzbDrone.Core.Test.MetadataSourceTests [TestCase("South Park", "South Park")] [TestCase("Franklin & Bash", "Franklin & Bash")] [TestCase("Mr. D", "Mr. D")] - [TestCase("Rob & Big", "Rob & Big")] - //[TestCase("M*A*S*H", "M*A*S*H")] - //[TestCase("imdb:tt0436992", "Doctor Who (2005)")] + [TestCase("Rob & Big", "Rob and Big")] + [TestCase("M*A*S*H", "M*A*S*H")] + [TestCase("imdb:tt0436992", "Doctor Who (2005)")] [TestCase("tvdb:78804", "Doctor Who (2005)")] public void successful_search(string title, string expected) { @@ -48,7 +48,7 @@ namespace NzbDrone.Core.Test.MetadataSourceTests } [TestCase(75978, "Family Guy")] - [TestCase(83462, "Castle")] + [TestCase(83462, "Castle (2009)")] [TestCase(266189, "The Blacklist")] public void should_be_able_to_get_series_detail(Int32 tvdbId, String title) { @@ -68,13 +68,13 @@ namespace NzbDrone.Core.Test.MetadataSourceTests ExceptionVerification.ExpectedWarns(1); } -// [Test] -// public void should_not_have_period_at_start_of_title_slug() -// { -// var details = Subject.GetSeriesInfo(79099); -// -// details.Item1.TitleSlug.Should().Be("dothack"); -// } + [Test] + public void should_not_have_period_at_start_of_title_slug() + { + var details = Subject.GetSeriesInfo(79099); + + details.Item1.TitleSlug.Should().Be("dothack"); + } private void ValidateSeries(Series series) { diff --git a/src/NzbDrone.Core/MetadataSource/Trakt/Ratings.cs b/src/NzbDrone.Core/MetadataSource/Trakt/Ratings.cs index 24e86ff44..6302071eb 100644 --- a/src/NzbDrone.Core/MetadataSource/Trakt/Ratings.cs +++ b/src/NzbDrone.Core/MetadataSource/Trakt/Ratings.cs @@ -4,7 +4,7 @@ namespace NzbDrone.Core.MetadataSource.Trakt { public class Ratings { - public Decimal percentage { get; set; } + public Int32 percentage { get; set; } public Int32 votes { get; set; } public Int32 loved { get; set; } public Int32 hated { get; set; } diff --git a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs index a3b667aaf..aea2e0914 100644 --- a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs @@ -146,7 +146,10 @@ namespace NzbDrone.Core.MetadataSource series.Certification = show.certification; series.Actors = GetActors(show.people); series.Seasons = GetSeasons(show); - series.Images = GetImages(show.images); + + series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.images.banner }); + series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = GetPosterThumbnailUrl(show.images.poster) }); + series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.images.fanart }); return series; } @@ -175,7 +178,7 @@ namespace NzbDrone.Core.MetadataSource episode.Ratings = GetRatings(traktEpisode.ratings); //Don't include series fanart images as episode screenshot - if (traktEpisode.images != null && traktEpisode.images.screen != null && !traktEpisode.images.screen.Contains("-940.")) + if (!traktEpisode.images.screen.Contains("-940.")) { episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.images.screen)); } @@ -185,12 +188,11 @@ namespace NzbDrone.Core.MetadataSource private static string GetPosterThumbnailUrl(string posterUrl) { - if (posterUrl.Contains("poster-small.jpg") || posterUrl.Contains("poster-dark.jpg")) - { - return posterUrl; - } + if (posterUrl.Contains("poster-small.jpg") || posterUrl.Contains("poster-dark.jpg")) return posterUrl; - return posterUrl.Replace("/original/", "/thumb/"); + var extension = Path.GetExtension(posterUrl); + var withoutExtension = posterUrl.Substring(0, posterUrl.Length - extension.Length); + return withoutExtension + "-300" + extension; } private static SeriesStatusType GetSeriesStatus(string status, bool? ended) @@ -258,11 +260,6 @@ namespace NzbDrone.Core.MetadataSource private static Tv.Ratings GetRatings(Trakt.Ratings ratings) { - if (ratings == null) - { - return new Tv.Ratings(); - } - return new Tv.Ratings { Percentage = ratings.percentage, @@ -282,14 +279,9 @@ namespace NzbDrone.Core.MetadataSource return GetActors(people.actors).ToList(); } - private static IEnumerable GetActors(IEnumerable traktActors) + private static IEnumerable GetActors(IEnumerable trakcActors) { - if (traktActors == null) - { - yield break; - } - - foreach (var traktActor in traktActors) + foreach (var traktActor in trakcActors) { var actor = new Tv.Actor { @@ -324,32 +316,5 @@ namespace NzbDrone.Core.MetadataSource return seasons; } - - private static List GetImages(Images traktImages) - { - var images = new List(); - - if (traktImages == null) - { - return images; - } - - if (traktImages.banner != null) - { - images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = traktImages.banner }); - } - - if (traktImages.poster != null) - { - images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = GetPosterThumbnailUrl(traktImages.poster) }); - } - - if (traktImages.fanart != null) - { - images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = traktImages.fanart }); - } - - return images; - } } } diff --git a/src/NzbDrone.Core/Tv/Ratings.cs b/src/NzbDrone.Core/Tv/Ratings.cs index d911c4b52..ffdabf95e 100644 --- a/src/NzbDrone.Core/Tv/Ratings.cs +++ b/src/NzbDrone.Core/Tv/Ratings.cs @@ -5,7 +5,7 @@ namespace NzbDrone.Core.Tv { public class Ratings : IEmbeddedDocument { - public Decimal Percentage { get; set; } + public Int32 Percentage { get; set; } public Int32 Votes { get; set; } public Int32 Loved { get; set; } public Int32 Hated { get; set; } diff --git a/src/UI/AddSeries/EmptyViewTemplate.hbs b/src/UI/AddSeries/EmptyViewTemplate.hbs index fd7724fa3..a56208736 100644 --- a/src/UI/AddSeries/EmptyViewTemplate.hbs +++ b/src/UI/AddSeries/EmptyViewTemplate.hbs @@ -1,3 +1,3 @@ 
- You can also search by tvdbid using the tvdb: prefix. + You can also search by tvdbid and imdbid using the tvdb: and imdb: prefixes.