pinokiod 3.19.98 → 3.19.100

package/kernel/api/fs/index.js

@@ -410,6 +410,25 @@ class FS {
     }
 
   }
+  async make(req, ondata, kernel) {
+    /*
+      {
+        method: "fs.make",
+        params: {
+          path: "data/db"
+        }
+      }
+    */
+    // mkdir
+    let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
+    if (req.params.path) {
+      let _path = kernel.api.filePath(req.params.path, cwd)
+      await fs.promises.mkdir(_path, { recursive: true }).catch((e) => { })
+    }
+  }
+  async remove(req, ondata, kernel) {
+    await this.rm(req, ondata, kernel)
+  }
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
     //let filepath = path.resolve(cwd, req.params.path)

package/kernel/api/index.js

@@ -1387,9 +1387,11 @@ class Api {
           break;
         }
       }
-      if (this.kernel.template.istemplate(request)) {
-        console.log("something wrong with the request", request)
-        return
+      if (request.method.startsWith("kernel")) {
+        if (this.kernel.template.istemplate(request)) {
+          console.log("something wrong with the request", request)
+          return
+        }
       }
 
       // replace {{{ }}} with {{ }}

package/kernel/api/local/index.js

@@ -46,8 +46,6 @@ class Local {
         }
       }
     */
-
-
     let converted = Object.assign({}, req, {
       params: {
         local: req.params

package/kernel/bin/cli.js

@@ -15,11 +15,8 @@ class CLI {
     } else {
       exists = await Util.exists(this.kernel.path("bin/npm/bin/pterm"))
     }
-    console.log("cli check")
-    console.log({exists})
     if (exists) {
       let p = this.kernel.which("pterm")
-      console.log({ p })
       if (p) {
         let res = await this.kernel.exec({
           message: "pterm version terminal"
@@ -28,7 +25,6 @@ class CLI {
         if (e && e.length > 0) {
           let v = e[1]
           let coerced = semver.coerce(v)
-          console.log({ e, v, coerced })
           if (semver.satisfies(coerced, this.version)) {
             return true
           } else {

package/kernel/git.js

@@ -7,22 +7,54 @@ const ini = require('ini')
 class Git {
   constructor(kernel) {
     this.kernel = kernel
+    this.dirs = new Set()
   }
+  async findGitDirs(dir, results = []) {
+    const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        if (entry.name === '.git') {
+          results.push(path.join(dir, entry.name));
+          continue; // don't go deeper in this repo
+        }
+        if (entry.name === 'node_modules' || entry.name === 'venv' || entry.name.startsWith(".")) {
+          continue; // skip these heavy folders
+        }
+        await this.findGitDirs(path.join(dir, entry.name), results);
+      }
+    }
+    return results;
+  }
+
   async repos (root) {
-    let _repos = await glob('**/.git/', {
-      cwd: root,
-      onlyDirectories: true,
-      dot: true,
-      ignore: ['**/node_modules/**', "**/venv/**"], // optional
-    });
+    console.time("Repos " + root)
+    let _repos = await this.findGitDirs(root)
+//    let _repos = await glob('**/.git/', {
+//      cwd: root,
+//      onlyDirectories: true,
+//      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) {
       const gitPath = path.resolve(root, r)
       const gitRelPath = path.relative(root, gitPath)
+      const gitRelPathSansGit = path.dirname(gitRelPath)
       const gitParentPath = path.dirname(gitPath)
       const gitParentRelPath = path.relative(this.kernel.path("api"), gitParentPath)
       let dir = path.dirname(gitPath)
+      let display_name
+      if (gitRelPathSansGit === ".") {
+        display_name = name
+      } else {
+        display_name = `${name}/${gitRelPathSansGit}`
+      }
       try {
         let gitRemote = await git.getConfig({
           fs,
@@ -31,6 +63,7 @@ class Git {
           path: 'remote.origin.url'
         })
         repos.push({
+          name: display_name,
           gitPath,
           gitRelPath,
           gitParentPath,
@@ -40,6 +73,7 @@ class Git {
         })
       } catch (e) {
         repos.push({
+          name: display_name,
           gitPath,
           gitRelPath,
           gitParentPath,
@@ -47,7 +81,9 @@ class Git {
           dir,
         })
       }
+      this.dirs.add(dir)
     }
+    console.timeEnd("Get config " + root)
     return repos
   }
   async config (dir) {
@@ -60,5 +96,22 @@ class Git {
       return null
     }
   }
+  async resolveCommitOid(dir, ref) {
+    const oid = await git.resolveRef({ fs, dir, ref });
+    const { type } = await git.readObject({ fs, dir, oid });
+    if (type === "tag") {
+      const { object } = await git.readTag({ fs, dir, oid });
+      return object;
+    }
+    if (type !== "commit") {
+      throw new Error(`Ref ${ref} points to a ${type}, not a commit.`);
+    }
+    return oid;
+  }
+
+  async getParentCommit(dir, commitOid) {
+    const { commit } = await git.readCommit({ fs, dir, oid: commitOid });
+    return commit.parent[0] || commitOid; // For initial commit
+  }
 }
 module.exports = Git

package/kernel/index.js

@@ -638,7 +638,6 @@ class Kernel {
         return null
       }
     } else {
-      console.log("which.sync", name, this.envs.PATH)
       return which.sync(name, { nothrow: true, path: this.envs.PATH })
     }
   }

package/kernel/plugin.js

@@ -19,6 +19,7 @@ class Plugin {
       let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
       let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
       this.config = await this.kernel.require(pinokiojs)
+      this.cache = {}
     }
   }
   async update() {

package/kernel/util.js

@@ -184,8 +184,16 @@ const log = async (filepath, str, session) => {
     ].join('|');
     const regex = new RegExp(pattern, 'gi')
     let stripped = str.replaceAll(regex, '');
+
+    // write to session
     let logpath = path.resolve(filepath, session)
     await fs.promises.writeFile(logpath, stripped)
+
+    // create latest from last 10 sessions
+
+    let dirpath = path.dirname(filepath)
+
+
     let latest_logpath = path.resolve(filepath, "latest")
     await fs.promises.writeFile(latest_logpath, stripped)
   }
@@ -520,41 +528,16 @@ function u2p(urlPath) {
 }
 
 function classifyChange(head, workdir, stage) {
-  const key = `${head}${workdir}${stage}`;
-
-  // HEAD | WORKDIR | STAGE
-  switch (key) {
-    case '000':
-      return 'unmodified'; // shouldn't show up
-    case '001':
-      return 'added (staged)';
-    case '002':
-      return 'added (unstaged)';
-    case '003':
-      return 'added (staged + modified)';
-    case '010':
-    case '020':
-      return 'untracked';
-    case '100':
-      return 'deleted (unstaged)';
-    case '101':
-      return 'deleted (staged)';
-    case '102':
-      return 'deleted (staged, but modified)';
-    case '110':
-      return 'modified (unstaged)';
-    case '111':
-      return 'modified (staged)';
-    case '112':
-      return 'modified (staged + unstaged)';
-    case '120':
-      return 'type changed (unstaged)';
-    case '121':
-      return 'type changed (staged)';
-    default:
-      return `unknown (${key})`;
-  }
-
+  if (head === 0 && workdir === 0 && stage === 0) return null; // shouldn't appear
+  if (head === 0 && workdir === 3) return 'untracked';
+  if (head === 0 && stage === 3) return 'added (staged)';
+  if (head === 1 && workdir === 0 && stage === 0) return 'deleted (unstaged)';
+  if (head === 1 && workdir === 0 && stage === 0) return 'deleted (staged)';
+  if (head === 1 && workdir === 2 && stage === 0) return 'modified (unstaged)';
+  if (head === 1 && workdir === 1 && stage === 2) return 'modified (staged)';
+  if (head === 1 && workdir === 2 && stage === 2) return 'modified (staged + unstaged)';
+  if (head === 1 && workdir === 1 && stage === 0) return 'clean';
+  return `unknown (${head},${workdir},${stage})`;
 }
 
 
@@ -659,6 +642,45 @@ function diffLinesWithContext(diffs, context = 3) {
 
   return summarized;
 }
+const readLines = async (filePath) => {
+  try {
+    const data = await fs.promises.readFile(filePath, 'utf-8');
+    return data
+      .split(/\r?\n/)
+      .map(line => line.trim())
+      .filter(line => line.length > 0 && !line.startsWith('#'));
+  } catch (err) {
+    if (err.code === 'ENOENT') return [];
+    throw err;
+  }
+}
+
+const mergeLines = async (existingFilepath, filepath2) => {
+  let e = await exists(existingFilepath)
+  if (e) {
+    // exists. merge
+    console.log(existingFilepath, "exists. merge")
+    const existing = await readLines(existingFilepath)
+    const other = await readLines(filepath2);
+    const merged = [...new Set([...existing, ...other])].sort().join('\n') + '\n';
+
+    let current = await fs.promises.readFile(existingFilepath, "utf8")
+    if (current.trim() !== merged.trim()) {
+      console.log("merged has changed")
+      // changed
+      await fs.promises.writeFile(existingFilepath, merged)
+    } else {
+      console.log(" no changes needed")
+    }
+  } else {
+    // does not exist, just copy 
+    console.log(existingFilepath, "does not exist. copy")
+    await fs.promises.cp(filepath2, existingFilepath)
+  }
+  
+}
+
+
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists, clipboard
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists, clipboard, mergeLines
 }

package/package.json

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