Skip to content

Commit 4abc9d8

Browse files
committed
refactor Core.Plugin.PluginConfig
1 parent 2fd318f commit 4abc9d8

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

Flow.Launcher.Core/Plugin/PluginConfig.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.IO;
5-
using System.Threading.Tasks;
65
using Newtonsoft.Json;
7-
using Flow.Launcher.Infrastructure.Exception;
86
using Flow.Launcher.Infrastructure.Logger;
97
using Flow.Launcher.Plugin;
108

@@ -14,23 +12,17 @@ namespace Flow.Launcher.Core.Plugin
1412
internal abstract class PluginConfig
1513
{
1614
private const string PluginConfigName = "plugin.json";
17-
private static readonly List<PluginMetadata> PluginMetadatas = new List<PluginMetadata>();
1815

1916
/// <summary>
20-
/// Parse plugin metadata in giving directories
17+
/// Parse plugin metadata in the given directories
2118
/// </summary>
2219
/// <param name="pluginDirectories"></param>
2320
/// <returns></returns>
2421
public static List<PluginMetadata> Parse(string[] pluginDirectories)
2522
{
26-
PluginMetadatas.Clear();
23+
var allPluginMetadata = new List<PluginMetadata>();
2724
var directories = pluginDirectories.SelectMany(Directory.GetDirectories);
28-
ParsePluginConfigs(directories);
29-
return PluginMetadatas;
30-
}
3125

32-
private static void ParsePluginConfigs(IEnumerable<string> directories)
33-
{
3426
// todo use linq when diable plugin is implmented since parallel.foreach + list is not thread saft
3527
foreach (var directory in directories)
3628
{
@@ -50,10 +42,12 @@ private static void ParsePluginConfigs(IEnumerable<string> directories)
5042
PluginMetadata metadata = GetPluginMetadata(directory);
5143
if (metadata != null)
5244
{
53-
PluginMetadatas.Add(metadata);
45+
allPluginMetadata.Add(metadata);
5446
}
5547
}
5648
}
49+
50+
return allPluginMetadata;
5751
}
5852

5953
private static PluginMetadata GetPluginMetadata(string pluginDirectory)
@@ -81,7 +75,6 @@ private static PluginMetadata GetPluginMetadata(string pluginDirectory)
8175
return null;
8276
}
8377

84-
8578
if (!AllowedLanguage.IsAllowed(metadata.Language))
8679
{
8780
Log.Error($"|PluginConfig.GetPluginMetadata|Invalid language <{metadata.Language}> for config <{configPath}>");

0 commit comments

Comments
 (0)