aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata/Images
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-06-11 18:05:07 -0400
committerGitHub <noreply@github.com>2017-06-11 18:05:07 -0400
commite0c907cc6009408157d42531afab4c089c2e2871 (patch)
tree069efdd6b11b3dd81e7bc6c191497114374f0577 /MediaBrowser.LocalMetadata/Images
parent9ee58d399cde4ccec9ea10c60c1a508a353b7836 (diff)
parente9d2fb13e06a93336b6b16d03b66d3390a762c40 (diff)
Merge pull request #2702 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.LocalMetadata/Images')
-rw-r--r--MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs19
1 files changed, 2 insertions, 17 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index fbb6b20f11..2b5858aec4 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
@@ -40,27 +40,12 @@ namespace MediaBrowser.LocalMetadata.Images
{
var parentPath = _fileSystem.GetDirectoryName(item.Path);
- var parentPathFiles = directoryService.GetFileSystemEntries(parentPath)
+ var parentPathFiles = directoryService.GetFiles(parentPath)
.ToList();
var nameWithoutExtension = _fileSystem.GetFileNameWithoutExtension(item.Path);
- var files = GetFilesFromParentFolder(nameWithoutExtension, parentPathFiles);
-
- if (files.Count > 0)
- {
- return files;
- }
-
- var metadataPath = Path.Combine(parentPath, "metadata");
-
- if (parentPathFiles.Any(i => string.Equals(i.FullName, metadataPath, StringComparison.OrdinalIgnoreCase)))
- {
- var filesInMetadataFolder = _fileSystem.GetFiles(metadataPath, BaseItem.SupportedImageExtensions, false, false);
- return GetFilesFromParentFolder(nameWithoutExtension, filesInMetadataFolder);
- }
-
- return new List<LocalImageInfo>();
+ return GetFilesFromParentFolder(nameWithoutExtension, parentPathFiles);
}
private List<LocalImageInfo> GetFilesFromParentFolder(string filenameWithoutExtension, IEnumerable<FileSystemMetadata> parentPathFiles)