Merge pull request #2966 from MediaBrowser/dev

Dev

1 files changed, 16 insertions, 16 deletions

diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index 3f9ea79c6..5cd7e4262 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -42,23 +42,14 @@ namespace Emby.Server.Implementations.Images
             return true;
         }
 
-        public virtual IEnumerable<ImageType> GetSupportedImages(IHasMetadata item)
+        public virtual ImageType[] GetSupportedImages(IHasMetadata item)
         {
-            return new List<ImageType>
+            return new ImageType[]
             {
-                ImageType.Primary,
-                ImageType.Thumb
+                ImageType.Primary
             };
         }
 
-        private IEnumerable<ImageType> GetEnabledImages(IHasMetadata item)
-        {
-            //var options = ProviderManager.GetMetadataOptions(item);
-
-            return GetSupportedImages(item);
-            //return GetSupportedImages(item).Where(i => IsEnabled(options, i, item)).ToList();
-        }
-
         public async Task<ItemUpdateType> FetchAsync(T item, MetadataRefreshOptions options, CancellationToken cancellationToken)
         {
             if (!Supports(item))
@@ -67,7 +58,7 @@ namespace Emby.Server.Implementations.Images
             }
 
             var updateType = ItemUpdateType.None;
-            var supportedImages = GetEnabledImages(item).ToList();
+            var supportedImages = GetSupportedImages(item);
 
             if (supportedImages.Contains(ImageType.Primary))
             {
@@ -253,7 +244,7 @@ namespace Emby.Server.Implementations.Images
                 return false;
             }
 
-            var supportedImages = GetEnabledImages(item).ToList();
+            var supportedImages = GetSupportedImages(item);
 
             if (supportedImages.Contains(ImageType.Primary) && HasChanged(item, ImageType.Primary))
             {
@@ -283,8 +274,7 @@ namespace Emby.Server.Implementations.Images
                     return false;
                 }
 
-                var age = DateTime.UtcNow - image.DateModified;
-                if (age.TotalDays <= MaxImageAgeDays)
+                if (!HasChangedByDate(item, image))
                 {
                     return false;
                 }
@@ -293,6 +283,16 @@ namespace Emby.Server.Implementations.Images
             return true;
         }
 
+        protected virtual bool HasChangedByDate(IHasMetadata item, ItemImageInfo image)
+        {
+            var age = DateTime.UtcNow - image.DateModified;
+            if (age.TotalDays <= MaxImageAgeDays)
+            {
+                return false;
+            }
+            return true;
+        }
+
         protected List<BaseItem> GetFinalItems(IEnumerable<BaseItem> items)
         {
             return GetFinalItems(items, 4);