Merge update plugin directory functions

Author: Jack251970

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -159,26 +159,12 @@ public static void LoadPlugins(PluginsSettings settings)
             _metadatas = PluginConfig.Parse(Directories);
             Settings = settings;
             Settings.UpdatePluginSettings(_metadatas);
-            // Update Json RPC plugin directory before loading plugins so that we can pass the correct plugin directory
-            UpdateJsonRPCPluginDirectory(_metadatas);
             AllPlugins = PluginsLoader.Plugins(_metadatas, Settings);
-            // Update dotnet plugin directory after loading plugins because we need to get assembly name first
-            UpdateNotNetPluginDirectory(_metadatas);
+            // Since dotnet plugins need to get assembly name first, we should update plugin directory after loading plugins
+            UpdatePluginDirectory(_metadatas);
         }
 
-        private static void UpdateJsonRPCPluginDirectory(List<PluginMetadata> metadatas)
-        {
-            foreach (var metadata in metadatas)
-            {
-                if (!AllowedLanguage.IsDotNet(metadata.Language))
-                {
-                    metadata.PluginSettingsDirectoryPath = Path.Combine(DataLocation.PluginSettingsDirectory, metadata.Name);
-                    metadata.PluginCacheDirectoryPath = Path.Combine(DataLocation.PluginCacheDirectory, metadata.Name);
-                }
-            }
-        }
-
-        private static void UpdateNotNetPluginDirectory(List<PluginMetadata> metadatas)
+        private static void UpdatePluginDirectory(List<PluginMetadata> metadatas)
         {
             foreach (var metadata in metadatas)
             {
@@ -187,6 +173,11 @@ private static void UpdateNotNetPluginDirectory(List<PluginMetadata> metadatas)
                     metadata.PluginSettingsDirectoryPath = Path.Combine(DataLocation.PluginSettingsDirectory, metadata.AssemblyName);
                     metadata.PluginCacheDirectoryPath = Path.Combine(DataLocation.PluginCacheDirectory, metadata.AssemblyName);
                 }
+                else
+                {
+                    metadata.PluginSettingsDirectoryPath = Path.Combine(DataLocation.PluginSettingsDirectory, metadata.Name);
+                    metadata.PluginCacheDirectoryPath = Path.Combine(DataLocation.PluginCacheDirectory, metadata.Name);
+                }
             }
         }