Use context plugin settings path

Author: Jack251970

Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs

@@ -115,10 +115,11 @@ private IEnumerable<PluginPair> SetPathForPluginPairs(string filePath, string la
             {
                 if (metadata.Language.Equals(languageToSet, StringComparison.OrdinalIgnoreCase))
                 {
-                    pluginPairs.Add(CreatePluginPair(filePath, metadata));
                     metadata.AssemblyName = string.Empty;
                     metadata.PluginSettingsDirectoryPath = Path.Combine(DataLocation.PluginSettingsDirectory, metadata.Name);
                     metadata.PluginCacheDirectoryPath = Path.Combine(DataLocation.PluginCacheDirectory, metadata.Name);
+
+                    pluginPairs.Add(CreatePluginPair(filePath, metadata));
                 }
             }
 

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -8,7 +8,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Flow.Launcher.Infrastructure.Logger;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Microsoft.IO;
 using System.Windows;
@@ -31,7 +30,7 @@ internal abstract class JsonRPCPlugin : JsonRPCPluginBase
         private int RequestId { get; set; }
 
         private string SettingConfigurationPath => Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
-        private string SettingPath => Path.Combine(DataLocation.PluginSettingsDirectory, Context.CurrentPluginMetadata.Name, "Settings.json");
+        private string SettingPath => Path.Combine(Context.CurrentPluginMetadata.PluginSettingsDirectoryPath, "Settings.json");
 
         public override List<Result> LoadContextMenus(Result selectedResult)
         {

Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs

@@ -6,7 +6,6 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
@@ -28,8 +27,7 @@ internal abstract class JsonRPCPluginBase : IAsyncPlugin, IContextMenu, ISetting
         private string SettingConfigurationPath =>
             Path.Combine(Context.CurrentPluginMetadata.PluginDirectory, "SettingsTemplate.yaml");
 
-        private string SettingDirectory => Path.Combine(DataLocation.PluginSettingsDirectory,
-            Context.CurrentPluginMetadata.Name);
+        private string SettingDirectory => Context.CurrentPluginMetadata.PluginSettingsDirectoryPath;
 
         private string SettingPath => Path.Combine(SettingDirectory, "Settings.json");
 
@@ -145,13 +143,5 @@ public Control CreateSettingPanel()
         {
             return Settings.CreateSettingPanel();
         }
-
-        public void DeletePluginSettingsDirectory()
-        {
-            if (Directory.Exists(SettingDirectory))
-            {
-                Directory.Delete(SettingDirectory, true);
-            }
-        }
     }
 }

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -75,6 +75,7 @@ public static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
 
                             plugin = Activator.CreateInstance(type) as IAsyncPlugin;
 
+                            // Same as PluginJsonStorage.cs constructor
                             var assemblyName = assembly.GetName().Name;
                             metadata.AssemblyName = assemblyName;
                             metadata.PluginSettingsDirectoryPath = Path.Combine(DataLocation.PluginSettingsDirectory, assemblyName);

Flow.Launcher.Infrastructure/Storage/PluginJsonStorage.cs

@@ -23,13 +23,5 @@ public PluginJsonStorage(T data) : this()
         {
             Data = data;
         }
-
-        public void DeleteDirectory()
-        {
-            if (Directory.Exists(DirectoryPath))
-            {
-                Directory.Delete(DirectoryPath, true);
-            }
-        }
     }
 }