Merge pull request #3795 from Flow-Launcher/check_plugin_modified

Check plugin modified state for more lists and improve code quality

Author: Jack251970

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -24,9 +24,6 @@ public static class PluginManager
     {
         private static readonly string ClassName = nameof(PluginManager);
 
-        private static IEnumerable<PluginPair> _contextMenuPlugins;
-        private static IEnumerable<PluginPair> _homePlugins;
-
         public static List<PluginPair> AllPlugins { get; private set; }
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
         public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
@@ -36,8 +33,12 @@ public static class PluginManager
         private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
 
         private static PluginsSettings Settings;
-        private static List<PluginMetadata> _metadatas;
-        private static readonly List<string> _modifiedPlugins = new();
+        private static readonly ConcurrentBag<string> ModifiedPlugins = new();
+
+        private static IEnumerable<PluginPair> _contextMenuPlugins;
+        private static IEnumerable<PluginPair> _homePlugins;
+        private static IEnumerable<PluginPair> _resultUpdatePlugin;
+        private static IEnumerable<PluginPair> _translationPlugins;
 
         /// <summary>
         /// Directories that will hold Flow Launcher plugin directory
@@ -173,12 +174,18 @@ static PluginManager()
         /// <param name="settings"></param>
         public static void LoadPlugins(PluginsSettings settings)
         {
-            _metadatas = PluginConfig.Parse(Directories);
+            var metadatas = PluginConfig.Parse(Directories);
             Settings = settings;
-            Settings.UpdatePluginSettings(_metadatas);
-            AllPlugins = PluginsLoader.Plugins(_metadatas, Settings);
+            Settings.UpdatePluginSettings(metadatas);
+            AllPlugins = PluginsLoader.Plugins(metadatas, Settings);
             // Since dotnet plugins need to get assembly name first, we should update plugin directory after loading plugins
-            UpdatePluginDirectory(_metadatas);
+            UpdatePluginDirectory(metadatas);
+
+            // Initialize plugin enumerable after all plugins are initialized
+            _contextMenuPlugins = GetPluginsForInterface<IContextMenu>();
+            _homePlugins = GetPluginsForInterface<IAsyncHomeQuery>();
+            _resultUpdatePlugin = GetPluginsForInterface<IResultUpdated>();
+            _translationPlugins = GetPluginsForInterface<IPluginI18n>();
         }
 
         private static void UpdatePluginDirectory(List<PluginMetadata> metadatas)
@@ -248,9 +255,6 @@ public static async Task InitializePluginsAsync()
 
             await Task.WhenAll(InitTasks);
 
-            _contextMenuPlugins = GetPluginsForInterface<IContextMenu>();
-            _homePlugins = GetPluginsForInterface<IAsyncHomeQuery>();
-
             foreach (var plugin in AllPlugins)
             {
                 // set distinct on each plugin's action keywords helps only firing global(*) and action keywords once where a plugin
@@ -409,16 +413,26 @@ public static PluginPair GetPluginForId(string id)
             return AllPlugins.FirstOrDefault(o => o.Metadata.ID == id);
         }
 
-        public static IEnumerable<PluginPair> GetPluginsForInterface<T>() where T : IFeatures
+        private static IEnumerable<PluginPair> GetPluginsForInterface<T>() where T : IFeatures
         {
             // Handle scenario where this is called before all plugins are instantiated, e.g. language change on startup
             return AllPlugins?.Where(p => p.Plugin is T) ?? Array.Empty<PluginPair>();
         }
 
+        public static IList<PluginPair> GetResultUpdatePlugin()
+        {
+            return _resultUpdatePlugin.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+        }
+
+        public static IList<PluginPair> GetTranslationPlugins()
+        {
+            return _translationPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+        }
+
         public static List<Result> GetContextMenusForPlugin(Result result)
         {
             var results = new List<Result>();
-            var pluginPair = _contextMenuPlugins.FirstOrDefault(o => o.Metadata.ID == result.PluginID);
+            var pluginPair = _contextMenuPlugins.Where(p => !PluginModified(p.Metadata.ID)).FirstOrDefault(o => o.Metadata.ID == result.PluginID);
             if (pluginPair != null)
             {
                 var plugin = (IContextMenu)pluginPair.Plugin;
@@ -446,7 +460,7 @@ public static List<Result> GetContextMenusForPlugin(Result result)
 
         public static bool IsHomePlugin(string id)
         {
-            return _homePlugins.Any(p => p.Metadata.ID == id);
+            return _homePlugins.Where(p => !PluginModified(p.Metadata.ID)).Any(p => p.Metadata.ID == id);
         }
 
         public static bool ActionKeywordRegistered(string actionKeyword)
@@ -544,14 +558,14 @@ private static bool SameOrLesserPluginVersionExists(string metadataPath)
 
         public static bool PluginModified(string id)
         {
-            return _modifiedPlugins.Contains(id);
+            return ModifiedPlugins.Contains(id);
         }
 
         public static async Task UpdatePluginAsync(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
         {
-            InstallPlugin(newVersion, zipFilePath, checkModified:false);
-            await UninstallPluginAsync(existingVersion, removePluginFromSettings:false, removePluginSettings:false, checkModified: false);
-            _modifiedPlugins.Add(existingVersion.ID);
+            InstallPlugin(newVersion, zipFilePath, checkModified: false);
+            await UninstallPluginAsync(existingVersion, removePluginFromSettings: false, removePluginSettings: false, checkModified: false);
+            ModifiedPlugins.Add(existingVersion.ID);
         }
 
         public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
@@ -638,7 +652,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
 
             if (checkModified)
             {
-                _modifiedPlugins.Add(plugin.ID);
+                ModifiedPlugins.Add(plugin.ID);
             }
         }
 
@@ -713,7 +727,7 @@ internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool remo
 
             if (checkModified)
             {
-                _modifiedPlugins.Add(plugin.ID);
+                ModifiedPlugins.Add(plugin.ID);
             }
         }
 

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -74,7 +74,7 @@ public static void InitSystemLanguageCode()
 
         private void AddPluginLanguageDirectories()
         {
-            foreach (var plugin in PluginManager.GetPluginsForInterface<IPluginI18n>())
+            foreach (var plugin in PluginManager.GetTranslationPlugins())
             {
                 var location = Assembly.GetAssembly(plugin.Plugin.GetType()).Location;
                 var dir = Path.GetDirectoryName(location);
@@ -278,7 +278,8 @@ public static string GetTranslation(string key)
 
         private void UpdatePluginMetadataTranslations()
         {
-            foreach (var p in PluginManager.GetPluginsForInterface<IPluginI18n>())
+            // Update plugin metadata name & description
+            foreach (var p in PluginManager.GetTranslationPlugins())
             {
                 if (p.Plugin is not IPluginI18n pluginI18N) return;
                 try

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -260,7 +260,7 @@ void continueAction(Task t)
 
         public void RegisterResultsUpdatedEvent()
         {
-            foreach (var pair in PluginManager.GetPluginsForInterface<IResultUpdated>())
+            foreach (var pair in PluginManager.GetResultUpdatePlugin())
             {
                 var plugin = (IResultUpdated)pair.Plugin;
                 plugin.ResultsUpdated += (s, e) =>