From 54a0f3d16523ecaa32408277dc30800537094e89 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 9 Feb 2025 10:58:09 +0800
Subject: [PATCH] Add support for delete plugin directory for non-dotnet
 plugins

---
 .../Plugin/JsonRPCPluginBase.cs               | 14 +++-
 Flow.Launcher.Core/Plugin/PluginManager.cs    | 70 ++++++++++++-------
 2 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs
index f6e5e5879..ed8f94bcf 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs
@@ -44,8 +44,10 @@ namespace Flow.Launcher.Core.Plugin
         private string SettingConfigurationPath =>
             Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
 
-        private string SettingPath => Path.Combine(DataLocation.PluginSettingsDirectory,
-            Context.CurrentPluginMetadata.Name, "Settings.json");
+        private string SettingDirectory => Path.Combine(DataLocation.PluginSettingsDirectory,
+            Context.CurrentPluginMetadata.Name);
+
+        private string SettingPath => Path.Combine(SettingDirectory, "Settings.json");
 
         public abstract List<Result> LoadContextMenus(Result selectedResult);
 
@@ -159,5 +161,13 @@ namespace Flow.Launcher.Core.Plugin
         {
             return Settings.CreateSettingPanel();
         }
+
+        public void DeletePluginSettingsDirectory()
+        {
+            if (Directory.Exists(SettingDirectory))
+            {
+                Directory.Delete(SettingDirectory, true);
+            }
+        }
     }
 }
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index 50150a069..2bce2ba79 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -544,38 +544,56 @@ namespace Flow.Launcher.Core.Plugin
                 throw new ArgumentException($"Plugin {plugin.Name} has been modified");
             }
 
+            if (removePluginSettings)
+            {
+                if (AllowedLanguage.IsDotNet(plugin.Language))  // for the plugin in .NET, we can use assembly loader
+                {
+                    var assemblyLoader = new PluginAssemblyLoader(plugin.ExecuteFilePath);
+                    var assembly = assemblyLoader.LoadAssemblyAndDependencies();
+                    var assemblyName = assembly.GetName().Name;
+
+                    // 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)
+                    {
+                        var deleteMethod = pluginJsonStorage.GetType().GetMethod("DeleteDirectory");
+                        try
+                        {
+                            deleteMethod?.Invoke(pluginJsonStorage, null);
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Exception($"|PluginManager.UninstallPlugin|Failed to delete plugin json folder for {plugin.Name}", e);
+                        }
+                    }
+                }
+                else  // the plugin with json prc interface
+                {
+                    var pluginPair = AllPlugins.FirstOrDefault(p => p.Metadata.ID == plugin.ID);
+                    if (pluginPair != null && pluginPair.Plugin is JsonRPCPlugin jsonRpcPlugin)
+                    {
+                        try
+                        {
+                            jsonRpcPlugin.DeletePluginSettingsDirectory();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.Exception($"|PluginManager.UninstallPlugin|Failed to delete plugin json folder for {plugin.Name}", e);
+                        }
+                    }
+                }
+            }
+
             if (removePluginFromSettings)
             {
                 Settings.Plugins.Remove(plugin.ID);
                 AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);
             }
 
-            if (removePluginSettings)
-            {
-                var assemblyLoader = new PluginAssemblyLoader(plugin.ExecuteFilePath);
-                var assembly = assemblyLoader.LoadAssemblyAndDependencies();
-                var assemblyName = assembly.GetName().Name;
-
-                // 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)
-                {
-                    var deleteMethod = pluginJsonStorage.GetType().GetMethod("DeleteDirectory");
-                    try
-                    {
-                        deleteMethod?.Invoke(pluginJsonStorage, null);
-                    }
-                    catch (Exception e)
-                    {
-                        Log.Exception($"|PluginManager.UninstallPlugin|Failed to delete plugin json folder for {assemblyName}", e);
-                    }
-                }
-            }
-
             // Marked for deletion. Will be deleted on next start up
             using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, "NeedDelete.txt"));