Electron : better default version management avec importing layers

unige-geohealth · Apr 25, 2024 · 8ca559f · 8ca559f
1 parent e6b1754
commit 8ca559f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/electron/src/main/modules/controller/index.js b/electron/src/main/modules/controller/index.js
@@ -283,6 +283,7 @@ export class Controller extends Classes([
         ctr.sendMessageCodeClient("msg-info", "docker_reload_version");
         await ctr.wait(2000, "start docker_load_file");
         await versions.setVersion(meta.tag);
+        return; 
       }
 
       ctr.sendMessageCodeClient("msg-info", "data_loc_check");

diff --git a/electron/src/main/modules/versions/index.js b/electron/src/main/modules/versions/index.js
@@ -270,11 +270,14 @@ export class Versions {
     const vrs = this;
     const ctr = vrs._ctr;
 
-    console.log(version);
-
     if (version === "latest") {
       return vrs.updateLatest();
     }
+    const vIsValid = semver.valid(version);
+
+    if (!vIsValid) {
+      throw new Error(`Invalid version ${version}`);
+    }
 
     const vLoc = await vrs.hasVersionLocal(version);
 
@@ -428,8 +431,8 @@ export class Versions {
         title: "Confirm",
         message: `Are you sure you want to restart and use version ${version} ? `,
       });
-
-      if (!choice) {
+      // yes
+      if (choice === 0) {
         await vrs.setVersion(version);
       }
     }