diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-03-26 01:46:05 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-03-26 01:46:05 -0400 |
| commit | f53698d8fa9a3494fe5a6e74134b9a9614905d5f (patch) | |
| tree | 660b6cd539a9778248e26a3fcbaa265703277aa3 | |
| parent | b398805a817b501da09797ae9d67788ae4dfbd12 (diff) | |
| parent | f04627e1e88fc8a7a5361a054daec102436b83cf (diff) | |
Merge pull request #1597 from MediaBrowser/beta
Beta
| -rw-r--r-- | MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs index 7af85ecc9..cbbfe61ac 100644 --- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs +++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs @@ -88,19 +88,22 @@ namespace MediaBrowser.Providers.TV var seriesDataPath = await TvdbSeriesProvider.Current.EnsureSeriesInfo(seriesProviderIds, series.GetPreferredMetadataLanguage(), cancellationToken).ConfigureAwait(false); - var path = Path.Combine(seriesDataPath, "banners.xml"); - - try - { - return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken); - } - catch (FileNotFoundException) + if (!string.IsNullOrWhiteSpace(seriesDataPath)) { - // No tvdb data yet. Don't blow up - } - catch (DirectoryNotFoundException) - { - // No tvdb data yet. Don't blow up + var path = Path.Combine(seriesDataPath, "banners.xml"); + + try + { + return GetImages(path, item.GetPreferredMetadataLanguage(), seasonNumber, cancellationToken); + } + catch (FileNotFoundException) + { + // No tvdb data yet. Don't blow up + } + catch (DirectoryNotFoundException) + { + // No tvdb data yet. Don't blow up + } } } diff --git a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs index d5b5428c0..4dd2e1759 100644 --- a/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs +++ b/MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers } if (!string.IsNullOrWhiteSpace(tvdbId)) { - item.SetProviderId(MetadataProviders.Tvcom, tvdbId); + item.SetProviderId(MetadataProviders.Tvdb, tvdbId); } break; } |