pinokiod 0.1.55 → 0.1.58

package/kernel/api/fs/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 //const decompress = require('decompress');
 const fs = require("fs")
+const fse = require('fs-extra')
 const Pdrive = require('pdrive')
 const { DownloaderHelper } = require('node-downloader-helper');
 const symlinkDir = require('symlink-dir')
@@ -118,7 +119,8 @@ class FS {
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
     let filepath = path.resolve(cwd, req.params.path)
-    await fs.promises.rm(filepath)
+//    await fs.promises.rm(filepath)
+    await fse.remove(filepath)
   }
   async copy(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.55",
+  "version": "0.1.58",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,7 +40,7 @@
     "multer": "^1.4.5-lts.1",
     "node-downloader-helper": "^2.1.9",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
-    "pdrive": "^0.0.10",
+    "pdrive": "^0.0.11",
     "portfinder": "^1.0.32",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",

package/server/views/browser.ejs

@@ -417,7 +417,9 @@ const renderCursor = () => {
   target.classList.add("cursor")
 }
 const renderSelection = (e, force) => {
+  console.log("# 1")
   if (location.hash && location.hash.length > 0) {
+    console.log("# 2")
     document.querySelector(".bar").classList.remove("hidden")
     let id = getTarget(location.hash.slice(1))
 
@@ -446,6 +448,7 @@ const renderSelection = (e, force) => {
     }
 
     if (target) {
+      console.log("# 3")
 
       //document.querySelector("#location").innerHTML = id
       document.querySelector("#location").innerHTML = location.hash.slice(1)
@@ -478,27 +481,37 @@ const renderSelection = (e, force) => {
             return
           }
 
+          console.log("# 4")
+
           if (e) {
+            console.log("# 5", { src: targetFrame.src, href: target.href, target: target.target })
             // triggered with a click
             // do not reload iframe if the href and the src is the same
-            if (targetFrame.src === target.href) {
+            if (targetFrame.src.includes(target.href)) {
+//            if (targetFrame.src === target.href) {
               e.preventDefault()
               e.stopPropagation()
             }
           } else {
+            console.log("# 6")
             if (force) {
+              console.log("# 7")
 //              if (targetFrame.src !== target.href) {
                 targetFrame.src = target.href
 //              }
             }
           }
         } else {
+          console.log("# 8")
           //targetFrame.contentWindow.addEventListener("load", () => {
             if (e) {
+              console.log("# 9")
               // coming from a click => don't need to set the src
             } else {
+              console.log("# 10")
               // load without click
               if (targetFrame.src !== target.href) {
+                console.log("# 11")
                 targetFrame.src = target.href
               }
             }
@@ -506,6 +519,7 @@ const renderSelection = (e, force) => {
           //});
         }
       } else {
+        console.log("# 12")
         let frame = document.createElement("iframe")
         frame.name = target.target
         frame.src = target.href
@@ -513,12 +527,14 @@ const renderSelection = (e, force) => {
         loaded[target.target] = true
       }
     } else {
+      console.log("# 13")
       // couldn't find item,
       // clear the hash
       // 
       location.hash = ""
     }
   } else {
+    console.log("# 14")
     document.querySelector(".bar").classList.add("hidden")
   }
 }