aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata/Images
diff options
context:
space:
mode:
authorErwin de Haan <EraYaN@users.noreply.github.com>2019-01-17 20:24:39 +0100
committerErwin de Haan <EraYaN@users.noreply.github.com>2019-01-17 20:24:39 +0100
commit38f96af079887cce7c38fcde8340fd7c6d1150ad (patch)
tree32f2a7bdc6e0789bb9af34599234e99bcb2b9187 /MediaBrowser.LocalMetadata/Images
parent321c440739ae7657349c6a8e672a88bea1d6753c (diff)
Reformat JustAMan review pt2 changes
Refs #575
Diffstat (limited to 'MediaBrowser.LocalMetadata/Images')
-rw-r--r--MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs1
-rw-r--r--MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs2
-rw-r--r--MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs2
3 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
index f5e028ab8..206e761bb 100644
--- a/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/CollectionFolderImageProvider.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.LocalMetadata.Images
return item is CollectionFolder && item.SupportsLocalMetadata;
}
+ // Run after LocalImageProvider
public int Order => 1;
public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
diff --git a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
index 2a2f36fbd..c0706ceeb 100644
--- a/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/InternalMetadataFolderImageProvider.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.LocalMetadata.Images
return true;
}
-
+ // Make sure this is last so that all other locations are scanned first
public int Order => 1000;
public List<LocalImageInfo> GetImages(BaseItem item, IDirectoryService directoryService)
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index e4efa2c35..0a4928ed7 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.LocalMetadata.Images
public List<LocalImageInfo> GetImages(BaseItem item, IEnumerable<string> paths, bool arePathsInMediaFolders, IDirectoryService directoryService)
{
- var files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
+ IEnumerable<FileSystemMetadata> files = paths.SelectMany(i => _fileSystem.GetFiles(i, BaseItem.SupportedImageExtensions, true, false));
files = files
.OrderBy(i => Array.IndexOf(BaseItem.SupportedImageExtensions, i.Extension ?? string.Empty));