Fix issue that plugin manager will save settings for the uninstalled and settings-removed plugins

Author: Jack251970

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -14,7 +14,6 @@
 using Flow.Launcher.Plugin.SharedCommands;
 using System.Text.Json;
 using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.Storage;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -548,10 +547,17 @@ internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFro
                 var assemblyLoader = new PluginAssemblyLoader(plugin.ExecuteFilePath);
                 var assembly = assemblyLoader.LoadAssemblyAndDependencies();
                 var assemblyName = assembly.GetName().Name;
-                var directoryPath = Path.Combine(DataLocation.DataDirectory(), JsonStorage<object>.DirectoryName, Constant.Plugins, assemblyName);
-                if (Directory.Exists(directoryPath))
+
+                // if user want to remove the plugin settings, we cannot call save method for the plugin json storage instance of this plugin
+                // so we need to remove it from the api instance
+                var method = API.GetType().GetMethod("RemovePluginSettings");
+                var pluginJsonStorage = method?.Invoke(API, new object[] { assemblyName });
+
+                // if there exists a json storage for current plugin, we need to delete the directory path
+                if (pluginJsonStorage != null)
                 {
-                    Directory.Delete(directoryPath, true);
+                    var deleteMethod = pluginJsonStorage.GetType().GetMethod("DeleteDirectory");
+                    deleteMethod?.Invoke(pluginJsonStorage, null);
                 }
             }
 

Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs

@@ -3,14 +3,17 @@
 
 namespace Flow.Launcher.Infrastructure.Storage
 {
-    public class PluginJsonStorage<T> :JsonStorage<T> where T : new()
+    public class PluginJsonStorage<T> : JsonStorage<T> where T : new()
     {
+        // Use assembly name to check which plugin is using this storage
+        public readonly string AssemblyName;
+
         public PluginJsonStorage()
         {
             // C# related, add python related below
             var dataType = typeof(T);
-            var assemblyName = dataType.Assembly.GetName().Name;
-            DirectoryPath = Path.Combine(DataLocation.DataDirectory(), DirectoryName, Constant.Plugins, assemblyName);
+            AssemblyName = dataType.Assembly.GetName().Name;
+            DirectoryPath = Path.Combine(DataLocation.DataDirectory(), DirectoryName, Constant.Plugins, AssemblyName);
             Helper.ValidateDirectory(DirectoryPath);
 
             FilePath = Path.Combine(DirectoryPath, $"{dataType.Name}{FileSuffix}");
@@ -20,6 +23,13 @@ public PluginJsonStorage(T data) : this()
         {
             Data = data;
         }
+
+        public void DeleteDirectory()
+        {
+            if (Directory.Exists(DirectoryPath))
+            {
+                Directory.Delete(DirectoryPath, true);
+            }
+        }
     }
 }
-

Flow.Launcher/PublicAPIInstance.cs

@@ -189,6 +189,23 @@ public void LogException(string className, string message, Exception e,
 
         private readonly ConcurrentDictionary<Type, object> _pluginJsonStorages = new();
 
+        public object RemovePluginSettings(string assemblyName)
+        {
+            foreach (var keyValuePair in _pluginJsonStorages)
+            {
+                var key = keyValuePair.Key;
+                var value = keyValuePair.Value;
+                var name = value.GetType().GetField("AssemblyName")?.GetValue(value)?.ToString();
+                if (name == assemblyName)
+                {
+                    _pluginJsonStorages.Remove(key, out var pluginJsonStorage);
+                    return pluginJsonStorage;
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Save plugin settings.
         /// </summary>