From 175ae3e9965a17c828a160873cebf34fe7dc9c98 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 13 Nov 2014 22:10:56 -0800 Subject: [PATCH] Fixed: Series fanart images won't be stored as episode screenshots --- .../MetadataSourceTests/TraktProxyFixture.cs | 5 +++++ src/NzbDrone.Core/MetadataSource/TraktProxy.cs | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs index 129362d5aa..2e5710e46e 100644 --- a/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs +++ b/src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs @@ -4,6 +4,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Common.Http; +using NzbDrone.Core.MediaCover; using NzbDrone.Core.MetadataSource; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -126,6 +127,10 @@ private void ValidateEpisode(Episode episode) { episode.AirDateUtc.Value.Kind.Should().Be(DateTimeKind.Utc); } + + episode.Images.Any(i => i.CoverType == MediaCoverTypes.Screenshot && i.Url.Contains("-940.")) + .Should() + .BeFalse(); } } } diff --git a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs index 24e92958d5..1070a80023 100644 --- a/src/NzbDrone.Core/MetadataSource/TraktProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/TraktProxy.cs @@ -32,7 +32,6 @@ public TraktProxy(Logger logger, IHttpClient httpClient) private IEnumerable SearchTrakt(string title) { - HttpRequest request; var lowerTitle = title.ToLowerInvariant(); @@ -77,7 +76,6 @@ private IEnumerable SearchTrakt(string title) return _httpClient.Get>(request).Resource; } - public List SearchForNewSeries(string title) { try @@ -179,8 +177,12 @@ private static Episode MapEpisode(Trakt.Episode traktEpisode) episode.AirDateUtc = FromIso(traktEpisode.first_aired_iso); episode.Ratings = GetRatings(traktEpisode.ratings); - episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.images.screen)); - + //Don't include series fanart images as episode screenshot + if (!traktEpisode.images.screen.Contains("-940.")) + { + episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.images.screen)); + } + return episode; } @@ -314,7 +316,5 @@ private static Tv.Ratings GetRatings(Trakt.Ratings ratings) return seasons; } - - } -} \ No newline at end of file +}