tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-27 22:56:45 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Fixed: Breaking trakt API changes (Posters for add series are placeholders for now)"

Browse Source 
This reverts commit 66ca925b0d.
This commit is contained in:
Mark McDowall
2014-12-30 09:03:48 -08:00
parent 66ca925b0d
commit 0f56bfac2f
5 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/MetadataSource/Trakt/Ratings.cs
+1 -1
View File
@@ -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; }
src/NzbDrone.Core/MetadataSource/TraktProxy.cs
+11 -46
View File
@@ -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<Tv.Actor> GetActors(IEnumerable<Trakt.Actor> traktActors)
private static IEnumerable<Tv.Actor> GetActors(IEnumerable<Trakt.Actor> 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<MediaCover.MediaCover> GetImages(Images traktImages)
{
var images = new List<MediaCover.MediaCover>();
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;
}
}
}