瀏覽代碼

Backport pull request #12039 from jellyfin/release-10.9.z

Fix local episode image thumb recognition

Original-merge: d813f83b4a79974326f45d5de03dd7ad72cbd4a8

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
Shadowghost 11 月之前
父節點
當前提交
970c95959a
共有 1 個文件被更改,包括 5 次插入7 次删除
  1. 5 7
      MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs

+ 5 - 7
MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs

@@ -40,13 +40,12 @@ namespace MediaBrowser.LocalMetadata.Images
             var parentPathFiles = directoryService.GetFiles(parentPath);
             var nameWithoutExtension = Path.GetFileNameWithoutExtension(item.Path.AsSpan()).ToString();
 
-            var thumbName = string.Concat(nameWithoutExtension, "-thumb");
-            var images = GetImageFilesFromFolder(thumbName, parentPathFiles);
+            var images = GetImageFilesFromFolder(nameWithoutExtension, parentPathFiles);
 
-            var metadataSubPath = directoryService.GetDirectories(parentPath).Where(d => d.Name.EndsWith("metadata", StringComparison.OrdinalIgnoreCase)).ToList();
-            foreach (var path in metadataSubPath)
+            var metadataSubDir = directoryService.GetDirectories(parentPath).FirstOrDefault(d => d.Name.Equals("metadata", StringComparison.Ordinal));
+            if (metadataSubDir is not null)
             {
-                var files = directoryService.GetFiles(path.FullName);
+                var files = directoryService.GetFiles(metadataSubDir.FullName);
                 images.AddRange(GetImageFilesFromFolder(nameWithoutExtension, files));
             }
 
@@ -55,9 +54,8 @@ namespace MediaBrowser.LocalMetadata.Images
 
         private List<LocalImageInfo> GetImageFilesFromFolder(ReadOnlySpan<char> filenameWithoutExtension, List<FileSystemMetadata> filePaths)
         {
-            var thumbName = string.Concat(filenameWithoutExtension, "-thumb");
-
             var list = new List<LocalImageInfo>(1);
+            var thumbName = string.Concat(filenameWithoutExtension, "-thumb");
 
             foreach (var i in filePaths)
             {