pinokiod 1.1.12 → 1.1.14

package/kernel/shell.js

@@ -469,6 +469,9 @@ class Shell {
         // using the base env
         params.message = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${params.conda}`,
         ].concat(params.message)
       } else {
@@ -479,13 +482,19 @@ class Shell {
             params.message = [
               (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
               //`conda activate ${params.conda}`,
+              `conda deactivate`,
+              `conda deactivate`,
+              `conda deactivate`,
               `conda activate ${env_path}`,
             ].concat(params.message)
           } else {
             params.message = [
               (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-              `conda create -y -p ${env_path}`,
+              `conda create -y -p ${env_path} python=3.10`,
               //`conda activate ${params.conda}`,
+              `conda deactivate`,
+              `conda deactivate`,
+              `conda deactivate`,
               `conda activate ${env_path}`,
             ].concat(params.message)
           }
@@ -495,6 +504,9 @@ class Shell {
           if (env_exists) {
             params.message = [
               (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+              `conda deactivate`,
+              `conda deactivate`,
+              `conda deactivate`,
               `conda activate ${env_path}`,
             ].concat(params.message)
           } else {
@@ -502,11 +514,14 @@ class Shell {
             if (params.conda.python) {
               create_command = `conda create -y -p ${env_path} python=${params.conda.python}`
             } else {
-              create_command = `conda create -y -p ${env_path}`
+              create_command = `conda create -y -p ${env_path} python=3.10`
             }
             params.message = [
               (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
               create_command,
+              `conda deactivate`,
+              `conda deactivate`,
+              `conda deactivate`,
               `conda activate ${env_path}`,
             ].concat(params.message)
           }

package/package.json

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

package/server/index.js

@@ -345,7 +345,10 @@ class Server {
     } else if (pathComponents.length === 0 && req.query.mode === "settings") {
       let configArray = [{
         key: "home",
-        description: "* Do NOT use exFAT drives",
+        description: [
+          "* Do NOT use a path that includes white spaces (' ').",
+          "* Do NOT use exFAT drives.",
+        ],
         val: this.kernel.homedir,
         placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
       }, {
@@ -1660,7 +1663,10 @@ class Server {
       if (req.query.mode === 'settings') {
         let configArray = [{
           key: "home",
-          description: "* Do NOT use exFAT drives",
+          description: [
+            "* Do NOT use a path that includes white spaces (' ').",
+            "* Do NOT use exFAT drives.",
+          ],
           val: this.kernel.homedir ? this.kernel.homedir : path.resolve(os.homedir(), "pinokio"),
           placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
         }, {
@@ -1914,19 +1920,31 @@ class Server {
       })
     })
     this.app.post("/pinokio/delete", async (req, res) => {
-      if (req.body.name) {
-        let folderPath = this.kernel.path("api", req.body.name)
-        console.log("delete", folderPath)
-        await fse.remove(folderPath)
-        await new Promise((resolve, reject) => {
-          setTimeout(() => {
-            resolve()
-          }, 5000)
-        })
-        console.log("deleted")
-        res.json({ success: true })
-      } else {
-        res.json({ error: e.stack })
+      try {
+        if (req.body.type === 'bin') {
+          let folderPath = this.kernel.path("bin")
+          console.log("del folderPath", folderPath)
+          await fse.remove(folderPath)
+          res.json({ success: true })
+        } else if (req.body.type === 'cache') {
+          let folderPath = this.kernel.path("cache")
+          console.log("del folderPath", folderPath)
+          await fse.remove(folderPath)
+          res.json({ success: true })
+        } else if (req.body.name) {
+          let folderPath = this.kernel.path("api", req.body.name)
+          console.log("delete", folderPath)
+          await fse.remove(folderPath)
+          await new Promise((resolve, reject) => {
+            setTimeout(() => {
+              resolve()
+            }, 5000)
+          })
+          console.log("deleted")
+          res.json({ success: true })
+        }
+      } catch(err) {
+        res.json({ error: err.stack })
       }
     })
 //    this.app.get("/pinokio/shell_state", (req, res) => {

package/server/views/settings.ejs

@@ -70,17 +70,21 @@
   text-transform: uppercase;
   letter-spacing: 0;
 }
+.item > .d {
+  padding-bottom: 10px;
+}
 .item button {
   padding: 10px 20px;
 }
 .item label {
   display: block;
-  text-transform: uppercase;
+  text-transform: capitalize;
   font-size: 20px;
   font-weight: bold;
   padding-bottom: 5px;
 }
 .item .explanation {
+  white-space: pre;
   padding-top: 5px;
   color: brown;
   font-size: 14px;
@@ -160,6 +164,16 @@ header .home {
   color: var(--light-color); 
   padding: 10px;
 }
+body.dark hr {
+  background: white;
+}
+hr {
+  opacity: 0.03;
+  background: black;
+  margin: 50px 0;
+  height: 1px;
+  border: none;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -240,7 +254,13 @@ header .home {
           <% } %>
         <% } %>
         <% if (c.description) { %>
-        <div class='explanation'><%=c.description%></div>
+          <% if (Array.isArray(c.description)) { %>
+            <% c.description.forEach((d) => { %>
+              <div class='explanation'><%=d%></div>
+            <% }) %>
+          <% } else { %>
+            <div class='explanation'><%=c.description%></div>
+          <% } %>
         <% } %>
       </div>
     <% }) %>
@@ -250,6 +270,29 @@ header .home {
   <div class='loading hidden'>
     <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
   </div>
+  <hr/>
+  <div class='troubleshoot'>
+    <h1>Troubleshoot</h1>
+    <br>
+    <br>
+    <div class='item'>
+      <label>Reset bin</label>
+      <div class='d'>Reset the bin folder and start fresh from scratch</div>
+      <div class='reset-bin-loading hidden'>
+        <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+      </div>
+      <div><button class='btn' id='del-bin'>Reset</button></div>
+    </div>
+    <div class='item'>
+      <label>Reset cache</label>
+      <div class='d'>Reset the cache folder and start fresh from scratch</div>
+      <div class='reset-cache-loading hidden'>
+        <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+      </div>
+      <div><button class='btn' id='del-cache'>Reset</button></div>
+    </div>
+  </div>
+  <hr/>
 </div>
 </div>
 </main>
@@ -257,6 +300,48 @@ header .home {
 document.addEventListener("DOMContentLoaded", async () => {
   Reporter()
   const n = new N()
+  document.querySelector("#del-bin").addEventListener("click", async (e) => {
+    console.log("del-bin")
+    document.querySelector(".reset-bin-loading").classList.remove("hidden")
+    document.querySelector("#del-bin").classList.add("hidden")
+    let res = await fetch("/pinokio/delete", {
+      method: "post",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ type: "bin" })
+    }).then((res) => {
+      return res.json()
+    })
+    console.log(res)
+    document.querySelector(".reset-bin-loading").classList.add("hidden")
+    if (res.error) {
+      alert(res.error)
+    } else {
+      location.href = location.href
+    }
+  })
+  document.querySelector("#del-cache").addEventListener("click", async (e) => {
+    console.log("del-cache")
+    document.querySelector(".reset-cache-loading").classList.remove("hidden")
+    document.querySelector("#del-cache").classList.add("hidden")
+    let res = await fetch("/pinokio/delete", {
+      method: "post",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ type: "cache" })
+    }).then((res) => {
+      return res.json()
+    })
+    console.log(res)
+    document.querySelector(".reset-cache-loading").classList.add("hidden")
+    if (res.error) {
+      alert(res.error)
+    } else {
+      location.href = location.href
+    }
+  })
   document.querySelector("form").addEventListener("submit", async (e) => {
     e.preventDefault()
     e.stopPropagation()