diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-15 00:05:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-05-15 00:05:58 -0400 |
| commit | 531a165caf334f7b5f2a343b9144b8736d968d00 (patch) | |
| tree | be153d01e90a5d4caa4e1d48e3a6bcc7c3aa064c /MediaBrowser.Controller/Providers | |
| parent | e6b57e264cf6b4e92d873f24eaf1664bcf007ecc (diff) | |
| parent | 94af5c36df79487e62e9d81a986e24d281994b83 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Providers')
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs | 14 |
2 files changed, 19 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs index 2f1057033d..0b76afbc33 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs @@ -151,6 +151,13 @@ namespace MediaBrowser.Controller.Providers.Movies { return true; } + + // Don't refresh if we already have both poster and backdrop and we're not refreshing images + if (item.LocationType == LocationType.FileSystem && !ConfigurationManager.Configuration.RefreshItemImages + && item.HasLocalImage("folder") && item.HasLocalImage("backdrop")) + { + return false; + } return base.NeedsRefreshInternal(item, providerInfo); } diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs index e2013fb876..79ea75f8ec 100644 --- a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs @@ -71,6 +71,14 @@ namespace MediaBrowser.Controller.Providers.TV } } + protected override bool RefreshOnFileSystemStampChange + { + get + { + return ConfigurationManager.Configuration.SaveLocalMeta; + } + } + /// <summary> /// Needses the refresh internal. /// </summary> @@ -168,7 +176,8 @@ namespace MediaBrowser.Controller.Providers.TV { if (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("folder")) { - var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "']"); + var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "'][Language='" + ConfigurationManager.Configuration.PreferredMetadataLanguage + "']") ?? + images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "'][Language='en']"); if (n != null) { n = n.SelectSingleNode("./BannerPath"); @@ -187,7 +196,8 @@ namespace MediaBrowser.Controller.Providers.TV if (ConfigurationManager.Configuration.DownloadSeasonImages.Banner && (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("banner"))) { - var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "']"); + var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "'][Language='" + ConfigurationManager.Configuration.PreferredMetadataLanguage + "']") ?? + images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "'][Language='en']"); if (n != null) { n = n.SelectSingleNode("./BannerPath"); |