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

Use api function & rename function

Browse source
This commit is contained in:
Jack251970 2025-07-21 16:57:35 +08:00
parent 8b60d26f5e
commit 566572b013
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ namespace Flow.Launcher.Core.Plugin
/// </summary>
public static void Save()
{
foreach (var pluginPair in GetAllPlugins())
foreach (var pluginPair in GetAllInitializedPlugins())
{
var savable = pluginPair.Plugin as ISavable;
try
@ -76,7 +76,7 @@ namespace Flow.Launcher.Core.Plugin
public static async ValueTask DisposePluginsAsync()
{
foreach (var pluginPair in GetAllPlugins())
foreach (var pluginPair in GetAllInitializedPlugins())
{
await DisposePluginAsync(pluginPair);
}
@ -104,7 +104,7 @@ namespace Flow.Launcher.Core.Plugin
public static async Task ReloadDataAsync()
{
await Task.WhenAll([.. GetAllPlugins().Select(plugin => plugin.Plugin switch
await Task.WhenAll([.. GetAllInitializedPlugins().Select(plugin => plugin.Plugin switch
{
IReloadable p => Task.Run(p.ReloadData),
IAsyncReloadable p => p.ReloadDataAsync(),
@ -118,7 +118,7 @@ namespace Flow.Launcher.Core.Plugin
public static async Task OpenExternalPreviewAsync(string path, bool sendFailToast = true)
{
await Task.WhenAll([.. GetAllPlugins().Select(plugin => plugin.Plugin switch
await Task.WhenAll([.. GetAllInitializedPlugins().Select(plugin => plugin.Plugin switch
{
IAsyncExternalPreview p => p.OpenPreviewAsync(path, sendFailToast),
_ => Task.CompletedTask,
@ -127,7 +127,7 @@ namespace Flow.Launcher.Core.Plugin
public static async Task CloseExternalPreviewAsync()
{
await Task.WhenAll([.. GetAllPlugins().Select(plugin => plugin.Plugin switch
await Task.WhenAll([.. GetAllInitializedPlugins().Select(plugin => plugin.Plugin switch
{
IAsyncExternalPreview p => p.ClosePreviewAsync(),
_ => Task.CompletedTask,
@ -136,7 +136,7 @@ namespace Flow.Launcher.Core.Plugin
public static async Task SwitchExternalPreviewAsync(string path, bool sendFailToast = true)
{
await Task.WhenAll([.. GetAllPlugins().Select(plugin => plugin.Plugin switch
await Task.WhenAll([.. GetAllInitializedPlugins().Select(plugin => plugin.Plugin switch
{
IAsyncExternalPreview p => p.SwitchPreviewAsync(path, sendFailToast),
_ => Task.CompletedTask,
@ -512,14 +512,14 @@ namespace Flow.Launcher.Core.Plugin
/// <returns></returns>
public static PluginPair GetPluginForId(string id)
{
return GetAllPlugins().FirstOrDefault(o => o.Metadata.ID == id);
return GetAllInitializedPlugins().FirstOrDefault(o => o.Metadata.ID == id);
}
#endregion
#region Get Plugin List
public static List<PluginPair> GetAllPlugins()
public static List<PluginPair> GetAllInitializedPlugins()
{
return [.. _allPlugins.Values];
}
@ -697,7 +697,7 @@ namespace Flow.Launcher.Core.Plugin
if (!Version.TryParse(newMetadata.Version, out var newVersion))
return true; // If version is not valid, we assume it is lesser than any existing version
return GetAllPlugins().Any(x => x.Metadata.ID == newMetadata.ID
return GetAllInitializedPlugins().Any(x => x.Metadata.ID == newMetadata.ID
&& Version.TryParse(x.Metadata.Version, out var version)
&& newVersion <= version);
}
@ -839,7 +839,7 @@ namespace Flow.Launcher.Core.Plugin
// If we want to remove plugin from AllPlugins,
// we need to dispose them so that they can release file handles
// which can help FL to delete the plugin settings & cache folders successfully
var pluginPairs = GetAllPlugins().Where(p => p.Metadata.ID == plugin.ID).ToList();
var pluginPairs = GetAllInitializedPlugins().Where(p => p.Metadata.ID == plugin.ID).ToList();
foreach (var pluginPair in pluginPairs)
{
await DisposePluginAsync(pluginPair);

2
Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
View file

@ -171,7 +171,7 @@ namespace Flow.Launcher.Plugin
string GetTranslation(string key);
/// <summary>
/// Get all loaded plugins
/// Get all initialized plugins
/// </summary>
/// <returns></returns>
List<PluginPair> GetAllPlugins();

2
Flow.Launcher/PublicAPIInstance.cs
View file

@ -251,7 +251,7 @@ namespace Flow.Launcher
public string GetTranslation(string key) => Internationalization.GetTranslation(key);
public List<PluginPair> GetAllPlugins() => PluginManager.GetAllPlugins();
public List<PluginPair> GetAllPlugins() => PluginManager.GetAllInitializedPlugins();
public MatchResult FuzzySearch(string query, string stringToCompare) =>
StringMatcher.FuzzySearch(query, stringToCompare);

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

@ -114,8 +114,9 @@ public partial class SettingsPanePluginsViewModel : BaseModel
}
}
private IList<PluginViewModel>? _pluginViewModels;
public IList<PluginViewModel> PluginViewModels => _pluginViewModels ??= PluginManager.GetAllPlugins()
private List<PluginViewModel>? _pluginViewModels;
// Get all initialized plugins and ignore those that are not initialized
public List<PluginViewModel> PluginViewModels => _pluginViewModels ??= App.API.GetAllPlugins()
.OrderBy(plugin => plugin.Metadata.Disabled)
.ThenBy(plugin => plugin.Metadata.Name)
.Select(plugin => new PluginViewModel