Merge pull request #1727 from VictoriousRaptor/FixImageCache

Fix ImageCache when loading full image

Author: VictoriousRaptor

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -1,9 +1,8 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Media;
 
 namespace Flow.Launcher.Infrastructure.Image

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -248,7 +248,7 @@ private static BitmapSource GetThumbnail(string path, ThumbnailOptions option =
 
         public static bool CacheContainImage(string path, bool loadFullImage = false)
         {
-            return ImageCache.ContainsKey(path, false) && ImageCache[path, loadFullImage] != null;
+            return ImageCache.ContainsKey(path, loadFullImage);
         }
 
         public static bool TryGetValue(string path, bool loadFullImage, out ImageSource image)
@@ -264,10 +264,6 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
             if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache)
             { // we need to get image hash
                 string hash = EnableImageHash ? _hashGenerator.GetHashFromImage(img) : null;
-                if (imageResult.ImageType == ImageType.FullImageFile)
-                {
-                    path = $"{path}_{ImageType.FullImageFile}";
-                }
                 if (hash != null)
                 {
 
@@ -283,7 +279,7 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
                 }
 
                 // update cache
-                ImageCache[path, false] = img;
+                ImageCache[path, loadFullImage] = img;
             }
 
             return img;