add auto save for all setting that has been registered, and remove Separate Save

Author: taooceros

Flow.Launcher/PublicAPIInstance.cs

@@ -76,6 +76,7 @@ public void RestartApp()
 
         public void SaveAppAllSettings()
         {
+            SaveAllJsonStorage();
             _mainVM.Save();
             _settingsVM.Save();
             PluginManager.Save();
@@ -133,32 +134,41 @@ public void OpenSettingDialog()
 
         public void LogException(string className, string message, Exception e, [CallerMemberName] string methodName = "") => Log.Exception(className, message, e, methodName);
 
-        private readonly Dictionary<Type, object> PluginJsonStorages = new Dictionary<Type, object>();
+        private readonly Dictionary<Type, object> _pluginJsonStorages = new();
 
+        private void SaveAllJsonStorage()
+        {
+            foreach (var value in _pluginJsonStorages.Values)
+            {
+                var method = value.GetType().GetMethod("Save");
+                method?.Invoke(value, null);
+            }
+        }
+        
         public T LoadJsonStorage<T>() where T : new()
         {
             var type = typeof(T);
-            if (!PluginJsonStorages.ContainsKey(type))
-                PluginJsonStorages[type] = new PluginJsonStorage<T>();
+            if (!_pluginJsonStorages.ContainsKey(type))
+                _pluginJsonStorages[type] = new PluginJsonStorage<T>();
 
-            return ((PluginJsonStorage<T>) PluginJsonStorages[type]).Load();
+            return ((PluginJsonStorage<T>) _pluginJsonStorages[type]).Load();
         }
 
         public void SaveJsonStorage<T>() where T : new()
         {
             var type = typeof(T);
-            if (!PluginJsonStorages.ContainsKey(type))
-                PluginJsonStorages[type] = new PluginJsonStorage<T>();
+            if (!_pluginJsonStorages.ContainsKey(type))
+                _pluginJsonStorages[type] = new PluginJsonStorage<T>();
 
-            ((PluginJsonStorage<T>) PluginJsonStorages[type]).Save();
+            ((PluginJsonStorage<T>) _pluginJsonStorages[type]).Save();
         }
 
         public void SaveJsonStorage<T>(T settings) where T : new()
         {
             var type = typeof(T);
-            PluginJsonStorages[type] = new PluginJsonStorage<T>(settings);
+            _pluginJsonStorages[type] = new PluginJsonStorage<T>(settings);
 
-            ((PluginJsonStorage<T>) PluginJsonStorages[type]).Save();
+            ((PluginJsonStorage<T>) _pluginJsonStorages[type]).Save();
         }
 
         public event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs

@@ -12,7 +12,7 @@
 
 namespace Flow.Launcher.Plugin.BrowserBookmark
 {
-    public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, ISavable
+    public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu
     {
         private PluginInitContext context;
 
@@ -29,11 +29,6 @@ public void Init(PluginInitContext context)
             cachedBookmarks = Bookmarks.LoadAllBookmarks();
         }
 
-        public void Save()
-        {
-            context.API.SaveJsonStorage<Settings>();
-        }
-
         public List<Result> Query(Query query)
         {
             string param = query.Search.TrimStart();

Plugins/Flow.Launcher.Plugin.Calculator/Main.cs

@@ -12,7 +12,7 @@
 
 namespace Flow.Launcher.Plugin.Caculator
 {
-    public class Main : IPlugin, IPluginI18n, ISavable, ISettingProvider
+    public class Main : IPlugin, IPluginI18n, ISettingProvider
     {
         private static readonly Regex RegValidExpressChar = new Regex(
                         @"^(" +
@@ -30,11 +30,6 @@ public class Main : IPlugin, IPluginI18n, ISavable, ISettingProvider
         private static Settings _settings;
         private static SettingsViewModel _viewModel;
 
-        static Main()
-        {
-            
-        }
-
         public void Init(PluginInitContext context)
         {
             Context = context;
@@ -187,10 +182,5 @@ public Control CreateSettingPanel()
         {
             return new CalculatorSettings(_viewModel);
         }
-
-        public void Save()
-        {
-            _viewModel.Save();
-        }
     }
 }

Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs

@@ -8,7 +8,7 @@
 
 namespace Flow.Launcher.Plugin.Caculator.ViewModels
 {
-    public class SettingsViewModel : BaseModel, ISavable
+    public class SettingsViewModel : BaseModel
     {
         private readonly PluginJsonStorage<Settings> _storage;
 
@@ -21,10 +21,5 @@ public SettingsViewModel()
         public Settings Settings { get; set; }
 
         public IEnumerable<int> MaxDecimalPlacesRange => Enumerable.Range(1, 20);
-
-        public void Save()
-        {
-            _storage.Save();
-        }
     }
 }

Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs

@@ -12,7 +12,7 @@
 
 namespace Flow.Launcher.Plugin.PluginsManager
 {
-    public class Main : ISettingProvider, IAsyncPlugin, ISavable, IContextMenu, IPluginI18n, IAsyncReloadable
+    public class Main : ISettingProvider, IAsyncPlugin, IContextMenu, IPluginI18n, IAsyncReloadable
     {
         internal PluginInitContext Context { get; set; }
 
@@ -79,11 +79,6 @@ var s when s.StartsWith(Settings.HotkeyUpdate) => await pluginManager.RequestUpd
             };
         }
 
-        public void Save()
-        {
-            viewModel.Save();
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return Context.API.GetTranslation("plugin_pluginsmanager_plugin_name");

Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs

@@ -17,10 +17,5 @@ public SettingsViewModel(PluginInitContext context, Settings settings)
             storage = new PluginJsonStorage<Settings>();
             Settings = settings;
         }
-
-        public void Save()
-        {
-            storage.Save();
-        }
     }
 }

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -33,7 +33,6 @@ public Main()
 
         public void Save()
         {
-            _context.API.SaveJsonStorage<Settings>();
             _win32Storage.Save(_win32s);
             _uwpStorage.Save(_uwps);
         }

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

@@ -18,7 +18,7 @@
 
 namespace Flow.Launcher.Plugin.Shell
 {
-    public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavable
+    public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu
     {
         private const string Image = "Images/shell.png";
         private PluginInitContext context;
@@ -27,12 +27,6 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavab
 
         private Settings _settings;
 
-        public void Save()
-        {
-            context.API.SaveJsonStorage<Settings>();
-        }
-
-
         public List<Result> Query(Query query)
         {
             List<Result> results = new List<Result>();

Plugins/Flow.Launcher.Plugin.Url/Main.cs

@@ -7,7 +7,7 @@
 
 namespace Flow.Launcher.Plugin.Url
 {
-    public class Main : ISettingProvider,IPlugin, IPluginI18n, ISavable
+    public class Main : ISettingProvider,IPlugin, IPluginI18n
     {
         //based on https://gist.github.com/dperini/729294
         private const string urlPattern = "^" +
@@ -46,12 +46,7 @@ public class Main : ISettingProvider,IPlugin, IPluginI18n, ISavable
         private PluginInitContext context;
         private Settings _settings;
 
-
-        public void Save()
-        {
-            context.API.SaveJsonStorage<Settings>();
-        }
-
+        
         public List<Result> Query(Query query)
         {
             var raw = query.Search;

Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs

@@ -14,7 +14,7 @@
 
 namespace Flow.Launcher.Plugin.WebSearch
 {
-    public class Main : IAsyncPlugin, ISettingProvider, IPluginI18n, ISavable, IResultUpdated
+    public class Main : IAsyncPlugin, ISettingProvider, IPluginI18n, IResultUpdated
     {
         private PluginInitContext _context;
 
@@ -31,10 +31,6 @@ public class Main : IAsyncPlugin, ISettingProvider, IPluginI18n, ISavable, IResu
 
         private readonly string SearchSourceGlobalPluginWildCardSign = "*";
 
-        public void Save()
-        {
-            _viewModel.Save();
-        }
 
         public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
         {