consolidate emby.server.core into emby.server.implementations

2 files changed, 1 insertions, 75 deletions

diff --git a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs b/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
deleted file mode 100644
index db57dcbfd7..0000000000
--- a/MediaBrowser.LocalMetadata/Images/ImagesByNameImageProvider.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-
-using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Controller.Providers;
-
-namespace MediaBrowser.LocalMetadata.Images
-{
-    public class ImagesByNameImageProvider : ILocalImageFileProvider, IHasOrder
-    {
-        private readonly IFileSystem _fileSystem;
-        private readonly IServerConfigurationManager _config;
-
-        public ImagesByNameImageProvider(IFileSystem fileSystem, IServerConfigurationManager config)
-        {
-            _fileSystem = fileSystem;
-            _config = config;
-        }
-
-        public string Name
-        {
-            get { return "Images By Name"; }
-        }
-
-        public bool Supports(IHasMetadata item)
-        {
-            return item is CollectionFolder;
-        }
-
-        public int Order
-        {
-            get
-            {
-                // Run after LocalImageProvider, and after CollectionFolderImageProvider
-                return 2;
-            }
-        }
-
-        public List<LocalImageInfo> GetImages(IHasMetadata item, IDirectoryService directoryService)
-        {
-            var name = _fileSystem.GetValidFilename(item.Name);
-
-            var path = Path.Combine(_config.ApplicationPaths.GeneralPath, name);
-
-            try
-            {
-                return new LocalImageProvider(_fileSystem).GetImages(item, path, false, directoryService);
-            }
-            catch (IOException)
-            {
-                return new List<LocalImageInfo>();
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 643c37427b..1b61f079e6 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -103,23 +103,7 @@ namespace MediaBrowser.LocalMetadata.Images
 
         public List<LocalImageInfo> GetImages(IHasMetadata item, IEnumerable<string> paths, bool arePathsInMediaFolders, IDirectoryService directoryService)
         {
-            IEnumerable<FileSystemMetadata> files;
-
-            if (arePathsInMediaFolders)
-            {
-                files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
-            }
-            else
-            {
-                files = paths.SelectMany(directoryService.GetFiles)
-                    .Where(i =>
-                    {
-                        var ext = i.Extension;
-
-                        return !string.IsNullOrEmpty(ext) &&
-                               BaseItem.SupportedImageExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
-                    });
-            }
+            IEnumerable<FileSystemMetadata> files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
 
             files = files
                 .OrderBy(i => BaseItem.SupportedImageExtensionsList.IndexOf(i.Extension ?? string.Empty));