pinokiod 2.15.38 → 2.15.40

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,38 @@ 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 type = (options && options.
+  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.38",
+  "version": "2.15.40",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1329,6 +1329,7 @@ class Server {
         readme,
         filepath,
         mode: null,
+        kernel: this.kernel,
         //mode: (req.query && req.query.mode ? req.query.mode : null),
         items
       })
@@ -2087,10 +2088,14 @@ class Server {
       origin: '*'
     }));
 
+    this.app.use(express.static(this.kernel.path("web/public")))
     this.app.use(express.static(path.resolve(__dirname, 'public')));
     this.app.use("/web", express.static(path.resolve(__dirname, "..", "..", "web")))
     this.app.set('view engine', 'ejs');
-    this.app.set("views", path.resolve(__dirname, "views"))
+    this.app.set("views", [
+      this.kernel.path("web/views"),
+      path.resolve(__dirname, "views")
+    ])
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     this.app.use(cookieParser());
@@ -2229,7 +2234,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) => {
@@ -2645,10 +2650,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)

package/server/views/index.ejs

@@ -854,7 +854,6 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      debugger
       let res = await fetch("/pinokio/delete", {
         method: "post",
         headers: {

package/server/views/settings.ejs

@@ -233,6 +233,8 @@ hr {
 <div class='nav-btns'>
   <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
   <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
+  <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Debug</div></button>
+  <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
@@ -454,6 +456,24 @@ document.addEventListener("DOMContentLoaded", async () => {
   document.querySelector("#forward").addEventListener("click", (e) => {
     history.forward()
   })
+  if (document.querySelector("#genlog")) {
+    document.querySelector("#genlog").addEventListener("click", (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      e.target.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
+      fetch("/pinokio/log", {
+        method: "post",
+      }).then((res) => {
+        console.log("RES", res)
+        let btn = document.querySelector("#genlog")
+        let btn2 = document.querySelector("#downloadlogs")
+        btn2.classList.remove("hidden") 
+        btn.classList.add("hidden")
+        btn.innerHTML = '<i class="fa-solid fa-circle-check"></i> Generated!'
+        //btn.classList.add("hidden")
+      })
+    })
+  }
   document.querySelector("#explore").addEventListener("click", async (e) => {
     e.preventDefault()
     e.stopPropagation()