pinokiod 0.1.25 → 0.1.28

package/kernel/index.js

@@ -135,17 +135,19 @@ class Kernel {
   async init() {
     let home = this.store.get("home")
     if (home) {
+      this.homedir = home
 
-      // check if the path exists
-      let exists = fs.existsSync(home)
-      if (exists) {
-        this.homedir = home
-      } else {
-        // if it doesn't exists, means there was some error, so just delete this entry from the store, and set the default home as the home
-        this.store.delete("home")
-        this.homedir = path.resolve(os.homedir(), "pinokio")
-      }
+//      // check if the path exists
+//      let exists = fs.existsSync(home)
+//      if (exists) {
+//        this.homedir = home
+//      } else {
+//        // if it doesn't exist, means there was some error, so just delete this entry from the store, and set the default home as the home
+//        this.store.delete("home")
+//        this.homedir = path.resolve(os.homedir(), "pinokio")
+//      }
     } else {
+//      this.homedir = null
       this.homedir = path.resolve(os.homedir(), "pinokio")
     }
     console.log("homedir", this.homedir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.25",
+  "version": "0.1.28",
   "description": "",
   "main": "index.js",
   "scripts": {

package/script/index.js

@@ -26,7 +26,9 @@ class Store {
     try {
       let str = fs.readFileSync(path.resolve(__dirname, "pinokio.json"), "utf8")
       let o = JSON.parse(str)
+      console.log("before delete", o)
       delete o[key]
+      console.log("after delete", o)
       fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
     } catch (e) {
     }

package/server/index.js

@@ -1246,6 +1246,40 @@ class Server {
     })
     return response
   }
+  async mv(existing_home, new_home) {
+    //// Next, empty the bin folder => need to reinitialize because of symlinks, etc. with the package managers
+    console.log("RUNNING RM BIN")
+    const path_to_delete = path.resolve(existing_home, "bin")
+    let del_cmd
+    if (this.kernel.platform === "win32") {
+      del_cmd = `rd /s /q ${path_to_delete}`
+    } else {
+      del_cmd = `rm -rf ${path_to_delete}`
+    }
+    console.log("del_cmd", del_cmd)
+
+    await this.sudo_exec(del_cmd, new_home)
+    console.log("FINISHED RM BIN")
+
+    console.log("RUNNING MV")
+    let mv_cmd
+    if (this.kernel.platform === "win32") {
+      // robocoyp returns 1 when successful
+      //mv_cmd = `start /wait (robocopy ${existing_home} ${new_home} /E /MOVE /NFL /NDL) ^& IF %ERRORLEVEL% LEQ 1 exit 0`
+      //mv_cmd = `start /wait robocopy ${existing_home} ${new_home} /E /MOVE /NFL /NDL`
+      mv_cmd = `start /wait robocopy ${existing_home} ${new_home} /E /MOVE /NFL`
+      //mv_cmd = `start /wait robocopy ${existing_home} ${new_home} /E /MOVE /NFL`
+    } else {
+      mv_cmd = `mv ${existing_home} ${new_home}`
+    }
+    try {
+      await this.sudo_exec(mv_cmd, existing_home)
+    } catch (e) {
+      console.log("ROBOCOPY RESULT", e)
+    }
+    console.log("FINISHED MV")
+  }
+
   async syncConfig() {
     // 1. THEME
     this.theme = this.kernel.store.get("theme") || "light"
@@ -1263,61 +1297,91 @@ class Server {
     //this.logo = (this.theme === 'dark' ?  "<img class='icon' src='/pinokio-white.png'>" : "<img class='icon' src='/pinokio-black.png'>")
     this.logo = '<i class="fa-solid fa-house"></i>'
 
+    // 4. existing home is set + new home is set + existing home does NOT exist => delete the "home" field and DO NOT go through with the move command
+    // 5. existing home is NOT set + new home is set => go through with the "home" setting procedure
+    // 6. existing home is NOT set + new home is NOT set => don't touch anything => the homedir will be the default home
+
     // 2. HOME
     // 2.1. Check if the config includes NEW_HOME => if so,
     //    - move the HOME folder to NEW_HOME
     //    - set HOME=NEW_HOME
     //    - remove NEW_HOME
+    let existing_home = this.kernel.store.get("home")
     let new_home = this.kernel.store.get("new_home")
-    console.log("new_home", new_home)
-    if (new_home) {
-      // move the home folder to new_home
-
-      let existing_home = this.kernel.store.get("home")
-
-      console.log({ existing_home, new_home })
-
-      if (existing_home) {
-        // if the home is already set, move
-
-        //// Next, empty the bin folder => need to reinitialize because of symlinks, etc. with the package managers
-        console.log("RUNNING RM BIN")
-        const path_to_delete = path.resolve(existing_home, "bin")
-        let del_cmd
-        if (this.kernel.platform === "win32") {
-          del_cmd = `rd /s /q ${path_to_delete}`
+    console.log("syncConfig", { existing_home, new_home })
+
+    if (existing_home) {
+      let exists = await fse.pathExists(existing_home)
+      console.log("#A", { exists })
+      if (exists) {
+        console.log("#B", { new_home })
+        if (new_home) {
+          let new_home_exists = await fse.pathExists(new_home)
+          console.log("#C", { new_home_exists })
+          if (new_home_exists) {
+            console.log("#D")
+            // - existing home is set
+            // - existing home exists
+            // - new home is set
+            // - new home exists already
+            //    => delete store.new_home ==> will load at store.home
+            this.kernel.store.delete("new_home")
+          } else {
+            console.log("#E")
+            // - existing home is set
+            // - existing home exists
+            // - new home is set
+            // - new home does not exist
+            //    => run mv()
+            //    => update store.home
+            //    => delete store.new_home
+            await this.mv(existing_home, new_home)
+            this.kernel.store.set("home", new_home)
+            this.kernel.store.delete("new_home")
+          }
         } else {
-          del_cmd = `rm -rf ${path_to_delete}`
+          console.log("#F")
+          // - existing home is set
+          // - existing home exists
+          // - new home is not set
+          //    => This is most typical scenario => don't touch anything => the homedir will be the existing home
         }
-        console.log("del_cmd", del_cmd)
-
-        await this.sudo_exec(del_cmd, new_home)
-        console.log("FINISHED RM BIN")
-
-        console.log("RUNNING MV")
-        let mv_cmd
-        if (this.kernel.platform === "win32") {
-          // robocoyp returns 1 when successful
-          //mv_cmd = `start /wait (robocopy ${existing_home} ${new_home} /E /MOVE /NFL /NDL) ^& IF %ERRORLEVEL% LEQ 1 exit 0`
-          mv_cmd = `start /wait robocopy ${existing_home} ${new_home} /E /MOVE /NFL /NDL`
-          //mv_cmd = `start /wait robocopy ${existing_home} ${new_home} /E /MOVE /NFL`
+      } else {
+        console.log("#G", { new_home })
+        if (new_home) {
+          console.log("#H")
+          // - existing home is set
+          // - but the existing home path DOES NOT exist
+          // - new home is set
+          //    => This is an invalid scenario => Just to avoid disaster, just delete store.home and delete store.new_home
+          //    => the app will load at ~/pinokio
+          this.kernel.store.delete("home")
+          this.kernel.store.delete("new_home")
         } else {
-          mv_cmd = `mv ${existing_home} ${new_home}`
-        }
-        try {
-          await this.sudo_exec(mv_cmd, existing_home)
-        } catch (e) {
-          console.log("E", e)
+          console.log("#I")
+          // - existing home is set
+          // - but the existing home path DOES NOT exist
+          // - new home is NOT set
+          //    => This is an invalid scenario => just delete store.home
+          //    => the app will load at ~/pinokio
+          this.kernel.store.delete("home")
         }
-        console.log("FINISHED MV")
-
-        // set home=new_home
+      }
+    } else {
+      console.log("#J", { new_home })
+      if (new_home) {
+        console.log("#K")
+        // - existing home is NOT set
+        // - new home is set
+        //    => update store.home
+        //    => delete store.new_home
         this.kernel.store.set("home", new_home)
-        // delete new_home
-        console.log("STORE", this.kernel.store)
         this.kernel.store.delete("new_home")
       } else {
-        // if the home is not already set, don't need to do anything
+        console.log("#L")
+        // - existing home is NOT set
+        // - new home is NOT set
+        //    => don't touch anything => will load at ~/pinokio
       }
     }
   }
@@ -1351,6 +1415,8 @@ class Server {
           throw new Error(`The path ${config.home} already exists. Please remove the folder and retry`)
         }
 
+        console.log("set new home", config.home)
+
         this.kernel.store.set("new_home", config.home)
       }
 
@@ -1358,7 +1424,8 @@ class Server {
 
     home = this.kernel.store.get("home")
     theme = this.kernel.store.get("theme")
-    console.log("after setting config", { home, theme })
+    let new_home = this.kernel.store.get("new_home")
+    console.log("after setting config", { home, theme, new_home })
   }
   async start(debug) {
 
@@ -1435,7 +1502,8 @@ class Server {
     this.app.use(cookieParser());
     this.app.use(session({secret: "secret" }))
 
-    let home = this.kernel.homedir
+    //let home = this.kernel.homedir
+    let home = this.kernel.store.get("home")
     this.app.get("/", async (req, res) => {
       console.log("### req.headers", req.headers)
 

package/server/public/style.css

@@ -575,7 +575,10 @@ body.dark header {
   background: var(--dark-nav-bg);
 }
 header {
+/*
   background: var(--light-nav-bg);
+  */
+  background: white;
   position: sticky;
   padding: 10px;
   top: 0;
@@ -632,9 +635,9 @@ body.dark header a.path {
 header a.path {
   text-decoration: none;
   /*
-  color: var(--light-color);
-  */
   color: var(--light-link-color);
+  */
+  color: var(--light-color);
   padding: 0 5px;
   word-wrap: break-word;
   max-width: 100%;

package/server/views/settings.ejs

@@ -87,7 +87,9 @@ body.dark .item select {
   padding: 10px;
   flex-grow: 1;
   border: none;
+  /*
   background: rgba(0,0,0,0.05);
+  */
   width: 100%;
 }
 .item select {
@@ -125,7 +127,9 @@ body.dark .item select {
   text-align: center;
 }
 body.light {
+/*
   background: var(--light-nav-bg);
+  */
 }
 /*
 form {