From c6c1c3de74bdb293ee40c58e1934aec77ca51e7a Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 16 Sep 2016 16:21:11 -0700
Subject: [PATCH] [DATFromDir, SimpleSort] Better temp folders

---
 SabreTools.Helper/Objects/DATFromDir.cs | 4 ++--
 SabreTools.Helper/Objects/SimpleSort.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SabreTools.Helper/Objects/DATFromDir.cs b/SabreTools.Helper/Objects/DATFromDir.cs
index 61571869..01ea7c94 100644
--- a/SabreTools.Helper/Objects/DATFromDir.cs
+++ b/SabreTools.Helper/Objects/DATFromDir.cs
@@ -66,7 +66,7 @@ namespace SabreTools
 			_enableGzip = enableGzip;
 			_addBlanks = addBlanks;
 			_addDate = addDate;
-			_tempDir = (String.IsNullOrEmpty(tempDir) ? Path.Combine(Environment.CurrentDirectory, "__tempdir__") : tempDir);
+			_tempDir = (String.IsNullOrEmpty(tempDir) ? Path.Combine(Path.GetTempPath(), "__temp__") : tempDir);
 			_maxDegreeOfParallelism = maxDegreeOfParallelism;
 			_logger = logger;
 		}
@@ -199,7 +199,7 @@ namespace SabreTools
 		private void ProcessPossibleArchive(string item)
 		{
 			// Define the temporary directory
-			string tempSubDir = Path.GetFullPath(Path.Combine(_tempDir, Path.GetFileNameWithoutExtension(item))) + Path.DirectorySeparatorChar;
+			string tempSubDir = Path.GetFullPath(Path.Combine(_tempDir, Path.GetRandomFileName())) + Path.DirectorySeparatorChar;
 
 			// Special case for if we are in Romba mode (all names are supposed to be SHA-1 hashes)
 			if (_datdata.Romba)
diff --git a/SabreTools.Helper/Objects/SimpleSort.cs b/SabreTools.Helper/Objects/SimpleSort.cs
index 367942ff..9dd0e0c1 100644
--- a/SabreTools.Helper/Objects/SimpleSort.cs
+++ b/SabreTools.Helper/Objects/SimpleSort.cs
@@ -55,7 +55,7 @@ namespace SabreTools.Helper
 			_datdata = datdata;
 			_inputs = inputs;
 			_outdir = (outdir == "" ? "Rebuild" : outdir);
-			_tempdir = (tempdir == "" ? "__temp__" : tempdir);
+			_tempdir = (tempdir == "" ? Path.Combine(Path.GetTempPath(), "__temp__") : tempdir);
 			_quickScan = quickScan;
 			_toFolder = toFolder;
 			_verify = verify;
@@ -135,7 +135,7 @@ namespace SabreTools.Helper
 			foreach (string input in _inputs)
 			{
 				DATFromDir dfd = new DATFromDir(input, _datdata, false /* noMD5 */, false /* noSHA1 */, true /* bare */, false /* archivesAsFiles */,
-				true /* enableGzip */, false /* addBlanks */, false /* addDate */, "__temp__" /* tempdir */, 4 /* maxDegreeOfParallelism */, _logger);
+				true /* enableGzip */, false /* addBlanks */, false /* addDate */, "" /* tempdir */, 4 /* maxDegreeOfParallelism */, _logger);
 				dfd.Start();
 				_datdata = dfd.DatData;
 			}