lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1596 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-03-26 01:45:50 -04:00
commit f04627e1e8
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
View File

@ -88,19 +88,22 @@ namespace MediaBrowser.Providers.TV
var seriesDataPath = await TvdbSeriesProvider.Current.EnsureSeriesInfo(seriesProviderIds, series.GetPreferredMetadataLanguage(), cancellationToken).ConfigureAwait(false); var seriesDataPath = await TvdbSeriesProvider.Current.EnsureSeriesInfo(seriesProviderIds, series.GetPreferredMetadataLanguage(), cancellationToken).ConfigureAwait(false);
var path = Path.Combine(seriesDataPath, "banners.xml"); if (!string.IsNullOrWhiteSpace(seriesDataPath))
{
var path = Path.Combine(seriesDataPath, "banners.xml");
try try
{ {
return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken); return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken);
} }
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
// No tvdb data yet. Don't blow up // No tvdb data yet. Don't blow up
} }
catch (DirectoryNotFoundException) catch (DirectoryNotFoundException)
{ {
// No tvdb data yet. Don't blow up // No tvdb data yet. Don't blow up
}
} }
} }

2
MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
View File

@ -46,7 +46,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
if (!string.IsNullOrWhiteSpace(tvdbId)) if (!string.IsNullOrWhiteSpace(tvdbId))
{ {
item.SetProviderId(MetadataProviders.Tvcom, tvdbId); item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
} }
break; break;
} }