Make parallel runs safer by using GUIDs instead of file name for extr…

…action folder
Miepee · Feb 4, 2023 · 56149ca · 56149ca
1 parent 4983eb7
commit 56149ca
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/GlennLib/RawMods.cs b/GlennLib/RawMods.cs
@@ -106,7 +106,7 @@ public static void PortToWindows(string inputRawZipPath, string outputRawZipPath
             return;
         }
 
-        string extractDirectory = TempDir + "/" + Path.GetFileNameWithoutExtension(inputRawZipPath);
+        string extractDirectory = TempDir + "/" + Guid.NewGuid();
 
         // Check if temp folder exists, delete if yes, extract zip to there
         if (Directory.Exists(extractDirectory))
@@ -167,7 +167,7 @@ public static void PortToLinux(string inputRawZipPath, string outputRawZipPath,
         Core.ModOS currentOS = GetModOSOfRawZip(inputRawZipPath);
         outputDelegate.SendOutput("Zip Recognized as " + currentOS);
 
-        string extractDirectory = TempDir + "/" + Path.GetFileNameWithoutExtension(inputRawZipPath);
+        string extractDirectory = TempDir + "/" + Guid.NewGuid();
         string assetsDir = extractDirectory + "/assets";
 
         // Check if temp folder exists, delete if yes, extract zip to there
@@ -252,7 +252,7 @@ public static void PortToAndroid(string inputRawZipPath, string outputRawApkPath
         Core.ModOS currentOS = GetModOSOfRawZip(inputRawZipPath);
         outputDelegate.SendOutput("Zip Recognized as " + currentOS);
 
-        string extractDirectory = TempDir + "/" + Path.GetFileNameWithoutExtension(inputRawZipPath);
+        string extractDirectory = TempDir + "/" + Guid.NewGuid();
         string apkDir = extractDirectory + "/apk";
         string apkAssetsDir = apkDir + "/assets";
         string bin = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "cmd.exe" : "java";
@@ -457,7 +457,7 @@ public static void PortToMac(string inputRawZipPath, string outputRawZipPath, st
         Core.ModOS currentOS = GetModOSOfRawZip(inputRawZipPath);
         outputDelegate.SendOutput("Zip Recognized as " + currentOS);
 
-        string baseTempDirectory = TempDir + "/" + Path.GetFileNameWithoutExtension(inputRawZipPath);
+        string baseTempDirectory = TempDir + "/" + Guid.NewGuid();
         string extractDirectory = baseTempDirectory + "/extract";
         string appDirectory = baseTempDirectory + "/AM2R.app";
         string contentsDir = baseTempDirectory + "/Contents";