prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3297 from Jack251970/dependency_injection_mainvm

Browse source 
Fix API instance create twice issue & Make PluginManager.API private
This commit is contained in:
Jack Ye 2025-02-28 22:55:18 +08:00 committed by GitHub
commit 79d54d0020
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher.Core/Plugin/PluginManager.cs
View file

@ -29,7 +29,9 @@ namespace Flow.Launcher.Core.Plugin
public static readonly HashSet<PluginPair> GlobalPlugins = new(); public static readonly HashSet<PluginPair> GlobalPlugins = new();
public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new(); public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
public static IPublicAPI API { get; private set; } = Ioc.Default.GetRequiredService<IPublicAPI>(); // We should not initialize API in static constructor because it will create another API instance
private static IPublicAPI api = null;
private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
private static PluginsSettings Settings; private static PluginsSettings Settings;
private static List<PluginMetadata> _metadatas; private static List<PluginMetadata> _metadatas;

2
Flow.Launcher/MainWindow.xaml.cs
View file

@ -438,7 +438,7 @@ namespace Flow.Launcher
if (_settings.FirstLaunch) if (_settings.FirstLaunch)
{ {
_settings.FirstLaunch = false; _settings.FirstLaunch = false;
PluginManager.API.SaveAppAllSettings(); App.API.SaveAppAllSettings();
OpenWelcomeWindow(); OpenWelcomeWindow();
} }
} }

5
Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
View file

@ -6,7 +6,6 @@ using System.Threading.Tasks;
using System.Windows; using System.Windows;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using Flow.Launcher.Core; using Flow.Launcher.Core;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Core.Resource; using Flow.Launcher.Core.Resource;
using Flow.Launcher.Infrastructure; using Flow.Launcher.Infrastructure;
using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Infrastructure.UserSettings;
@ -77,7 +76,7 @@ public partial class SettingsPaneAboutViewModel : BaseModel
[RelayCommand] [RelayCommand]
private void OpenSettingsFolder() private void OpenSettingsFolder()
{ {
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings)); App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
} }
[RelayCommand] [RelayCommand]
@ -85,7 +84,7 @@ public partial class SettingsPaneAboutViewModel : BaseModel
{ {
string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings); string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
string parentFolderPath = Path.GetDirectoryName(settingsFolderPath); string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
PluginManager.API.OpenDirectory(parentFolderPath); App.API.OpenDirectory(parentFolderPath);
} }

3
Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
View file

@ -3,7 +3,6 @@ using System.ComponentModel;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Navigation; using System.Windows.Navigation;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.SettingPages.ViewModels; using Flow.Launcher.SettingPages.ViewModels;
using Flow.Launcher.ViewModel; using Flow.Launcher.ViewModel;
@ -49,7 +48,7 @@ public partial class SettingsPanePluginStore
private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e) private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{ {
PluginManager.API.OpenUrl(e.Uri.AbsoluteUri); App.API.OpenUrl(e.Uri.AbsoluteUri);
e.Handled = true; e.Handled = true;
} }

2
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -442,7 +442,7 @@ namespace Flow.Launcher.ViewModel
[RelayCommand] [RelayCommand]
private void SelectHelp() private void SelectHelp()
{ {
PluginManager.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips"); App.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
} }
[RelayCommand] [RelayCommand]

8
Flow.Launcher/ViewModel/PluginViewModel.cs
View file

@ -134,20 +134,20 @@ namespace Flow.Launcher.ViewModel
{ {
var directory = PluginPair.Metadata.PluginDirectory; var directory = PluginPair.Metadata.PluginDirectory;
if (!string.IsNullOrEmpty(directory)) if (!string.IsNullOrEmpty(directory))
PluginManager.API.OpenDirectory(directory); App.API.OpenDirectory(directory);
} }
[RelayCommand] [RelayCommand]
private void OpenSourceCodeLink() private void OpenSourceCodeLink()
{ {
PluginManager.API.OpenUrl(PluginPair.Metadata.Website); App.API.OpenUrl(PluginPair.Metadata.Website);
} }
[RelayCommand] [RelayCommand]
private void OpenDeletePluginWindow() private void OpenDeletePluginWindow()
{ {
PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true); App.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
PluginManager.API.ShowMainWindow(); App.API.ShowMainWindow();
} }
public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword); public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);