Move storage to api call for websearch and calculator plugins

Author: taooceros

Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs

@@ -9,7 +9,7 @@ public PluginJsonStorage()
         {
             // C# related, add python related below
             var dataType = typeof(T);
-            var assemblyName = typeof(T).Assembly.GetName().Name;
+            var assemblyName = dataType.Assembly.GetName().Name;
             DirectoryPath = Path.Combine(DataLocation.DataDirectory(), DirectoryName, Constant.Plugins, assemblyName);
             Helper.ValidateDirectory(DirectoryPath);
 

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

@@ -33,9 +33,8 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider
         public void Init(PluginInitContext context)
         {
             Context = context;
-
-            _viewModel = new SettingsViewModel();
-            _settings = _viewModel.Settings;
+            _settings = context.API.LoadJsonStorage<Settings>();
+            _viewModel = new SettingsViewModel(_settings);
 
             MagesEngine = new Engine(new Configuration
             {

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

@@ -10,15 +10,12 @@ namespace Flow.Launcher.Plugin.Caculator.ViewModels
 {
     public class SettingsViewModel : BaseModel
     {
-        private readonly PluginJsonStorage<Settings> _storage;
-
-        public SettingsViewModel()
+        public SettingsViewModel(Settings settings)
         {
-            _storage = new PluginJsonStorage<Settings>();
-            Settings = _storage.Load();
+            Settings = settings;
         }
 
-        public Settings Settings { get; set; }
+        public Settings Settings { get; init; }
 
         public IEnumerable<int> MaxDecimalPlacesRange => Enumerable.Range(1, 20);
     }

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

@@ -5,16 +5,13 @@ namespace Flow.Launcher.Plugin.PluginsManager.ViewModels
 {
     internal class SettingsViewModel
     {
-        private readonly PluginJsonStorage<Settings> storage;
-
         internal Settings Settings { get; set; }
 
         internal PluginInitContext Context { get; set; }
 
         public SettingsViewModel(PluginInitContext context, Settings settings)
         {
             Context = context;
-            storage = new PluginJsonStorage<Settings>();
             Settings = settings;
         }
     }

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

@@ -18,8 +18,8 @@ public class Main : IAsyncPlugin, ISettingProvider, IPluginI18n, IResultUpdated
     {
         private PluginInitContext _context;
 
-        private readonly Settings _settings;
-        private readonly SettingsViewModel _viewModel;
+        private Settings _settings;
+        private SettingsViewModel _viewModel;
 
         internal const string Images = "Images";
         internal static string DefaultImagesDirectory;
@@ -160,19 +160,17 @@ private async Task<IEnumerable<Result>> SuggestionsAsync(string keyword, string
             return new List<Result>();
         }
 
-        public Main()
-        {
-            _viewModel = new SettingsViewModel();
-            _settings = _viewModel.Settings;
-        }
-
         public Task InitAsync(PluginInitContext context)
         {
             return Task.Run(Init);
 
             void Init()
             {
                 _context = context;
+
+                _settings = _context.API.LoadJsonStorage<Settings>();
+                _viewModel = new SettingsViewModel(_settings);
+                
                 var pluginDirectory = _context.CurrentPluginMetadata.PluginDirectory;
                 var bundledImagesDirectory = Path.Combine(pluginDirectory, Images);
 

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

@@ -6,13 +6,12 @@ public class SettingsViewModel
     {
         private readonly PluginJsonStorage<Settings> _storage;
 
-        public SettingsViewModel()
+        public SettingsViewModel(Settings settings)
         {
-            _storage = new PluginJsonStorage<Settings>();
-            Settings = _storage.Load();
+            Settings = settings;
         }
 
-        public Settings Settings { get; set; }
+        public Settings Settings { get; }
 
         public void Save()
         {