Skip to content

Commit ed16d34

Browse files
committed
Improve code quality
1 parent 23a1e5b commit ed16d34

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Flow.Launcher.Plugin.SharedCommands;
1515
using System.Text.Json;
1616
using Flow.Launcher.Core.Resource;
17+
using CommunityToolkit.Mvvm.DependencyInjection;
1718

1819
namespace Flow.Launcher.Core.Plugin
1920
{
@@ -28,7 +29,7 @@ public static class PluginManager
2829
public static readonly HashSet<PluginPair> GlobalPlugins = new();
2930
public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
3031

31-
public static IPublicAPI API { private set; get; }
32+
public static IPublicAPI API { get; private set; } = Ioc.Default.GetRequiredService<IPublicAPI>();
3233

3334
private static PluginsSettings Settings;
3435
private static List<PluginMetadata> _metadatas;
@@ -158,9 +159,8 @@ public static void LoadPlugins(PluginsSettings settings)
158159
/// Call initialize for all plugins
159160
/// </summary>
160161
/// <returns>return the list of failed to init plugins or null for none</returns>
161-
public static async Task InitializePluginsAsync(IPublicAPI api)
162+
public static async Task InitializePluginsAsync()
162163
{
163-
API = api;
164164
var failedPlugins = new ConcurrentQueue<PluginPair>();
165165

166166
var InitTasks = AllPlugins.Select(pair => Task.Run(async delegate

Flow.Launcher.Infrastructure/Http/Http.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System;
99
using System.Threading;
1010
using Flow.Launcher.Plugin;
11+
using CommunityToolkit.Mvvm.DependencyInjection;
1112

1213
namespace Flow.Launcher.Infrastructure.Http
1314
{
@@ -17,7 +18,7 @@ public static class Http
1718

1819
private static HttpClient client = new HttpClient();
1920

20-
public static IPublicAPI API { get; set; }
21+
private static IPublicAPI API { get; set; } = Ioc.Default.GetRequiredService<IPublicAPI>();
2122

2223
static Http()
2324
{

Flow.Launcher/App.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,9 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
9999

100100
PluginManager.LoadPlugins(_settings.PluginSettings);
101101

102-
Http.API = API;
103102
Http.Proxy = _settings.Proxy;
104103

105-
await PluginManager.InitializePluginsAsync(API);
104+
await PluginManager.InitializePluginsAsync();
106105
await imageLoadertask;
107106

108107
var mainVM = Ioc.Default.GetRequiredService<MainViewModel>();

0 commit comments

Comments
 (0)