aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.LocalMetadata
diff options
context:
space:
mode:
authorShadowghost <Shadowghost@users.noreply.github.com>2024-06-23 11:40:47 -0400
committerJoshua M. Boniface <joshua@boniface.me>2024-06-23 11:40:47 -0400
commit970c95959aedb85211e4af2d7dca44ec2614f767 (patch)
tree39ff13e1a74ed231e90707396f69b4690d9f4627 /MediaBrowser.LocalMetadata
parent529d24ec308645e92839b216fd0b52acd4ad62a2 (diff)
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>
Diffstat (limited to 'MediaBrowser.LocalMetadata')
-rw-r--r--MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
index 6a5e3bf04..f00d508bb 100644
--- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
+++ b/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)
{