Move function to FilesFolders

Author: Jack251970

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

@@ -44,7 +44,7 @@ internal AbstractPluginEnvironment(List<PluginMetadata> pluginMetadataList, Plug
         /// Resolves the configured runtime executable path to an absolute path.
         /// Supports both absolute paths and relative paths (relative to ProgramDirectory).
         /// </summary>
-        private string ResolvedPluginsSettingsFilePath => DataLocation.ResolveAbsolutePath(PluginsSettingsFilePath);
+        private string ResolvedPluginsSettingsFilePath => FilesFolders.ResolveAbsolutePath(PluginsSettingsFilePath);
 
         internal IEnumerable<PluginPair> Setup()
         {

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

@@ -42,34 +42,5 @@ public static bool PortableDataLocationInUse()
         public const string PluginEnvironments = "Environments";
         public const string PluginDeleteFile = "NeedDelete.txt";
         public static readonly string PluginEnvironmentsPath = Path.Combine(DataDirectory(), PluginEnvironments);
-
-        /// <summary>
-        /// Resolves a path that may be relative to an absolute path.
-        /// If the path is already absolute, returns it as-is.
-        /// If the path is not rooted (as determined by <see cref="Path.IsPathRooted(string)"/>), resolves it relative to ProgramDirectory.
-        /// </summary>
-        /// <param name="path">The path to resolve</param>
-        /// <returns>An absolute path</returns>
-        public static string ResolveAbsolutePath(string path)
-        {
-            if (string.IsNullOrEmpty(path))
-                return path;
-
-            // If already absolute, return as-is
-            if (Path.IsPathFullyQualified(path))
-                return path;
-
-            // Resolve relative to ProgramDirectory, handling invalid path formats gracefully
-            try
-            {
-                return Path.GetFullPath(Path.Combine(Constant.ProgramDirectory, path));
-            }
-            catch (System.Exception)
-            {
-                // If the path cannot be resolved (invalid characters, format, or too long),
-                // return the original path to avoid crashing the application.
-                return path;
-            }
-        }
     }
 }

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
+
 #pragma warning disable IDE0005
 using System.Windows;
 #pragma warning restore IDE0005
@@ -487,5 +489,34 @@ public static void ValidateDataDirectory(string bundledDataDirectory, string dat
                 }
             }
         }
+
+        /// <summary>
+        /// Resolves a path that may be relative to an absolute path.
+        /// If the path is already absolute, returns it as-is.
+        /// If the path is not rooted (as determined by <see cref="Path.IsPathRooted(string)"/>), resolves it relative to ProgramDirectory.
+        /// </summary>
+        /// <param name="path">The path to resolve</param>
+        /// <returns>An absolute path</returns>
+        public static string ResolveAbsolutePath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return path;
+
+            // If already absolute, return as-is
+            if (Path.IsPathFullyQualified(path))
+                return path;
+
+            // Resolve relative to ProgramDirectory, handling invalid path formats gracefully
+            try
+            {
+                return Path.GetFullPath(Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location).ToString(), path));
+            }
+            catch (Exception)
+            {
+                // If the path cannot be resolved (invalid characters, format, or too long),
+                // return the original path to avoid crashing the application.
+                return path;
+            }
+        }
     }
 }