mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Don't store incomplete image URLs (image doesn't exist)

This commit is contained in:
Mark McDowall 2014-12-31 15:22:22 -08:00
parent d4331e9470
commit f4169e165c
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/NzbDrone.Core/MetadataSource/TvDbProxy.cs
View File

@ -142,9 +142,20 @@ namespace NzbDrone.Core.MetadataSource
series.Actors = new List<Tv.Actor>();
series.Seasons = GetSeasons(show);
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.Banner.ToString() });
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = show.Poster.ToString() });
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.Fanart.ToString() });
if (show.Banner != null)
{
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.Banner.ToString() });
}
if (show.Poster != null)
{
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = show.Poster.ToString() });
}
if (show.Fanart != null)
{
series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.Fanart.ToString() });
}
return series;
}
@ -166,7 +177,10 @@ namespace NzbDrone.Core.MetadataSource
episode.Ratings = GetRatings(traktEpisode.RatingCount, traktEpisode.Rating);
//Don't include series fanart images as episode screenshot
episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.EpisodeImage.ToString()));
if (traktEpisode.EpisodeImage != null)
{
episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.EpisodeImage.ToString()));
}
return episode;
}

6
src/TVDBSharp/Models/Builder.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Xml.Linq;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using TVDBSharp.Models.DAO;
using TVDBSharp.Models.Enums;
@ -82,6 +83,11 @@ namespace TVDBSharp.Models
private static Uri GetBannerUri(string uriSuffix)
{
if (uriSuffix.IsNullOrWhiteSpace())
{
return null;
}
return new Uri(UriPrefix + uriSuffix, UriKind.Absolute);
}