pinokiod 2.15.26 → 2.15.28

package/kernel/util.js

@@ -20,7 +20,7 @@ const returnReplacement = "\\r";
 
 const { getDirSize, getDirSizeSync } = require('fast-dir-size')
 
-const fastFolderSizeAsync = promisify(fastFolderSize)
+//const fastFolderSizeAsync = promisify(fastFolderSize)
 
 const du = (folderpath) => {
   //return fastFolderSizeAsync(folderpath)

package/package.json

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

package/server/views/browser-experimental.ejs

@@ -427,6 +427,7 @@ body.dark #location {
   display: flex;
   align-items: stretch;
   width: 100%;
+  flex-wrap: wrap;
 }
 body.dark .header-item.cursor.header-top {
   background: none !important;
@@ -487,6 +488,15 @@ body.dark .loader-container {
   font-size: 12px;
   font-weight: bold;
 }
+.disk-usage {
+  flex-grow: 1;
+  text-align: right;
+  font-weight: bold;
+}
+.disk-usage i {
+  margin-right: 5px;
+  font-size: 16px !important;
+}
 @media only screen and (max-width: 480px) {
   nav .btn2 {
     width: auto !important;
@@ -519,9 +529,11 @@ body.dark .loader-container {
     width: 100%;
     height: 100%;
   }
+  /*
   .grid-btns {
     display: none;
   }
+  */
   #menu {
     display: none;
   }
@@ -529,12 +541,6 @@ body.dark .loader-container {
     display: flex;
   }
 }
-.disk-usage {
-}
-.disk-usage i {
-  margin-right: 5px;
-  font-size: 16px !important;
-}
 </style>
 </head>
 <body class='<%=theme%>' data-platform="<%=platform%>">
@@ -555,7 +561,6 @@ body.dark .loader-container {
         <i class="fa-regular fa-circle-dot"></i>
       <% } %>
       <div><%=config.title%></div>
-      <div class='disk-usage'></div>
     </div>
   </div>
   <div class='m n system' data-type="n">
@@ -564,7 +569,7 @@ body.dark .loader-container {
       <div class='tab'><i class="fa-solid fa-trash-can"></i> Delete</div>
     </div>
     <a target="<%=src%>" href="<%=src%>" class='btn header-item frame-link' data-index="0">
-      <div class='tab'><i class="fa-regular fa-folder-open"></i> Files</div>
+      <div class='tab'><i class="fa-regular fa-folder-open"></i> Files <div class='disk-usage'></div></div>
     </a>
     <a target="/share/<%=name%>" href="/share/<%=name%>", class="btn header-item frame-link" data-index="1" data-mode="refresh">
       <div class='tab'><i class="fa-solid fa-wifi"></i> Share</div>
@@ -804,9 +809,11 @@ const renderSelection = (e, force) => {
       // minimize aside
 
       document.querySelector(".container").classList.add("active")
+      document.querySelector(".container").classList.remove("hidden")
       document.querySelector("aside").classList.remove("active")
     } else {
       document.querySelector(".container").classList.remove("active")
+      document.querySelector(".container").classList.add("hidden")
       document.querySelector("aside").classList.add("active")
     }
 
@@ -1051,6 +1058,7 @@ const renderSelection = (e, force) => {
   } else {
     console.log("# 14")
     document.querySelector(".container").classList.remove("active")
+    document.querySelector(".container").classList.add("hidden")
     document.querySelector("aside").classList.add("active")
 
   }
@@ -1179,7 +1187,7 @@ const addTab = async (url) => {
 if (document.querySelector("#menu-mobile")) {
   document.querySelector("#menu-mobile").addEventListener("click", async (e) => {
     location.hash = ""
-    refresh()
+    refresh(false, { nodelay: true })
   })
 }
 if (document.querySelector("#menu")) {
@@ -1393,13 +1401,18 @@ document.querySelector("aside").addEventListener("click", async (e) => {
 
 
 })
-const refresh = async (silent) => {
+const refresh = async (silent, options) => {
   console.log("REFRESH")
-  await new Promise((resolve, reject) => {
-    setTimeout(() => {
-      resolve()
-    }, 1000)
-  })
+  if (options && options.nodelay) {
+    console.log("1")
+  } else {
+    console.log("2")
+    await new Promise((resolve, reject) => {
+      setTimeout(() => {
+        resolve()
+      }, 1000)
+    })
+  }
   const html = await fetch("<%=sidebar%>").then((res) => {
     return res.text()
   })
@@ -1409,11 +1422,14 @@ const refresh = async (silent) => {
   // render the selected frame only if not silent
   if (silent) {
   } else {
-    await new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve()
-      }, 1000)
-    })
+    if (options && options.nodelay) {
+    } else {
+      await new Promise((resolve, reject) => {
+        setTimeout(() => {
+          resolve()
+        }, 1000)
+      })
+    }
     renderSelection()
   }
 }
@@ -1492,7 +1508,8 @@ fetch("/du/<%=name%>").then((res) => {
     // KB
     val = `${Math.floor(res.du/1000 * 100) / 100} KB`
   }
-  document.querySelector(".disk-usage").innerHTML = `<i class="fa-regular fa-hard-drive"></i> ${val}`
+  //document.querySelector(".disk-usage").innerHTML = `<i class="fa-regular fa-hard-drive"></i> ${val}`
+  document.querySelector(".disk-usage").innerHTML = val
 })
 /*
 document.addEventListener("keydown", (e) => {