diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-16 10:39:33 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-16 10:39:33 -0400 |
| commit | 62621bf97bb9509fccc4c8fdc73b393febf48034 (patch) | |
| tree | 3575c3c79ac72a99c2211c0d54074c00770c392a | |
| parent | e9f0ff15a3fe83a3fb24f8ccc5800ff77659bf63 (diff) | |
fixes #591 - Support new fanart movie posters
| -rw-r--r-- | MediaBrowser.Providers/Movies/FanArtMovieProvider.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.Providers/TV/FanArtTVProvider.cs | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs index 1e1b6830a..dff2a63c5 100644 --- a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs +++ b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs @@ -141,12 +141,14 @@ namespace MediaBrowser.Providers.Movies !ConfigurationManager.Configuration.DownloadMovieImages.Disc && !ConfigurationManager.Configuration.DownloadMovieImages.Backdrops && !ConfigurationManager.Configuration.DownloadMovieImages.Banner && - !ConfigurationManager.Configuration.DownloadMovieImages.Thumb) + !ConfigurationManager.Configuration.DownloadMovieImages.Thumb && + !ConfigurationManager.Configuration.DownloadMovieImages.Primary) { return false; } - if (item.HasImage(ImageType.Art) && + if (item.HasImage(ImageType.Primary) && + item.HasImage(ImageType.Art) && item.HasImage(ImageType.Logo) && item.HasImage(ImageType.Disc) && item.HasImage(ImageType.Banner) && @@ -298,6 +300,20 @@ namespace MediaBrowser.Providers.Movies string path; + if (ConfigurationManager.Configuration.DownloadMovieImages.Disc && !item.HasImage(ImageType.Disc)) + { + var node = doc.SelectSingleNode("//fanart/movie/movieposters/movieposter[@lang = \"" + language + "\"]/@url") ?? + doc.SelectSingleNode("//fanart/movie/movieposters/movieposter/@url"); + path = node != null ? node.Value : null; + if (!string.IsNullOrEmpty(path)) + { + await _providerManager.SaveImage(item, path, FanArtResourcePool, ImageType.Disc, null, cancellationToken) + .ConfigureAwait(false); + } + } + + cancellationToken.ThrowIfCancellationRequested(); + if (ConfigurationManager.Configuration.DownloadMovieImages.Logo && !item.HasImage(ImageType.Logo)) { var node = diff --git a/MediaBrowser.Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Providers/TV/FanArtTVProvider.cs index 94296fd36..541226609 100644 --- a/MediaBrowser.Providers/TV/FanArtTVProvider.cs +++ b/MediaBrowser.Providers/TV/FanArtTVProvider.cs @@ -126,6 +126,7 @@ namespace MediaBrowser.Providers.TV catch (DirectoryNotFoundException) { // Don't blow up + return true; } } |