pinokiod 3.19.122 → 3.20.0

package/kernel/bin/cli.js

@@ -16,8 +16,9 @@ class CLI {
       exists = await Util.exists(this.kernel.path("bin/npm/bin/pterm"))
     }
     if (exists) {
-      let p = this.kernel.which("pterm")
-      if (p) {
+//      let p = this.kernel.which("pterm")
+//      console.log({ exists, p})
+//      if (p) {
         let res = await this.kernel.exec({
           message: "pterm version terminal"
         }, ondata)
@@ -33,9 +34,9 @@ class CLI {
         } else {
           return false
         }
-      } else {
-        return false
-      }
+//      } else {
+//        return false
+//      }
     } else {
       return false
     }

package/kernel/bin/git.js

@@ -66,6 +66,24 @@ class Git {
       path.resolve(__dirname, "..", "scripts/git/commit"),
       gitcommit_path
     )
+
+    let gitcheckout_path = path.resolve(this.kernel.homedir, "scripts/git/checkout.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/checkout"),
+      gitcheckout_path
+    )
+
+    let gitreset_commit_path = path.resolve(this.kernel.homedir, "scripts/git/reset_commit.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/reset_commit"),
+      gitreset_commit_path
+    )
+
+    let gitreset_file_path = path.resolve(this.kernel.homedir, "scripts/git/reset_file.json")
+    await fs.promises.copyFile(
+      path.resolve(__dirname, "..", "scripts/git/reset_file"),
+      gitreset_file_path
+    )
   }
   async installed() {
     let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")

package/kernel/git.js

@@ -28,7 +28,6 @@ class Git {
   }
 
   async repos (root) {
-    console.time("Repos " + root)
     let _repos = await this.findGitDirs(root)
 //    let _repos = await glob('**/.git/', {
 //      cwd: root,
@@ -36,10 +35,8 @@ class Git {
 //      dot: true,
 //      ignore: ['**/node_modules/**', "**/venv/**"], // optional
 //    });
-    console.timeEnd("Repos " + root)
 
     let name = path.basename(root)
-    console.time("Get config " + root)
 
     let repos = []
     for(let r of _repos) {
@@ -83,7 +80,6 @@ class Git {
       }
       this.dirs.add(dir)
     }
-    console.timeEnd("Get config " + root)
     return repos
   }
   async config (dir) {

package/kernel/scripts/git/checkout

@@ -0,0 +1,11 @@
+{
+  "run": [{
+    "method": "shell.run",
+    "params": {
+      "path": "{{args.cwd}}",
+      "message": [
+        "git checkout {{args.commit}}"
+      ]
+    }
+  }]
+}

package/kernel/scripts/git/reset_commit

@@ -0,0 +1,11 @@
+{
+  "run": [{
+    "method": "shell.run",
+    "params": {
+      "path": "{{args.cwd}}",
+      "message": [
+        "git reset --hard HEAD"
+      ]
+    }
+  }]
+}

package/kernel/scripts/git/reset_file

@@ -0,0 +1,11 @@
+{
+  "run": [{
+    "method": "shell.run",
+    "params": {
+      "path": "{{args.cwd}}",
+      "message": [
+        "git restore {{args.path}}"
+      ]
+    }
+  }]
+}

package/kernel/shell.js

@@ -1015,9 +1015,7 @@ class Shell {
     return params
   }
   async exec(params) {
-    console.log("before activate", params.message)
     params = await this.activate(params)
-    console.log("after activate", params.message)
     this.cmd = this.build(params)
     console.log("build", this.cmd)
     let res = await new Promise((resolve, reject) => {

package/kernel/util.js

@@ -709,8 +709,10 @@ const ignore_subrepos = async (root_path, repos) => {
     '/facefusion-pinokio.git/facefusion/'
   ]
   */
-  let repo_paths = repos.map((r) => {
-    return "/" + r.gitParentRelPath + "/"
+  let repo_paths = repos.filter((r) => {
+    return r.gitParentPath !== root_path
+  }).map((r) => {
+    return "/" + path.relative(root_path, r.gitParentPath) + "/"
   })
 
   let gitignore = path.resolve(root_path, ".gitignore")
@@ -723,16 +725,17 @@ const ignore_subrepos = async (root_path, repos) => {
       content = await fs.promises.readFile(gitignore, "utf8");
       lines = content.split(/\r?\n/);
     } catch (err) {
-//      if (err.code !== "ENOENT") throw err; // ignore missing file, throw others
     }
-
-    const trimmedLines = lines.map(line => line.trim());
-    const missingRepos = repos.filter(repo => !trimmedLines.includes(repo));
-
-    if (missingRepos.length > 0) {
-      const textToAppend = (content.endsWith("\n") ? "" : "\n") + missingRepos.join("\n") + "\n";
-      console.log("append", textToAppend)
-      await fs.promises.appendFile(gitignore, textToAppend, "utf8");
+//      if (err.code !== "ENOENT") throw err; // ignore missing file, throw others
+    
+
+    if (content) {
+      const trimmedLines = lines.map(line => line.trim());
+      const missingRepos = repo_paths.filter(repo => !trimmedLines.includes(repo));
+      if (missingRepos.length > 0) {
+        const textToAppend = (content.endsWith("\n") ? "" : "\n") + missingRepos.join("\n") + "\n";
+        await fs.promises.appendFile(gitignore, textToAppend, "utf8");
+      }
     }
   } else {
     // does not exist, don't do anything yet

package/package.json

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