Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs

@@ -152,6 +152,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);
         }
 

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");

MediaBrowser.Model/Entities/DisplayPreferences.cs

@@ -22,6 +22,7 @@ namespace MediaBrowser.Model.Entities
             RememberIndexing = false;
             PrimaryImageHeight = 250;
             PrimaryImageWidth = 250;
+            ShowBackdrop = true;
             CustomPrefs = new Dictionary<string, string>();
         }
 
@@ -71,6 +72,11 @@ namespace MediaBrowser.Model.Entities
         /// <value>The scroll direction.</value>
         public ScrollDirection ScrollDirection { get; set; }
         /// <summary>
+        /// Gets or sets a value indicating whether to show backdrops on this item.
+        /// </summary>
+        /// <value><c>true</c> if showing backdrops; otherwise, <c>false</c>.</value>
+        public bool ShowBackdrop { get; set; }
+        /// <summary>
         /// Gets or sets a value indicating whether [remember sorting].
         /// </summary>
         /// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value>