Remove regenerated pipeline files (#572)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Cody Baker <[email protected]>
NeurodataWithoutBorders · Jan 29, 2024 · b3e2318 · b3e2318
1 parent 917704e
commit b3e2318
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/renderer/src/progress/index.js b/src/renderer/src/progress/index.js
@@ -193,19 +193,21 @@ export function resume(name) {
     return commandToResume;
 }
 
-export const remove = async (name) => {
-    const result = await Swal.fire({
-        title: `Are you sure you would like to delete this conversion pipeline?`,
-        html: `All related files will be deleted permanently, and existing progress will be lost.`,
-        icon: "warning",
-        heightAuto: false,
-        showCancelButton: true,
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#d33",
-        confirmButtonText: `Delete ${name}`,
-        cancelButtonText: "Cancel",
-        focusCancel: true,
-    });
+export const remove = async (name, force = false) => {
+    const result = force
+        ? { isConfirmed: true }
+        : await Swal.fire({
+              title: `Are you sure you would like to delete this conversion pipeline?`,
+              html: `All related files will be deleted permanently, and existing progress will be lost.`,
+              icon: "warning",
+              heightAuto: false,
+              showCancelButton: true,
+              confirmButtonColor: "#3085d6",
+              cancelButtonColor: "#d33",
+              confirmButtonText: `Delete ${name}`,
+              cancelButtonText: "Cancel",
+              focusCancel: true,
+          });
 
     if (result.isConfirmed) return operations.remove(name);
 

diff --git a/src/renderer/src/progress/operations.js b/src/renderer/src/progress/operations.js
@@ -7,10 +7,13 @@ export const remove = (name) => {
     const progressFilePathToDelete = joinPath(guidedProgressFilePath, name + ".json");
 
     //delete the progress file
-    if (fs) fs.unlinkSync(progressFilePathToDelete);
-    else localStorage.removeItem(progressFilePathToDelete);
+    if (fs) {
+        if (fs.existsSync(progressFilePathToDelete)) fs.unlinkSync(progressFilePathToDelete);
+    } else localStorage.removeItem(progressFilePathToDelete);
 
     if (fs) {
+        console.log(previewSaveFolderPath, conversionSaveFolderPath, name);
+
         // delete default preview location
         fs.rmSync(joinPath(previewSaveFolderPath, name), { recursive: true, force: true });
 

diff --git a/src/renderer/src/stories/pages/settings/SettingsPage.js b/src/renderer/src/stories/pages/settings/SettingsPage.js
@@ -9,7 +9,7 @@ import developerGlobalSchema from "../../../../../../schemas/json/developer/glob
 import { validateDANDIApiKey } from "../../../validation/dandi";
 
 import { Button } from "../../Button.js";
-import { global, save } from "../../../progress/index.js";
+import { global, remove, save } from "../../../progress/index.js";
 import { merge, setUndefinedIfNotDeclared } from "../utils.js";
 
 import { notyf } from "../../../dependencies/globals.js";
@@ -34,11 +34,15 @@ function saveNewPipelineFromYaml(name, sourceData, rootFolder) {
         });
     });
 
+    const updatedName = header(name);
+
+    remove(updatedName, true);
+
     save({
         info: {
             globalState: {
                 project: {
-                    name: header(name),
+                    name: updatedName,
                     initialized: true,
                 },