From 302eea1cb7160bed64c76a086e425be1f90c1b11 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Sat, 8 Jun 2024 21:51:08 +0200 Subject: [PATCH 1/3] Fix local episode image thumb recognition --- .../Images/EpisodeLocalImageProvider.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs index 6a5e3bf04a..ea934dc3bc 100644 --- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs +++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs @@ -40,8 +40,7 @@ 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) @@ -55,8 +54,6 @@ namespace MediaBrowser.LocalMetadata.Images private List GetImageFilesFromFolder(ReadOnlySpan filenameWithoutExtension, List filePaths) { - var thumbName = string.Concat(filenameWithoutExtension, "-thumb"); - var list = new List(1); foreach (var i in filePaths) @@ -69,6 +66,7 @@ namespace MediaBrowser.LocalMetadata.Images if (BaseItem.SupportedImageExtensions.Contains(i.Extension.AsSpan(), StringComparison.OrdinalIgnoreCase)) { var currentNameWithoutExtension = Path.GetFileNameWithoutExtension(i.FullName.AsSpan()); + var thumbName = string.Concat(filenameWithoutExtension, "-thumb"); if (filenameWithoutExtension.Equals(currentNameWithoutExtension, StringComparison.OrdinalIgnoreCase)) { From fd009fc71b0e183abbf369951d974017c0b1d7b7 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Sat, 8 Jun 2024 21:57:21 +0200 Subject: [PATCH 2/3] Simplify metadata subdir check --- .../Images/EpisodeLocalImageProvider.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs index ea934dc3bc..b14ace57d2 100644 --- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs +++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs @@ -42,10 +42,10 @@ namespace MediaBrowser.LocalMetadata.Images 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)); } From b24d05bff71149dcd6f13500414f7c364711acd9 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Sat, 8 Jun 2024 22:35:50 +0200 Subject: [PATCH 3/3] Apply review suggestion --- MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs index b14ace57d2..f00d508bbe 100644 --- a/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs +++ b/MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs @@ -55,6 +55,7 @@ namespace MediaBrowser.LocalMetadata.Images private List GetImageFilesFromFolder(ReadOnlySpan filenameWithoutExtension, List filePaths) { var list = new List(1); + var thumbName = string.Concat(filenameWithoutExtension, "-thumb"); foreach (var i in filePaths) { @@ -66,7 +67,6 @@ namespace MediaBrowser.LocalMetadata.Images if (BaseItem.SupportedImageExtensions.Contains(i.Extension.AsSpan(), StringComparison.OrdinalIgnoreCase)) { var currentNameWithoutExtension = Path.GetFileNameWithoutExtension(i.FullName.AsSpan()); - var thumbName = string.Concat(filenameWithoutExtension, "-thumb"); if (filenameWithoutExtension.Equals(currentNameWithoutExtension, StringComparison.OrdinalIgnoreCase)) {