Merge pull request #2089 from VictoriousRaptor/FixImageCache

Fix image.cache save & load

Author: VictoriousRaptor

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -48,6 +48,9 @@ private static void DeletePythonBinding()
             }
         }
 
+        /// <summary>
+        /// Save json and ISavable 
+        /// </summary>
         public static void Save()
         {
             foreach (var plugin in AllPlugins)

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -28,7 +28,7 @@ public class ImageCache
         private const int permissibleFactor = 2;
         private SemaphoreSlim semaphore = new(1, 1);
 
-        public void Initialization(Dictionary<(string, bool), int> usage)
+        public void Initialize(Dictionary<(string, bool), int> usage)
         {
             foreach (var key in usage.Keys)
             {

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -40,6 +40,8 @@ public static void Initialize()
 
             var usage = LoadStorageToConcurrentDictionary();
 
+            ImageCache.Initialize(usage.ToDictionary(x => x.Key, x => x.Value));
+
             foreach (var icon in new[]
                      {
                          Constant.DefaultIcon, Constant.MissingImgIcon

Flow.Launcher/MainWindow.xaml.cs

@@ -69,13 +69,11 @@ private void OnCopy(object sender, ExecutedRoutedEventArgs e)
                 _viewModel.ResultCopy(QueryTextBox.SelectedText);
             }
         }
-
+        
         private async void OnClosing(object sender, CancelEventArgs e)
         {
-            _settings.WindowTop = Top;
-            _settings.WindowLeft = Left;
             _notifyIcon.Visible = false;
-            _viewModel.Save();
+            App.API.SaveAppAllSettings();
             e.Cancel = true;
             await PluginManager.DisposePluginsAsync();
             Notification.Uninstall();

Flow.Launcher/PublicAPIInstance.cs

@@ -77,7 +77,7 @@ public void RestartApp()
 
         public void SaveAppAllSettings()
         {
-            SavePluginSettings();
+            PluginManager.Save();
             _mainVM.Save();
             _settingsVM.Save();
             ImageLoader.Save();
@@ -158,6 +158,9 @@ public void LogException(string className, string message, Exception e,
 
         private readonly ConcurrentDictionary<Type, object> _pluginJsonStorages = new();
 
+        /// <summary>
+        /// Save plugin settings.
+        /// </summary>
         public void SavePluginSettings()
         {
             foreach (var value in _pluginJsonStorages.Values)

Flow.Launcher/SettingWindow.xaml.cs

@@ -226,6 +226,7 @@ private void OnClosed(object sender, EventArgs e)
             settings.SettingWindowTop = Top;
             settings.SettingWindowLeft = Left;
             viewModel.Save();
+            API.SavePluginSettings();
         }
 
         private void OnCloseExecuted(object sender, ExecutedRoutedEventArgs e)

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -133,6 +133,9 @@ public bool PortableMode
             }
         }
 
+        /// <summary>
+        /// Save Flow settings. Plugins settings are not included.
+        /// </summary>
         public void Save()
         {
             foreach (var vm in PluginViewModels)
@@ -143,7 +146,6 @@ public void Save()
                 Settings.PluginSettings.Plugins[id].Priority = vm.Priority;
             }
 
-            PluginManager.Save();
             _storage.Save();
         }