2 files changed, 108 insertions, 17 deletions

diff --git a/MediaBrowser.Providers/All/InternalMetadataFolderImageProvider.cs b/MediaBrowser.Providers/All/InternalMetadataFolderImageProvider.cs
new file mode 100644
index 0000000000..cecde64ca3
--- /dev/null
+++ b/MediaBrowser.Providers/All/InternalMetadataFolderImageProvider.cs
@@ -0,0 +1,71 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+using System.IO;
+
+namespace MediaBrowser.Providers.All
+{
+    public class InternalMetadataFolderImageProvider : ILocalImageFileProvider, IHasOrder
+    {
+        private readonly IServerConfigurationManager _config;
+
+        public InternalMetadataFolderImageProvider(IServerConfigurationManager config)
+        {
+            _config = config;
+        }
+
+        public string Name
+        {
+            get { return "Internal Images"; }
+        }
+
+        public bool Supports(IHasImages item)
+        {
+            if (!item.IsSaveLocalMetadataEnabled())
+            {
+                return true;
+            }
+
+            var locationType = item.LocationType;
+
+            if (locationType == LocationType.FileSystem ||
+                locationType == LocationType.Offline)
+            {
+                return false;
+            }
+
+            // These always save locally
+            if (item is IItemByName || item is User)
+            {
+                return false;
+            }
+            
+            return true;
+        }
+
+        public int Order
+        {
+            get
+            {
+                // Make sure this is last so that all other locations are scanned first
+                return 1000;
+            }
+        }
+
+        public List<LocalImageInfo> GetImages(IHasImages item)
+        {
+            var path = _config.ApplicationPaths.GetInternalMetadataPath(item.Id);
+
+            try
+            {
+                return new LocalImageProvider().GetImages(item, path);
+            }
+            catch (DirectoryNotFoundException)
+            {
+                return new List<LocalImageInfo>();
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Providers/All/LocalImageProvider.cs b/MediaBrowser.Providers/All/LocalImageProvider.cs
index 0d078499d5..7d70a35b6d 100644
--- a/MediaBrowser.Providers/All/LocalImageProvider.cs
+++ b/MediaBrowser.Providers/All/LocalImageProvider.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
@@ -13,15 +12,8 @@ using System.Linq;
 
 namespace MediaBrowser.Providers.All
 {
-    public class LocalImageProvider : IImageFileProvider
+    public class LocalImageProvider : ILocalImageFileProvider
     {
-        private readonly IFileSystem _fileSystem;
-
-        public LocalImageProvider(IFileSystem fileSystem)
-        {
-            _fileSystem = fileSystem;
-        }
-
         public string Name
         {
             get { return "Local Images"; }
@@ -91,12 +83,37 @@ namespace MediaBrowser.Providers.All
 
             var list = new List<LocalImageInfo>();
 
-            PopulateImages(item, list, files);
+            PopulateImages(item, list, files, true);
+
+            return list;
+        }
+
+        public List<LocalImageInfo> GetImages(IHasImages item, string path)
+        {
+            return GetImages(item, new[] { path });
+        }
+
+        public List<LocalImageInfo> GetImages(IHasImages item, IEnumerable<string> paths)
+        {
+            var files = paths.SelectMany(i => new DirectoryInfo(i).EnumerateFiles("*", SearchOption.TopDirectoryOnly))
+               .Where(i =>
+               {
+                   var ext = i.Extension;
+
+                   return !string.IsNullOrEmpty(ext) &&
+                       BaseItem.SupportedImageExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
+               })
+               .Cast<FileSystemInfo>()
+               .ToList();
+
+            var list = new List<LocalImageInfo>();
+
+            PopulateImages(item, list, files, false);
 
             return list;
         }
 
-        private void PopulateImages(IHasImages item, List<LocalImageInfo> images, List<FileSystemInfo> files)
+        private void PopulateImages(IHasImages item, List<LocalImageInfo> images, List<FileSystemInfo> files, bool supportParentSeriesFiles)
         {
             var imagePrefix = string.Empty;
 
@@ -126,11 +143,14 @@ namespace MediaBrowser.Providers.All
             AddImage(files, images, imagePrefix + "thumb", ImageType.Thumb);
             AddImage(files, images, imagePrefix + "landscape", ImageType.Thumb);
 
-            var season = item as Season;
-
-            if (season != null)
+            if (supportParentSeriesFiles)
             {
-                PopulateSeasonImagesFromSeriesFolder(season, images);
+                var season = item as Season;
+
+                if (season != null)
+                {
+                    PopulateSeasonImagesFromSeriesFolder(season, images);
+                }
             }
         }
 
@@ -278,7 +298,7 @@ namespace MediaBrowser.Providers.All
             }
         }
 
-        private bool AddImage(List<FileSystemInfo> files, List<LocalImageInfo> images, string name, ImageType type)
+        private bool AddImage(IEnumerable<FileSystemInfo> files, List<LocalImageInfo> images, string name, ImageType type)
         {
             var image = GetImage(files, name) as FileInfo;