Fix cancelling

Space-Eternity-3 · Feb 3, 2024 · eac661b · eac661b
1 parent 1c10f1e
commit eac661b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/main/installer/Installer.js b/src/main/installer/Installer.js
@@ -116,6 +116,7 @@ export class DownloadAction extends Action {
     cancel() {
         this.abortController.abort();
         this.writeStream.close();
+        this.emit("cancelled");
     }
 
     /**
@@ -264,6 +265,12 @@ export class Installer extends EventEmitter {
                     resolve();
                 });
 
+                action.on("cancelled", () => {
+                    this.emit("cancelled");
+                    this.failed = true;
+                    resolve();
+                });
+
                 action.execute();
             });
             this.currentAction++;

diff --git a/src/main/renderer_bridge/versionManager.js b/src/main/renderer_bridge/versionManager.js
@@ -43,6 +43,11 @@ ipcMain.handle(IpcMessages.VERSION_MANAGER.INSTALL_VERSION, async (e, id, data)
             installerProgress("data", data);
         });
 
+        versionInstaller.on("cancelled", () => {
+            installerProgress("cancelled", id);
+            deleteInstaller(id);
+        });
+
         versionInstaller.Start();
     } catch (err) {
         installerProgress("error", err);

diff --git a/src/preload/versionManager.js b/src/preload/versionManager.js
@@ -34,7 +34,6 @@ ipcRenderer.on(IpcMessages.VERSION_MANAGER.ON_VERSION_INSTALL_PROGRESS, (event,
     switch (type) {
         case "data":
             installers[id]?.updateData(data);
-
             break;
         case "finish":
             installers[id]?.finish();
@@ -44,6 +43,10 @@ ipcRenderer.on(IpcMessages.VERSION_MANAGER.ON_VERSION_INSTALL_PROGRESS, (event,
             installers[id]?.error(data);
             deleteInstaller(id);
             break;
+        case "cancelled":
+            installers[id]?.cancelled();
+            deleteInstaller(id);
+            break;
         default:
             break;
     }

diff --git a/src/renderer/src/Installer.js b/src/renderer/src/Installer.js
@@ -40,6 +40,10 @@ class Installer {
                     Installer.emitter.emit("update");
                     resolve();
                 },
+                cancelled: () => {
+                    this_.removeInstallationInternal(id);
+                    Installer.emitter.emit("update");
+                },
                 error: (err) => {
                     this_.removeInstallationInternal(id);
                     Installer.emitter.emit("error", err);
@@ -60,7 +64,6 @@ class Installer {
     cancel(id) {
         cancelInstall(id);
         this.removeInstallationInternal(id);
-        Installer.emitter.emit("update");
     }
 
     /**