pinokiod 2.15.39 → 2.15.41

package/kernel/api/fs/index.js

@@ -75,12 +75,17 @@ class FS {
     /*
       params := {
         path: <filepath>,
+        mode: "view(default)|open"
       }
       open finder/file explorer at path
     */
     let dirPath = path.resolve(req.cwd, req.params.path)
     ondata({ raw: `\r\nopening path: ${dirPath}\r\n` })
-    Util.openfs(dirPath)
+    if (req.params.mode) {
+      Util.openfs(dirPath, req.params.mode)
+    } else {
+      Util.openfs(dirPath)
+    }
   }
 
   async link(req, ondata, kernel) {

package/kernel/util.js

@@ -61,19 +61,37 @@ const parse_env = async (filename) => {
     return {}
   }
 }
-const openfs = (dirPath) => {
+const openfs = (dirPath, options) => {
   let command = '';
   const platform = os.platform()
-  switch (platform) {
-    case 'darwin':
-      command = `open -R "${dirPath}"`;
-      break;
-    case 'win32':
-      command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
-      break;
-    default:
-      command = `xdg-open "${dirPath}"`;
-      break;
+  let mode = "view"
+  if (options && options.mode) {
+    mode = options.mode
+  }
+  if (mode === "view") {
+    switch (platform) {
+      case 'darwin':
+        command = `open -R "${dirPath}"`;
+        break;
+      case 'win32':
+        command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
+        break;
+      default:
+        command = `xdg-open "${dirPath}"`;
+        break;
+    }
+  } else if (mode === "open") {
+    switch (platform) {
+      case 'darwin':
+        command = `open "${dirPath}"`;
+        break;
+      case 'win32':
+        command = `explorer "${dirPath}"`;
+        break;
+      default:
+        command = `xdg-open "${dirPath}"`;
+        break;
+    }
   }
   child_process.exec(command)
 }

package/package.json

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

package/server/index.js

@@ -1761,6 +1761,7 @@ class Server {
   }
 
   async syncConfig() {
+
     // 1. THEME
     this.theme = this.kernel.store.get("theme") || "light"
     if (this.theme === "dark") {
@@ -2018,6 +2019,22 @@ class Server {
         await fs.promises.writeFile(path.resolve(this.homedir, "ENVIRONMENT"), str)
       }
 
+      // custom theme
+      console.log(this.kernel.path('web'))
+      let exists = await fse.pathExists(this.kernel.path("web"))
+      console.log("Exists", exists)
+      if (exists) {
+        let config_exists = await fse.pathExists(this.kernel.path("web/config.json"))
+        if (config_exists) {
+          let config = (await this.kernel.loader.load(this.kernel.path("web/config.json"))).resolved
+          if (config) {
+            if (config.color) this.colors.color = config.color
+            if (config.symbolColor) this.colors.symbolColor = config.symbolColor
+          }
+        }
+      }
+
+
 //      let env = await Environment.get(this.kernel.homedir)
 //      if (env && env.PINOKIO_PORT) {
 //        this.port = env.PINOKIO_PORT
@@ -2234,7 +2251,7 @@ class Server {
     }))
 
     this.app.post("/openfs", ex(async (req, res) => {
-      Util.openfs(req.body.path)
+      Util.openfs(req.body.path, req.body.mode)
       res.json({ success: true })
     }))
     this.app.get("/proxy", ex(async (req, res) => {
@@ -2650,10 +2667,21 @@ class Server {
       if (req.query && 'fs' in req.query) {
         // open in file system
         let full_filepath = this.kernel.path("api", ...pathComponents)
-        Util.openfs(full_filepath)
-        res.render("fs", {
-          path: full_filepath
-        })
+        if (req.query.fs) {
+          if (req.query.fs === 'open') {
+            // open
+            Util.openfs(full_filepath, { mode: "open" })
+          } else if (req.query.fs === 'view') {
+            // view
+            Util.openfs(full_filepath, { mode: "view" })
+          } else {
+            // view
+            Util.openfs(full_filepath, { mode: "view" })
+          }
+          res.render("fs", {
+            path: full_filepath
+          })
+        }
       } else {
         try {
           await this.render(req, res, pathComponents)