Use temp dir in instance for mod file transactions

Author: HebaruSan

Core/GameInstance.cs

@@ -73,7 +73,7 @@ private void SetupCkanDirectories()
             log.InfoFormat("Initialising {0}", CkanDir);
 
             // TxFileManager knows if we are in a transaction
-            var txFileMgr = new TxFileManager();
+            var txFileMgr = new TxFileManager(CkanDir);
 
             if (!Directory.Exists(CkanDir))
             {

Core/IO/ModuleInstaller.cs

@@ -32,12 +32,13 @@ public ModuleInstaller(GameInstance      inst,
                                IUser             user,
                                CancellationToken cancelToken = default)
         {
-            User        = user;
-            this.cache  = cache;
-            this.config = config;
-            instance    = inst;
+            log.DebugFormat("Creating ModuleInstaller for {0}", inst.GameDir);
+            instance         = inst;
+            // Make a transaction file manager that uses a temp dir in the instance's CKAN dir
+            this.cache       = cache;
+            this.config      = config;
+            User             = user;
             this.cancelToken = cancelToken;
-            log.DebugFormat("Creating ModuleInstaller for {0}", instance.GameDir);
         }
 
         public IUser User { get; set; }
@@ -394,7 +395,7 @@ private List<string> InstallModule(CkanModule
                             // Delete the manually installed DLL transaction-style because we believe we'll be replacing it
                             var toDelete = instance.ToAbsoluteGameDir(dll);
                             log.DebugFormat("Deleting manually installed DLL {0}", toDelete);
-                            var txFileMgr = new TxFileManager();
+                            var txFileMgr = new TxFileManager(instance.CkanDir);
                             txFileMgr.Snapshot(toDelete);
                             txFileMgr.Delete(toDelete);
                         }
@@ -543,9 +544,9 @@ private static bool StreamsEqual(Stream s1, Stream s2)
         /// fails at a later stage.
         /// </summary>
         /// <param name="files">The files to overwrite</param>
-        private static void DeleteConflictingFiles(IEnumerable<InstallableFile> files)
+        private void DeleteConflictingFiles(IEnumerable<InstallableFile> files)
         {
-            var txFileMgr = new TxFileManager();
+            var txFileMgr = new TxFileManager(instance.CkanDir);
             foreach (InstallableFile file in files)
             {
                 log.DebugFormat("Trying to delete {0}", file.destination);
@@ -695,6 +696,16 @@ public static List<InstallableFile> FindInstallableFiles(CkanModule   module,
 
         #endregion
 
+        private string? InstallFile(ZipFile          zipfile,
+                                    ZipEntry         entry,
+                                    string           fullPath,
+                                    bool             makeDirs,
+                                    string[]         candidateDuplicates,
+                                    IProgress<long>? progress)
+            => InstallFile(zipfile, entry, fullPath, makeDirs,
+                           new TxFileManager(instance.CkanDir),
+                           candidateDuplicates, progress);
+
         /// <summary>
         /// Copy the entry from the opened zipfile to the path specified.
         /// </summary>
@@ -707,11 +718,10 @@ public static List<InstallableFile> FindInstallableFiles(CkanModule   module,
                                             ZipEntry         entry,
                                             string           fullPath,
                                             bool             makeDirs,
+                                            IFileManager     txFileMgr,
                                             string[]         candidateDuplicates,
                                             IProgress<long>? progress)
         {
-            var txFileMgr = new TxFileManager();
-
             if (entry.IsDirectory)
             {
                 // Skip if we're not making directories for this install.
@@ -918,7 +928,7 @@ private void Uninstall(string               identifier,
                                Registry             registry,
                                IProgress<long>      progress)
         {
-            var txFileMgr = new TxFileManager();
+            var txFileMgr = new TxFileManager(instance.CkanDir);
 
             using (var transaction = CkanTransaction.CreateTransactionScope())
             {

Core/Registry/RegistryManager.cs

@@ -388,7 +388,7 @@ private string Serialize()
 
         public void Save(bool enforce_consistency = true)
         {
-            var txFileMgr = new TxFileManager();
+            var txFileMgr = new TxFileManager(gameInstance.CkanDir);
 
             log.InfoFormat("Saving CKAN registry at {0}", path);
 
@@ -444,7 +444,7 @@ private void ExportInstalled(IEnumerable<string> paths,
                                      bool                recommends,
                                      bool                withVersions)
         {
-            var txFileMgr = new TxFileManager();
+            var txFileMgr = new TxFileManager(gameInstance.CkanDir);
             var serialized = SerializeCurrentInstall(recommends, withVersions);
             foreach (var path in paths)
             {

Tests/Core/IO/ModuleInstallerTests.cs

@@ -7,6 +7,7 @@
 using System.Net;
 
 using ICSharpCode.SharpZipLib.Zip;
+using ChinhDo.Transactions;
 using NUnit.Framework;
 using WireMock.Server;
 using WireMock.RequestBuilders;
@@ -330,7 +331,7 @@ public void DontOverWrite_208()
 
                 Assert.Throws<FileExistsKraken>(delegate
                 {
-                    ModuleInstaller.InstallFile(zipfile, entry, tmpfile, false, Array.Empty<string>(), null);
+                    ModuleInstaller.InstallFile(zipfile, entry, tmpfile, false, new TxFileManager(), Array.Empty<string>(), null);
                 });
 
                 // Cleanup
@@ -368,7 +369,7 @@ private static string CopyDogeFromZip()
 
                 // We have to delete our temporary file, as CZE refuses to overwrite; huzzah!
                 File.Delete(tmpfile);
-                ModuleInstaller.InstallFile(zipfile, entry, tmpfile, false, Array.Empty<string>(), null);
+                ModuleInstaller.InstallFile(zipfile, entry, tmpfile, false, new TxFileManager(), Array.Empty<string>(), null);
 
                 return tmpfile;
             }