Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Series fanart images won't be stored as episode screenshots

This commit is contained in:
Mark McDowall 2014-11-13 22:10:56 -08:00
parent d765d1eaef
commit 175ae3e996
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/NzbDrone.Core.Test/MetadataSourceTests/TraktProxyFixture.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using FluentAssertions; using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Common.Http; using NzbDrone.Common.Http;
using NzbDrone.Core.MediaCover;
using NzbDrone.Core.MetadataSource; using NzbDrone.Core.MetadataSource;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv; using NzbDrone.Core.Tv;
@ -126,6 +127,10 @@ namespace NzbDrone.Core.Test.MetadataSourceTests
{ {
episode.AirDateUtc.Value.Kind.Should().Be(DateTimeKind.Utc); episode.AirDateUtc.Value.Kind.Should().Be(DateTimeKind.Utc);
} }
episode.Images.Any(i => i.CoverType == MediaCoverTypes.Screenshot && i.Url.Contains("-940."))
.Should()
.BeFalse();
} }
} }
} }

14
src/NzbDrone.Core/MetadataSource/TraktProxy.cs
View File

@ -32,7 +32,6 @@ namespace NzbDrone.Core.MetadataSource
private IEnumerable<Show> SearchTrakt(string title) private IEnumerable<Show> SearchTrakt(string title)
{ {
HttpRequest request; HttpRequest request;
var lowerTitle = title.ToLowerInvariant(); var lowerTitle = title.ToLowerInvariant();
@ -77,7 +76,6 @@ namespace NzbDrone.Core.MetadataSource
return _httpClient.Get<List<Show>>(request).Resource; return _httpClient.Get<List<Show>>(request).Resource;
} }
public List<Series> SearchForNewSeries(string title) public List<Series> SearchForNewSeries(string title)
{ {
try try
@ -179,8 +177,12 @@ namespace NzbDrone.Core.MetadataSource
episode.AirDateUtc = FromIso(traktEpisode.first_aired_iso); episode.AirDateUtc = FromIso(traktEpisode.first_aired_iso);
episode.Ratings = GetRatings(traktEpisode.ratings); 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; return episode;
} }
@ -314,7 +316,5 @@ namespace NzbDrone.Core.MetadataSource
return seasons; return seasons;
} }
} }
} }