Electron : restart after local image importation

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

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/electron/src/main/modules/controller/docker_tools.js b/electron/src/main/modules/controller/docker_tools.js
@@ -1,8 +1,9 @@
 import Docker from "dockerode";
 import process from "node:process";
 import { homedir } from "os";
-import { existsSync } from "fs";
+import { createReadStream, existsSync } from "fs";
 import http from "http";
+import { meta } from "./../../docker/index.js";
 
 export class DockerTools {
   constructor() {}
@@ -76,7 +77,12 @@ export class DockerTools {
     if (!exists) {
       throw new Error(`No image found. Path: ${imagePath}`);
     }
-    await ctr._docker.loadImage(imagePath);
+    const data = createReadStream(imagePath);
+    await ctr._docker.loadImage(data, {
+      repo: meta.image_name,
+      tag: meta.tag,
+    });
+    return meta;
   }
 
   async isContainerReady(name) {

diff --git a/electron/src/main/modules/controller/index.js b/electron/src/main/modules/controller/index.js
@@ -226,6 +226,7 @@ export class Controller extends Classes([
    */
   async start() {
     const ctr = this;
+    const versions = ctr._versions;
     const language = ctr.getState("language");
 
     try {
@@ -278,7 +279,10 @@ export class Controller extends Classes([
       if (!hasV) {
         ctr.sendMessageCodeClient("msg-info", "docker_load_file");
         await ctr.wait(2000, "start docker_load_file");
-        await ctr.loadImage();
+        const meta = await ctr.loadImage();
+        ctr.sendMessageCodeClient("msg-info", "docker_reload_version");
+        await ctr.wait(2000, "start docker_load_file");
+        await versions.setVersion(meta.tag);
       }
 
       ctr.sendMessageCodeClient("msg-info", "data_loc_check");
@@ -512,7 +516,6 @@ export class Controller extends Classes([
     });
   }
 
-
   /**
    * Misc helpers;
    */

diff --git a/electron/src/main/modules/translate/json/dict.json b/electron/src/main/modules/translate/json/dict.json
@@ -57,7 +57,14 @@
   },
   {
     "id": "docker_load_file",
-    "en": "Unpacking local files...",
+    "en": "Registering AccessMod image in Docker...",
+    "fr": "",
+    "es": "",
+    "de": ""
+  },
+  {
+    "id": "docker_reload_version",
+    "en": "Restarting, please wait...",
     "fr": "",
     "es": "",
     "de": ""

diff --git a/electron/src/main/modules/versions/index.js b/electron/src/main/modules/versions/index.js
@@ -429,7 +429,9 @@ export class Versions {
         message: `Are you sure you want to restart and use version ${version} ? `,
       });
 
-      if (!choice) await vrs.setVersion(version);
+      if (!choice) {
+        await vrs.setVersion(version);
+      }
     }
   }
 

diff --git a/version_manager/manager.js b/version_manager/manager.js
@@ -52,9 +52,6 @@ export class VersionManager {
       );
       return;
     }
-    if (debug) {
-      debugger;
-    }
     await fs.writeFile(this.file_version, version, "utf8");
   }