Updated audio image extraction logic. Added caching classes.

Harmonia.Core/Imaging/AudioImageExtractor.cs

@@ -2,16 +2,58 @@
 
 namespace Harmonia.Core.Imaging;
 
-public class AudioImageExtractor(ITagResolver tagResolver) : IAudioImageExtractor
+public class AudioImageExtractor : IAudioImageExtractor
 {
-    public SongPictureInfo ExtractImage(string fileName)
-    {
-        SongTagInfo songTagInfo = tagResolver.GetSongTagInfo(fileName);
+    private readonly ITagResolver _tagResolver;
+    private readonly string[] _searchPatterns;
+    private readonly string[] _imageExtensions;
 
-        return ExtractImage(fileName, songTagInfo);
+    public AudioImageExtractor(ITagResolver tagResolver)
+    {
+        _tagResolver = tagResolver;
+        _searchPatterns = GetSearchPatterns();
+        _imageExtensions = GetImageExtensions();
     }
 
-    public SongPictureInfo ExtractImage(string fileName, SongTagInfo songTagInfo)
+    protected virtual string[] GetSearchPatterns()
+    {
+        return
+        [
+            @"*%filename%*",
+            @"*folder*",
+            @"*front*",
+            @"*cover*",
+            @"Cover\*folder*",
+            @"Cover\*front*",
+            @"Cover\*cover*",
+            @"Cover\*",
+            @"Scans\*folder*",
+            @"Scans\*front*",
+            @"Scans\*cover*",
+            @"Scans\*",
+            @"*"
+        ];
+    }
+    
+
+    protected virtual string[] GetImageExtensions()
+    {
+        return
+        [
+            "jpg",
+            "jpeg",
+            "png"
+        ];
+    }
+
+    public SongPictureInfo? ExtractImage(string path)
+    {
+        SongTagInfo songTagInfo = _tagResolver.GetSongTagInfo(path);
+
+        return ExtractImage(path, songTagInfo);
+    }
+
+    public SongPictureInfo? ExtractImage(string path, SongTagInfo songTagInfo)
     {
         if (songTagInfo.FrontCover != null)
         {
@@ -21,7 +63,47 @@ public class AudioImageExtractor(ITagResolver tagResolver) : IAudioImageExtracto
         }
         else
         {
-            return SongPictureInfo.FromFile(fileName);
+            string? imagePath = GetImagePath(path);
+
+            if (string.IsNullOrWhiteSpace(imagePath))
+                return null;
+
+            return SongPictureInfo.FromFile(path);
+        }
+    }
+
+    private string? GetImagePath(string path)
+    {
+        string[] fileNames;
+        string extension;
+
+        foreach (string searchPattern in _searchPatterns)
+        {
+            fileNames = GetFilesFromDirectory(path, searchPattern);
+
+            foreach (string fileName in fileNames)
+            {
+                extension = Path.GetExtension(fileName)?.Replace(".", "") ?? string.Empty;
+
+                if (_imageExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase) == false)
+                    continue;
+
+                return fileName;
+            }
+        }
+
+        return null;
+    }
+
+    private static string[] GetFilesFromDirectory(string path, string searchPattern)
+    {
+        try
+        {
+            return Directory.GetFiles(path, searchPattern);
+        }
+        catch (DirectoryNotFoundException)
+        {
+            return [];
         }
     }
 }

Harmonia.Core/Imaging/IAudioImageExtractor.cs

@@ -4,6 +4,6 @@ namespace Harmonia.Core.Imaging;
 
 public interface IAudioImageExtractor
 {
-    SongPictureInfo ExtractImage(string fileName);
-    SongPictureInfo ExtractImage(string fileName, SongTagInfo songTagInfo);
+    SongPictureInfo? ExtractImage(string path);
+    SongPictureInfo? ExtractImage(string path, SongTagInfo songTagInfo);
 }

Harmonia.Core/Imaging/SongPictureInfo.cs

@@ -7,7 +7,7 @@ public class SongPictureInfo : IDisposable
     public required Stream Stream { get; init; }
     public string? ImageHash { get; init; }
     public required string ImageName { get; init; }
-    public ulong Size { get; init; }
+    public long Size { get; init; }
 
     private SongPictureInfo()
     {
@@ -45,7 +45,7 @@ public class SongPictureInfo : IDisposable
             Stream = stream,
             ImageHash = imageHash,
             ImageName = imageName,
-            Size = (ulong)stream.Length
+            Size = stream.Length
         };
 
         return songPictureInfo;