[HydroThunderTool] Fix invalid paths for file associations

hyperbx · Aug 16, 2024 · aa75b1f · aa75b1f
1 parent f39e5de
commit aa75b1f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/HyperLib/Helpers/FileSystemHelper.cs b/HyperLib/Helpers/FileSystemHelper.cs
@@ -60,7 +60,7 @@ public static string TruncateLastExtension(string in_filePath, bool in_isFileNam
             return Path.Combine(Path.GetDirectoryName(in_filePath), name);
         }
 
-        public static string OmitFirstDirectory(string in_path)
+        public static string OmitRootDirectory(string in_path)
         {
             var index = in_path.IndexOf(Path.DirectorySeparatorChar);
 
@@ -69,6 +69,15 @@ public static string OmitFirstDirectory(string in_path)
                 : in_path;
         }
 
+        public static string GetRootDirectory(string in_path)
+        {
+            var index = in_path.IndexOf(Path.DirectorySeparatorChar);
+
+            return index >= 0
+                ? in_path[..(index + 1)]
+                : in_path;
+        }
+
         public static EFileSystemBasicType GetBasicType(string in_path)
         {
             if (Directory.Exists(in_path))

diff --git a/Tools/HydroThunderTool/Program.cs b/Tools/HydroThunderTool/Program.cs
@@ -85,8 +85,9 @@ this directory is likely an extracted PC archive.
            Otherwise, we should prompt the user to confirm. */
         if (File.Exists(Path.Combine(path, "Base.apf")))
         {
-            path = Path.GetRelativePath(path, inputPath);
-            path = FileSystemHelper.OmitFirstDirectory(path);
+            var archiveRoot = FileSystemHelper.GetRootDirectory(Path.GetRelativePath(path, inputPath));
+
+            path = Path.Combine(path, archiveRoot);
 
             foreach (var dir in Directory.EnumerateDirectories(path))
             {