Make PluginManager.API private

Jack251970 · Jack251970 · commit 10d3f4a3377b · 2025-02-25T12:41:13.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -29,7 +29,7 @@ public static class PluginManager
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
         public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
 
-        public static IPublicAPI API { get; private set; } = Ioc.Default.GetRequiredService<IPublicAPI>();
+        private static readonly IPublicAPI _api = Ioc.Default.GetRequiredService<IPublicAPI>();
 
         private static PluginsSettings Settings;
         private static List<PluginMetadata> _metadatas;
@@ -63,7 +63,7 @@ public static void Save()
                 savable?.Save();
             }
 
-            API.SavePluginSettings();
+            _api.SavePluginSettings();
         }
 
         public static async ValueTask DisposePluginsAsync()
@@ -168,7 +168,7 @@ public static async Task InitializePluginsAsync()
                 try
                 {
                     var milliseconds = await Stopwatch.DebugAsync($"|PluginManager.InitializePlugins|Init method time cost for <{pair.Metadata.Name}>",
-                        () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, API)));
+                        () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, _api)));
 
                     pair.Metadata.InitTime += milliseconds;
                     Log.Info(
@@ -209,10 +209,10 @@ public static async Task InitializePluginsAsync()
             if (failedPlugins.Any())
             {
                 var failed = string.Join(",", failedPlugins.Select(x => x.Metadata.Name));
-                API.ShowMsg(
-                    API.GetTranslation("failedToInitializePluginsTitle"),
+                _api.ShowMsg(
+                    _api.GetTranslation("failedToInitializePluginsTitle"),
                     string.Format(
-                        API.GetTranslation("failedToInitializePluginsMessage"),
+                        _api.GetTranslation("failedToInitializePluginsMessage"),
                         failed
                     ),
                     "",
@@ -519,7 +519,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
 
             var newPluginPath = Path.Combine(installDirectory, folderName);
 
-            FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => API.ShowMsgBox(s));
+            FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => _api.ShowMsgBox(s));
 
             try
             {
@@ -554,8 +554,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro
 
                     // if user want to remove the plugin settings, we cannot call save method for the plugin json storage instance of this plugin
                     // so we need to remove it from the api instance
-                    var method = API.GetType().GetMethod("RemovePluginSettings");
-                    var pluginJsonStorage = method?.Invoke(API, new object[] { assemblyName });
+                    var method = _api.GetType().GetMethod("RemovePluginSettings");
+                    var pluginJsonStorage = method?.Invoke(_api, new object[] { assemblyName });
 
                     // if there exists a json storage for current plugin, we need to delete the directory path
                     if (pluginJsonStorage != null)
@@ -568,8 +568,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro
                         catch (Exception e)
                         {
                             Log.Exception($"|PluginManager.UninstallPlugin|Failed to delete plugin json folder for {plugin.Name}", e);
-                            API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),
-                                string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
+                            _api.ShowMsg(_api.GetTranslation("failedToRemovePluginSettingsTitle"),
+                                string.Format(_api.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
                         }
                     }
                 }
@@ -585,8 +585,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro
                         catch (Exception e)
                         {
                             Log.Exception($"|PluginManager.UninstallPlugin|Failed to delete plugin json folder for {plugin.Name}", e);
-                            API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),
-                                string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
+                            _api.ShowMsg(_api.GetTranslation("failedToRemovePluginSettingsTitle"),
+                                string.Format(_api.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
                         }
                     }
                 }
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
@@ -438,7 +438,7 @@ private void CheckFirstLaunch()
             if (_settings.FirstLaunch)
             {
                 _settings.FirstLaunch = false;
-                PluginManager.API.SaveAppAllSettings();
+                App.API.SaveAppAllSettings();
                 OpenWelcomeWindow();
             }
         }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -6,7 +6,6 @@
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
-using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -77,15 +76,15 @@ private void AskClearLogFolderConfirmation()
     [RelayCommand]
     private void OpenSettingsFolder()
     {
-        PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
+        App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
     }
 
     [RelayCommand]
     private void OpenParentOfSettingsFolder(object parameter)
     {
         string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
         string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
-        PluginManager.API.OpenDirectory(parentFolderPath);
+        App.API.OpenDirectory(parentFolderPath);
     }
 
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -3,7 +3,6 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Navigation;
-using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
 
@@ -49,7 +48,7 @@ private void SettingsPanePlugins_OnKeyDown(object sender, KeyEventArgs e)
 
     private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
     {
-        PluginManager.API.OpenUrl(e.Uri.AbsoluteUri);
+        App.API.OpenUrl(e.Uri.AbsoluteUri);
         e.Handled = true;
     }
 
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -442,7 +442,7 @@ private void OpenSetting()
         [RelayCommand]
         private void SelectHelp()
         {
-            PluginManager.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
+            App.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
         }
 
         [RelayCommand]
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -134,20 +134,20 @@ private void OpenPluginDirectory()
         {
             var directory = PluginPair.Metadata.PluginDirectory;
             if (!string.IsNullOrEmpty(directory))
-                PluginManager.API.OpenDirectory(directory);
+                App.API.OpenDirectory(directory);
         }
 
         [RelayCommand]
         private void OpenSourceCodeLink()
         {
-            PluginManager.API.OpenUrl(PluginPair.Metadata.Website);
+            App.API.OpenUrl(PluginPair.Metadata.Website);
         }
 
         [RelayCommand]
         private void OpenDeletePluginWindow()
         {
-            PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
-            PluginManager.API.ShowMainWindow();
+            App.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
+            App.API.ShowMainWindow();
         }
 
         public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static class PluginManager`
`29`	`29`	`public static readonly HashSet<PluginPair> GlobalPlugins = new();`
`30`	`30`	`public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();`
`31`	`31`
`32`		`- public static IPublicAPI API { get; private set; } = Ioc.Default.GetRequiredService<IPublicAPI>();`
	`32`	`+ private static readonly IPublicAPI _api = Ioc.Default.GetRequiredService<IPublicAPI>();`
`33`	`33`
`34`	`34`	`private static PluginsSettings Settings;`
`35`	`35`	`private static List<PluginMetadata> _metadatas;`
`@@ -63,7 +63,7 @@ public static void Save()`
`63`	`63`	`savable?.Save();`
`64`	`64`	`}`
`65`	`65`
`66`		`- API.SavePluginSettings();`
	`66`	`+ _api.SavePluginSettings();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public static async ValueTask DisposePluginsAsync()`
`@@ -168,7 +168,7 @@ public static async Task InitializePluginsAsync()`
`168`	`168`	`try`
`169`	`169`	`{`
`170`	`170`	`var milliseconds = await Stopwatch.DebugAsync($"\|PluginManager.InitializePlugins\|Init method time cost for <{pair.Metadata.Name}>",`
`171`		`- () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, API)));`
	`171`	`+ () => pair.Plugin.InitAsync(new PluginInitContext(pair.Metadata, _api)));`
`172`	`172`
`173`	`173`	`pair.Metadata.InitTime += milliseconds;`
`174`	`174`	`Log.Info(`
`@@ -209,10 +209,10 @@ public static async Task InitializePluginsAsync()`
`209`	`209`	`if (failedPlugins.Any())`
`210`	`210`	`{`
`211`	`211`	`var failed = string.Join(",", failedPlugins.Select(x => x.Metadata.Name));`
`212`		`- API.ShowMsg(`
`213`		`- API.GetTranslation("failedToInitializePluginsTitle"),`
	`212`	`+ _api.ShowMsg(`
	`213`	`+ _api.GetTranslation("failedToInitializePluginsTitle"),`
`214`	`214`	`string.Format(`
`215`		`- API.GetTranslation("failedToInitializePluginsMessage"),`
	`215`	`+ _api.GetTranslation("failedToInitializePluginsMessage"),`
`216`	`216`	`failed`
`217`	`217`	`),`
`218`	`218`	`"",`
`@@ -519,7 +519,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c`
`519`	`519`
`520`	`520`	`var newPluginPath = Path.Combine(installDirectory, folderName);`
`521`	`521`
`522`		`- FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => API.ShowMsgBox(s));`
	`522`	`+ FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => _api.ShowMsgBox(s));`
`523`	`523`
`524`	`524`	`try`
`525`	`525`	`{`
`@@ -554,8 +554,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro`
`554`	`554`
`555`	`555`	`// if user want to remove the plugin settings, we cannot call save method for the plugin json storage instance of this plugin`
`556`	`556`	`// so we need to remove it from the api instance`
`557`		`- var method = API.GetType().GetMethod("RemovePluginSettings");`
`558`		`- var pluginJsonStorage = method?.Invoke(API, new object[] { assemblyName });`
	`557`	`+ var method = _api.GetType().GetMethod("RemovePluginSettings");`
	`558`	`+ var pluginJsonStorage = method?.Invoke(_api, new object[] { assemblyName });`
`559`	`559`
`560`	`560`	`// if there exists a json storage for current plugin, we need to delete the directory path`
`561`	`561`	`if (pluginJsonStorage != null)`
`@@ -568,8 +568,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro`
`568`	`568`	`catch (Exception e)`
`569`	`569`	`{`
`570`	`570`	`Log.Exception($"\|PluginManager.UninstallPlugin\|Failed to delete plugin json folder for {plugin.Name}", e);`
`571`		`- API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),`
`572`		`- string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));`
	`571`	`+ _api.ShowMsg(_api.GetTranslation("failedToRemovePluginSettingsTitle"),`
	`572`	`+ string.Format(_api.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));`
`573`	`573`	`}`
`574`	`574`	`}`
`575`	`575`	`}`
`@@ -585,8 +585,8 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro`
`585`	`585`	`catch (Exception e)`
`586`	`586`	`{`
`587`	`587`	`Log.Exception($"\|PluginManager.UninstallPlugin\|Failed to delete plugin json folder for {plugin.Name}", e);`
`588`		`- API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),`
`589`		`- string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));`
	`588`	`+ _api.ShowMsg(_api.GetTranslation("failedToRemovePluginSettingsTitle"),`
	`589`	`+ string.Format(_api.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`	`}`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ private void CheckFirstLaunch()`
`438`	`438`	`if (_settings.FirstLaunch)`
`439`	`439`	`{`
`440`	`440`	`_settings.FirstLaunch = false;`
`441`		`- PluginManager.API.SaveAppAllSettings();`
	`441`	`+ App.API.SaveAppAllSettings();`
`442`	`442`	`OpenWelcomeWindow();`
`443`	`443`	`}`
`444`	`444`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`using System.Windows;`
`7`	`7`	`using CommunityToolkit.Mvvm.Input;`
`8`	`8`	`using Flow.Launcher.Core;`
`9`		`-using Flow.Launcher.Core.Plugin;`
`10`	`9`	`using Flow.Launcher.Core.Resource;`
`11`	`10`	`using Flow.Launcher.Infrastructure;`
`12`	`11`	`using Flow.Launcher.Infrastructure.UserSettings;`
`@@ -77,15 +76,15 @@ private void AskClearLogFolderConfirmation()`
`77`	`76`	`[RelayCommand]`
`78`	`77`	`private void OpenSettingsFolder()`
`79`	`78`	`{`
`80`		`- PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));`
	`79`	`+ App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`[RelayCommand]`
`84`	`83`	`private void OpenParentOfSettingsFolder(object parameter)`
`85`	`84`	`{`
`86`	`85`	`string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);`
`87`	`86`	`string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);`
`88`		`- PluginManager.API.OpenDirectory(parentFolderPath);`
	`87`	`+ App.API.OpenDirectory(parentFolderPath);`
`89`	`88`	`}`
`90`	`89`
`91`	`90`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using System.Windows.Data;`
`4`	`4`	`using System.Windows.Input;`
`5`	`5`	`using System.Windows.Navigation;`
`6`		`-using Flow.Launcher.Core.Plugin;`
`7`	`6`	`using Flow.Launcher.SettingPages.ViewModels;`
`8`	`7`	`using Flow.Launcher.ViewModel;`
`9`	`8`
`@@ -49,7 +48,7 @@ private void SettingsPanePlugins_OnKeyDown(object sender, KeyEventArgs e)`
`49`	`48`
`50`	`49`	`private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)`
`51`	`50`	`{`
`52`		`- PluginManager.API.OpenUrl(e.Uri.AbsoluteUri);`
	`51`	`+ App.API.OpenUrl(e.Uri.AbsoluteUri);`
`53`	`52`	`e.Handled = true;`
`54`	`53`	`}`
`55`	`54`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ private void OpenSetting()`
`442`	`442`	`[RelayCommand]`
`443`	`443`	`private void SelectHelp()`
`444`	`444`	`{`
`445`		`- PluginManager.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");`
	`445`	`+ App.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`[RelayCommand]`
Original file line number	Diff line number	Diff line change
`@@ -134,20 +134,20 @@ private void OpenPluginDirectory()`
`134`	`134`	`{`
`135`	`135`	`var directory = PluginPair.Metadata.PluginDirectory;`
`136`	`136`	`if (!string.IsNullOrEmpty(directory))`
`137`		`- PluginManager.API.OpenDirectory(directory);`
	`137`	`+ App.API.OpenDirectory(directory);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`[RelayCommand]`
`141`	`141`	`private void OpenSourceCodeLink()`
`142`	`142`	`{`
`143`		`- PluginManager.API.OpenUrl(PluginPair.Metadata.Website);`
	`143`	`+ App.API.OpenUrl(PluginPair.Metadata.Website);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`[RelayCommand]`
`147`	`147`	`private void OpenDeletePluginWindow()`
`148`	`148`	`{`
`149`		`- PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);`
`150`		`- PluginManager.API.ShowMainWindow();`
	`149`	`+ App.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);`
	`150`	`+ App.API.ShowMainWindow();`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);`