Move most direct call of PluginJsonStorage to API call

taooceros · taooceros · commit 33accbd5d4a7 · 2021-05-11T20:24:22.000+08:00
diff --git a/Flow.Launcher.Plugin/IPublicAPI.cs b/Flow.Launcher.Plugin/IPublicAPI.cs
@@ -186,12 +186,5 @@ public interface IPublicAPI
         /// <typeparam name="T">Type for Serialization</typeparam>
         /// <returns></returns>
         void SaveJsonStorage<T>(T settings) where T : new();
-
-        /// <summary>
-        /// Backup the JsonStorage you loaded from LoadJsonStorage
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="settings"></param>
-        void BackupJsonStorage<T>() where T : new();
     }
 }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -133,15 +133,15 @@ 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, dynamic> PluginJsonStorages = new Dictionary<Type, dynamic>();
+        private readonly Dictionary<Type, object> PluginJsonStorages = new Dictionary<Type, object>();
 
         public T LoadJsonStorage<T>() where T : new()
         {
             var type = typeof(T);
             if (!PluginJsonStorages.ContainsKey(type))
                 PluginJsonStorages[type] = new PluginJsonStorage<T>();
 
-            return PluginJsonStorages[type].Load();
+            return ((PluginJsonStorage<T>) PluginJsonStorages[type]).Load();
         }
 
         public void SaveJsonStorage<T>() where T : new()
@@ -150,24 +150,15 @@ public void OpenSettingDialog()
             if (!PluginJsonStorages.ContainsKey(type))
                 PluginJsonStorages[type] = new 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].Save();
-        }
-
-        public void BackupJsonStorage<T>() where T : new()
-        {
-            var type = typeof(T);
-            if (!PluginJsonStorages.ContainsKey(type))
-                throw new InvalidOperationException("You haven't registered the JsonStorage for specific Type");
-
-            PluginJsonStorages[type].BackupOriginFile();
+            ((PluginJsonStorage<T>) PluginJsonStorages[type]).Save();
         }
 
         public event FlowLauncherGlobalKeyboardEventHandler GlobalKeyboardEvent;
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Main.cs
@@ -12,25 +12,28 @@
 
 namespace Flow.Launcher.Plugin.BrowserBookmark
 {
-    public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, ISavable, IContextMenu
+    public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, ISavable
     {
         private PluginInitContext context;
 
         private List<Bookmark> cachedBookmarks = new List<Bookmark>();
 
         private Settings _settings { get; set;}
-        private PluginJsonStorage<Settings> _storage { get; set;}
 
         public void Init(PluginInitContext context)
         {
             this.context = context;
             
-            _storage = new PluginJsonStorage<Settings>();
-            _settings = _storage.Load();
+            _settings = context.API.LoadJsonStorage<Settings>();
 
             cachedBookmarks = Bookmarks.LoadAllBookmarks();
         }
 
+        public void Save()
+        {
+            context.API.SaveJsonStorage<Settings>();
+        }
+
         public List<Result> Query(Query query)
         {
             string param = query.Search.TrimStart();
@@ -113,11 +116,6 @@ public Control CreateSettingPanel()
             return new SettingsControl(_settings);
         }
 
-        public void Save()
-        {
-            _storage.Save();
-        }
-
         public List<Result> LoadContextMenus(Result selectedResult)
         {
             return new List<Result>() {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Main.cs
@@ -11,7 +11,7 @@
 
 namespace Flow.Launcher.Plugin.Explorer
 {
-    public class Main : ISettingProvider, IAsyncPlugin, ISavable, IContextMenu, IPluginI18n
+    public class Main : ISettingProvider, IAsyncPlugin, IContextMenu, IPluginI18n
     {
         internal PluginInitContext Context { get; set; }
 
@@ -31,9 +31,11 @@ public Control CreateSettingPanel()
         public async Task InitAsync(PluginInitContext context)
         {
             Context = context;
-            viewModel = new SettingsViewModel(context);
-            await viewModel.LoadStorage();
-            Settings = viewModel.Settings;
+            
+            Settings = context.API.LoadJsonStorage<Settings>();
+
+            viewModel = new SettingsViewModel(context, Settings);
+            
 
             // as at v1.7.0 this is to maintain backwards compatibility, need to be removed afterwards.
             if (Settings.QuickFolderAccessLinks.Any())
@@ -57,11 +59,6 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             return await searchManager.SearchAsync(query, token);
         }
 
-        public void Save()
-        {
-            viewModel.Save();
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return Context.API.GetTranslation("plugin_explorer_plugin_name");
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -9,27 +9,20 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels
 {
     public class SettingsViewModel
     {
-        private readonly PluginJsonStorage<Settings> storage;
-
         internal Settings Settings { get; set; }
 
         internal PluginInitContext Context { get; set; }
 
-        public SettingsViewModel(PluginInitContext context)
+        public SettingsViewModel(PluginInitContext context, Settings settings)
         {
             Context = context;
-            storage = new PluginJsonStorage<Settings>();
-            Settings = storage.Load();
+            Settings = settings;
         }
 
-        public Task LoadStorage()
-        {
-            return Task.Run(() => Settings = storage.Load());
-        }
 
         public void Save()
         {
-            storage.Save();
+            Context.API.SaveJsonStorage<Settings>();
         }
 
         internal void RemoveLinkFromQuickAccess(AccessLink selectedRow) => Settings.QuickAccessLinks.Remove(selectedRow);
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
@@ -8,6 +8,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Threading;
+using System.Windows;
 
 namespace Flow.Launcher.Plugin.PluginsManager
 {
@@ -33,8 +34,8 @@ public Control CreateSettingPanel()
         public Task InitAsync(PluginInitContext context)
         {
             Context = context;
-            viewModel = new SettingsViewModel(context);
-            Settings = viewModel.Settings;
+            Settings = context.API.LoadJsonStorage<Settings>();
+            viewModel = new SettingsViewModel(context, Settings);
             contextMenu = new ContextMenu(Context);
             pluginManager = new PluginsManager(Context, Settings);
             _ = pluginManager.UpdateManifest().ContinueWith(_ =>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
@@ -3,19 +3,19 @@
 
 namespace Flow.Launcher.Plugin.PluginsManager.ViewModels
 {
-    public class SettingsViewModel
+    internal class SettingsViewModel
     {
         private readonly PluginJsonStorage<Settings> storage;
 
         internal Settings Settings { get; set; }
 
         internal PluginInitContext Context { get; set; }
 
-        public SettingsViewModel(PluginInitContext context)
+        public SettingsViewModel(PluginInitContext context, Settings settings)
         {
             Context = context;
             storage = new PluginJsonStorage<Settings>();
-            Settings = storage.Load();
+            Settings = settings;
         }
 
         public void Save()
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml.cs
@@ -10,7 +10,7 @@ public partial class PluginsManagerSettings
     {
         private readonly SettingsViewModel viewModel;
 
-        public PluginsManagerSettings(SettingsViewModel viewModel)
+        internal PluginsManagerSettings(SettingsViewModel viewModel)
         {
             InitializeComponent();
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -25,16 +25,15 @@ public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, I
 
         private static BinaryStorage<Win32[]> _win32Storage;
         private static BinaryStorage<UWP.Application[]> _uwpStorage;
-        private readonly PluginJsonStorage<Settings> _settingsStorage;
 
         public Main()
         {
-            _settingsStorage = new PluginJsonStorage<Settings>();
+            
         }
 
         public void Save()
         {
-            _settingsStorage.Save();
+            _context.API.SaveJsonStorage<Settings>();
             _win32Storage.Save(_win32s);
             _uwpStorage.Save(_uwps);
         }
@@ -71,7 +70,7 @@ public async Task InitAsync(PluginInitContext context)
         {
             _context = context;
 
-            _settings = _settingsStorage.Load();
+            _settings = context.API.LoadJsonStorage<Settings>();
 
             await Task.Yield();
 
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -25,18 +25,11 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavab
         private bool _winRStroked;
         private readonly KeyboardSimulator _keyboardSimulator = new KeyboardSimulator(new InputSimulator());
 
-        private readonly Settings _settings;
-        private readonly PluginJsonStorage<Settings> _storage;
-
-        public Main()
-        {
-            _storage = new PluginJsonStorage<Settings>();
-            _settings = _storage.Load();
-        }
+        private Settings _settings;
 
         public void Save()
         {
-            _storage.Save();
+            context.API.SaveJsonStorage<Settings>();
         }
 
 
@@ -285,6 +278,7 @@ public void Init(PluginInitContext context)
         {
             this.context = context;
             context.API.GlobalKeyboardEvent += API_GlobalKeyboardEvent;
+            _settings = context.API.LoadJsonStorage<Settings>();
         }
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)
diff --git a/Plugins/Flow.Launcher.Plugin.Url/Main.cs b/Plugins/Flow.Launcher.Plugin.Url/Main.cs
@@ -44,18 +44,12 @@ public class Main : ISettingProvider,IPlugin, IPluginI18n, ISavable
             "$";
         Regex reg = new Regex(urlPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private PluginInitContext context;
-        private readonly Settings _settings;
-        private readonly PluginJsonStorage<Settings> _storage;
+        private Settings _settings;
 
-        public Main()
-        {
-            _storage = new PluginJsonStorage<Settings>();
-            _settings = _storage.Load();
-        }
 
         public void Save()
         {
-            _storage.Save();
+            context.API.SaveJsonStorage<Settings>();
         }
 
         public List<Result> Query(Query query)
@@ -128,6 +122,8 @@ public bool IsURL(string raw)
         public void Init(PluginInitContext context)
         {
             this.context = context;
+            
+            _settings = context.API.LoadJsonStorage<Settings>();
         }
 
         public string GetTranslatedPluginTitle()

Original file line number	Diff line number	Diff line change
`@@ -186,12 +186,5 @@ public interface IPublicAPI`
`186`	`186`	`/// <typeparam name="T">Type for Serialization</typeparam>`
`187`	`187`	`/// <returns></returns>`
`188`	`188`	`void SaveJsonStorage<T>(T settings) where T : new();`
`189`		`-`
`190`		`- /// <summary>`
`191`		`- /// Backup the JsonStorage you loaded from LoadJsonStorage`
`192`		`- /// </summary>`
`193`		`- /// <typeparam name="T"></typeparam>`
`194`		`- /// <param name="settings"></param>`
`195`		`- void BackupJsonStorage<T>() where T : new();`
`196`	`189`	`}`
`197`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,25 +12,28 @@`
`12`	`12`
`13`	`13`	`namespace Flow.Launcher.Plugin.BrowserBookmark`
`14`	`14`	`{`
`15`		`- public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, ISavable, IContextMenu`
	`15`	`+ public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, IContextMenu, ISavable`
`16`	`16`	`{`
`17`	`17`	`private PluginInitContext context;`
`18`	`18`
`19`	`19`	`private List<Bookmark> cachedBookmarks = new List<Bookmark>();`
`20`	`20`
`21`	`21`	`private Settings _settings { get; set;}`
`22`		`- private PluginJsonStorage<Settings> _storage { get; set;}`
`23`	`22`
`24`	`23`	`public void Init(PluginInitContext context)`
`25`	`24`	`{`
`26`	`25`	`this.context = context;`
`27`	`26`
`28`		`- _storage = new PluginJsonStorage<Settings>();`
`29`		`- _settings = _storage.Load();`
	`27`	`+ _settings = context.API.LoadJsonStorage<Settings>();`
`30`	`28`
`31`	`29`	`cachedBookmarks = Bookmarks.LoadAllBookmarks();`
`32`	`30`	`}`
`33`	`31`
	`32`	`+ public void Save()`
	`33`	`+ {`
	`34`	`+ context.API.SaveJsonStorage<Settings>();`
	`35`	`+ }`
	`36`	`+`
`34`	`37`	`public List<Result> Query(Query query)`
`35`	`38`	`{`
`36`	`39`	`string param = query.Search.TrimStart();`
`@@ -113,11 +116,6 @@ public Control CreateSettingPanel()`
`113`	`116`	`return new SettingsControl(_settings);`
`114`	`117`	`}`
`115`	`118`
`116`		`- public void Save()`
`117`		`- {`
`118`		`- _storage.Save();`
`119`		`- }`
`120`		`-`
`121`	`119`	`public List<Result> LoadContextMenus(Result selectedResult)`
`122`	`120`	`{`
`123`	`121`	`return new List<Result>() {`
Original file line number	Diff line number	Diff line change
`@@ -9,27 +9,20 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels`
`9`	`9`	`{`
`10`	`10`	`public class SettingsViewModel`
`11`	`11`	`{`
`12`		`- private readonly PluginJsonStorage<Settings> storage;`
`13`		`-`
`14`	`12`	`internal Settings Settings { get; set; }`
`15`	`13`
`16`	`14`	`internal PluginInitContext Context { get; set; }`
`17`	`15`
`18`		`- public SettingsViewModel(PluginInitContext context)`
	`16`	`+ public SettingsViewModel(PluginInitContext context, Settings settings)`
`19`	`17`	`{`
`20`	`18`	`Context = context;`
`21`		`- storage = new PluginJsonStorage<Settings>();`
`22`		`- Settings = storage.Load();`
	`19`	`+ Settings = settings;`
`23`	`20`	`}`
`24`	`21`
`25`		`- public Task LoadStorage()`
`26`		`- {`
`27`		`- return Task.Run(() => Settings = storage.Load());`
`28`		`- }`
`29`	`22`
`30`	`23`	`public void Save()`
`31`	`24`	`{`
`32`		`- storage.Save();`
	`25`	`+ Context.API.SaveJsonStorage<Settings>();`
`33`	`26`	`}`
`34`	`27`
`35`	`28`	`internal void RemoveLinkFromQuickAccess(AccessLink selectedRow) => Settings.QuickAccessLinks.Remove(selectedRow);`
Original file line number	Diff line number	Diff line change
`@@ -3,19 +3,19 @@`
`3`	`3`
`4`	`4`	`namespace Flow.Launcher.Plugin.PluginsManager.ViewModels`
`5`	`5`	`{`
`6`		`- public class SettingsViewModel`
	`6`	`+ internal class SettingsViewModel`
`7`	`7`	`{`
`8`	`8`	`private readonly PluginJsonStorage<Settings> storage;`
`9`	`9`
`10`	`10`	`internal Settings Settings { get; set; }`
`11`	`11`
`12`	`12`	`internal PluginInitContext Context { get; set; }`
`13`	`13`
`14`		`- public SettingsViewModel(PluginInitContext context)`
	`14`	`+ public SettingsViewModel(PluginInitContext context, Settings settings)`
`15`	`15`	`{`
`16`	`16`	`Context = context;`
`17`	`17`	`storage = new PluginJsonStorage<Settings>();`
`18`		`- Settings = storage.Load();`
	`18`	`+ Settings = settings;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public void Save()`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public partial class PluginsManagerSettings`
`10`	`10`	`{`
`11`	`11`	`private readonly SettingsViewModel viewModel;`
`12`	`12`
`13`		`- public PluginsManagerSettings(SettingsViewModel viewModel)`
	`13`	`+ internal PluginsManagerSettings(SettingsViewModel viewModel)`
`14`	`14`	`{`
`15`	`15`	`InitializeComponent();`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,15 @@ public class Main : ISettingProvider, IAsyncPlugin, IPluginI18n, IContextMenu, I`
`25`	`25`
`26`	`26`	`private static BinaryStorage<Win32[]> _win32Storage;`
`27`	`27`	`private static BinaryStorage<UWP.Application[]> _uwpStorage;`
`28`		`- private readonly PluginJsonStorage<Settings> _settingsStorage;`
`29`	`28`
`30`	`29`	`public Main()`
`31`	`30`	`{`
`32`		`- _settingsStorage = new PluginJsonStorage<Settings>();`
	`31`	`+`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`public void Save()`
`36`	`35`	`{`
`37`		`- _settingsStorage.Save();`
	`36`	`+ _context.API.SaveJsonStorage<Settings>();`
`38`	`37`	`_win32Storage.Save(_win32s);`
`39`	`38`	`_uwpStorage.Save(_uwps);`
`40`	`39`	`}`
`@@ -71,7 +70,7 @@ public async Task InitAsync(PluginInitContext context)`
`71`	`70`	`{`
`72`	`71`	`_context = context;`
`73`	`72`
`74`		`- _settings = _settingsStorage.Load();`
	`73`	`+ _settings = context.API.LoadJsonStorage<Settings>();`
`75`	`74`
`76`	`75`	`await Task.Yield();`
`77`	`76`
Original file line number	Diff line number	Diff line change
`@@ -25,18 +25,11 @@ public class Main : IPlugin, ISettingProvider, IPluginI18n, IContextMenu, ISavab`
`25`	`25`	`private bool _winRStroked;`
`26`	`26`	`private readonly KeyboardSimulator _keyboardSimulator = new KeyboardSimulator(new InputSimulator());`
`27`	`27`
`28`		`- private readonly Settings _settings;`
`29`		`- private readonly PluginJsonStorage<Settings> _storage;`
`30`		`-`
`31`		`- public Main()`
`32`		`- {`
`33`		`- _storage = new PluginJsonStorage<Settings>();`
`34`		`- _settings = _storage.Load();`
`35`		`- }`
	`28`	`+ private Settings _settings;`
`36`	`29`
`37`	`30`	`public void Save()`
`38`	`31`	`{`
`39`		`- _storage.Save();`
	`32`	`+ context.API.SaveJsonStorage<Settings>();`
`40`	`33`	`}`
`41`	`34`
`42`	`35`
`@@ -285,6 +278,7 @@ public void Init(PluginInitContext context)`
`285`	`278`	`{`
`286`	`279`	`this.context = context;`
`287`	`280`	`context.API.GlobalKeyboardEvent += API_GlobalKeyboardEvent;`
	`281`	`+ _settings = context.API.LoadJsonStorage<Settings>();`
`288`	`282`	`}`
`289`	`283`
`290`	`284`	`bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)`