diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-04 17:10:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 17:10:20 -0400 |
| commit | b10021b35ff820d296d897685dac531e15ace1f2 (patch) | |
| tree | 42eef04d611a20bd7c4e62e24f514511401b800d /MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs | |
| parent | 69f00aef741b27b352eab94b5a059f5fd92a6160 (diff) | |
| parent | 8d374353445cd3848ec08473eb636a19192700fb (diff) | |
Merge pull request #2690 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs')
| -rw-r--r-- | MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs index fbb6b20f1..2b5858aec 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) |
