update installers

Xcube-Studio · Aug 28, 2024 · 2b0c020 · 2b0c020
1 parent c8eb829
commit 2b0c020
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/Natsurainko.FluentCore/GameManagement/Installer/FabricInstanceInstaller.cs b/Natsurainko.FluentCore/GameManagement/Installer/FabricInstanceInstaller.cs
@@ -116,7 +116,8 @@ async Task<VanillaMinecraftInstance> ParseOrInstallVanillaInstance(CancellationT
             McVersionManifestItem = McVersionManifestItem,
             MinecraftFolder = MinecraftFolder,
             CheckAllDependencies = true,
-            Progress = VanillaInstallationProgress
+            Progress = VanillaInstallationProgress,
+            CleanAfterCancelled = false
         };
 
         var instance = await vanillaInstanceInstaller.InstallAsync(cancellationToken);

diff --git a/Natsurainko.FluentCore/GameManagement/Installer/ForgeInstanceInstaller.cs b/Natsurainko.FluentCore/GameManagement/Installer/ForgeInstanceInstaller.cs
@@ -151,7 +151,8 @@ async Task<VanillaMinecraftInstance> ParseOrInstallVanillaInstance(CancellationT
             McVersionManifestItem = McVersionManifestItem,
             MinecraftFolder = MinecraftFolder,
             CheckAllDependencies = true,
-            Progress = VanillaInstallationProgress
+            Progress = VanillaInstallationProgress,
+            CleanAfterCancelled = false
         };
 
         var instance = await vanillaInstanceInstaller.InstallAsync(cancellationToken);

diff --git a/Natsurainko.FluentCore/GameManagement/Installer/OptiFineInstanceInstaller.cs b/Natsurainko.FluentCore/GameManagement/Installer/OptiFineInstanceInstaller.cs
@@ -134,7 +134,8 @@ async Task<VanillaMinecraftInstance> ParseOrInstallVanillaInstance(CancellationT
             McVersionManifestItem = McVersionManifestItem,
             MinecraftFolder = MinecraftFolder,
             CheckAllDependencies = true,
-            Progress = VanillaInstallationProgress
+            Progress = VanillaInstallationProgress,
+            CleanAfterCancelled = false
         };
 
         var instance = await vanillaInstanceInstaller.InstallAsync(cancellationToken);

diff --git a/Natsurainko.FluentCore/GameManagement/Installer/QuiltInstanceInstaller.cs b/Natsurainko.FluentCore/GameManagement/Installer/QuiltInstanceInstaller.cs
@@ -116,7 +116,8 @@ async Task<VanillaMinecraftInstance> ParseOrInstallVanillaInstance(CancellationT
             McVersionManifestItem = McVersionManifestItem,
             MinecraftFolder = MinecraftFolder,
             CheckAllDependencies = true,
-            Progress = VanillaInstallationProgress
+            Progress = VanillaInstallationProgress,
+            CleanAfterCancelled = false
         };
 
         var instance = await vanillaInstanceInstaller.InstallAsync(cancellationToken);

diff --git a/Natsurainko.FluentCore/GameManagement/Installer/VanillaInstanceInstaller.cs b/Natsurainko.FluentCore/GameManagement/Installer/VanillaInstanceInstaller.cs
@@ -31,6 +31,8 @@ public class VanillaInstanceInstaller : IInstanceInstaller
 
     public IProgress<InstallerProgress<VanillaInstallationStage>>? Progress { get; init; }
 
+    public bool CleanAfterCancelled { get; init; } = true;
+
     Task<MinecraftInstance> IInstanceInstaller.InstallAsync(CancellationToken cancellationToken)
         => InstallAsync(cancellationToken).ContinueWith(MinecraftInstance (t) => t.Result);
 
@@ -55,13 +57,15 @@ public async Task<VanillaMinecraftInstance> InstallAsync(CancellationToken cance
         catch (OperationCanceledException)
         {
             // 取消后清理产生的部分文件
-
-            assetIndex?.Delete();
-
-            if (instance != null)
+            if (CleanAfterCancelled)
             {
-                versionJsonFile!.Directory?.DeleteAllFiles();
-                versionJsonFile!.Directory?.Delete();
+                assetIndex?.Delete();
+
+                if (instance != null)
+                {
+                    versionJsonFile!.Directory?.DeleteAllFiles();
+                    versionJsonFile!.Directory?.Delete();
+                }
             }
 
             Progress?.Report(new(stage, InstallerStageProgress.Failed()));