Images: Remove preloading & use lowercase paths for caching

Author: TBM13

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -37,55 +37,16 @@ public static async Task InitializeAsync()
             _storage = new BinaryStorage<List<(string, bool)>>("Image");
             _hashGenerator = new ImageHashGenerator();
 
-            var usage = await LoadStorageToConcurrentDictionaryAsync();
-            _storage.ClearData();
-
-            ImageCache.Initialize(usage);
+            // Even though we no longer do image preloading and thus don't need _storage,
+            // for some reason MemoryPackSerializer exceptions appear when this is removed
+            await LoadStorageToConcurrentDictionaryAsync();
 
             foreach (var icon in new[] { Constant.DefaultIcon, Constant.MissingImgIcon })
             {
                 ImageSource img = new BitmapImage(new Uri(icon));
                 img.Freeze();
                 ImageCache[icon, false] = img;
             }
-
-            _ = Task.Run(async () =>
-            {
-                await Stopwatch.InfoAsync(ClassName, "Preload images cost", async () =>
-                {
-                    foreach (var (path, isFullImage) in usage)
-                    {
-                        await LoadAsync(path, isFullImage);
-                    }
-                });
-                Log.Info(ClassName, $"Number of preload images is <{ImageCache.CacheSize()}>, Images Number: {ImageCache.CacheSize()}, Unique Items {ImageCache.UniqueImagesInCache()}");
-            });
-        }
-
-        public static async Task SaveAsync()
-        {
-            await storageLock.WaitAsync();
-
-            try
-            {
-                await _storage.SaveAsync(ImageCache.EnumerateEntries()
-                    .Select(x => x.Key)
-                    .ToList());
-            }
-            catch (System.Exception e)
-            {
-                Log.Exception(ClassName, "Failed to save image cache to file", e);
-            }
-            finally
-            {
-                storageLock.Release();
-            }
-        }
-
-        public static async Task WaitSaveAsync()
-        {
-            await storageLock.WaitAsync();
-            storageLock.Release();
         }
 
         private static async Task<List<(string, bool)>> LoadStorageToConcurrentDictionaryAsync()
@@ -276,6 +237,7 @@ public static bool TryGetValue(string path, bool loadFullImage, out ImageSource
 
         public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false, bool cacheImage = true)
         {
+            path = path.ToLowerInvariant();
             var imageResult = await LoadInternalAsync(path, loadFullImage);
 
             var img = imageResult.ImageSource;

Flow.Launcher/MainWindow.xaml.cs

@@ -277,7 +277,6 @@ private async void OnClosing(object sender, CancelEventArgs e)
                 _notifyIcon.Visible = false;
                 App.API.SaveAppAllSettings();
                 e.Cancel = true;
-                await ImageLoader.WaitSaveAsync();
                 await PluginManager.DisposePluginsAsync();
                 Notification.Uninstall();
                 // After plugins are all disposed, we shutdown application to close app

Flow.Launcher/PublicAPIInstance.cs

@@ -76,9 +76,6 @@ public async void RestartApp()
             // UpdateManager.RestartApp() will call Environment.Exit(0)
             // which will cause ungraceful exit
             SaveAppAllSettings();
-
-            // Wait for all image caches to be saved before restarting
-            await ImageLoader.WaitSaveAsync();
         }
 
         public void ShowMainWindow() => _mainVM.Show();
@@ -103,7 +100,6 @@ public void SaveAppAllSettings()
                 PluginManager.Save();
                 _mainVM.Save();
             }
-            _ = ImageLoader.SaveAsync();
         }
 
         public Task ReloadAllPluginData() => PluginManager.ReloadDataAsync();