pinokiod 1.1.9 → 1.1.11

package/kernel/bin/conda.js

@@ -74,8 +74,8 @@ class Conda {
         (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
         (this.platform === 'win32' ? `activate base` : `conda activate base`),
         "conda config --add create_default_packages python=3.10",
-        "conda install -y pip brotli brotlipy",
-        "conda update -y --all",
+        "conda install -y -c conda-forge pip brotli brotlipy",
+//        "conda update -y --all",
       ]
     }, (stream) => {
       ondata(stream)

package/kernel/shell.js

@@ -512,6 +512,12 @@ class Shell {
           }
         }
       }
+      if (params.env) {
+        params.env.CONDA_PIP_INTEROP_ENABLED = "1"
+        params.env.CONDA_AUTO_ACTIVATE_BASE = "false"
+      } else {
+        params.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false" }
+      }
     } else if (params.venv) {
       let env_path = path.resolve(params.path, params.venv)
       let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))

package/package.json

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

package/server/index.js

@@ -287,7 +287,7 @@ class Server {
         name: "zip",
       }, {
         type: "conda",
-        name: "nodejs",
+        name: ["nodejs", "ffmpeg"],
         args: "-c conda-forge"
       }, {
         name: "py"
@@ -528,7 +528,7 @@ class Server {
           name: "zip",
         }, {
           type: "conda",
-          name: "nodejs",
+          name: ["nodejs", "ffmpeg"],
           args: "-c conda-forge"
         }, {
           name: "py"
@@ -994,7 +994,6 @@ class Server {
  //     console.log("*******", { filepath, pathComponents, U })
 
       let pinokio_proxy = this.kernel.api.proxies["/"]
-      console.log("pinokio_proxy", pinokio_proxy)
 
       res.render("index", {
         proxy: pinokio_proxy[0],

package/server/public/style.css

@@ -903,16 +903,18 @@ body.dark .line.align-top h3 .col .uri {
   color: var(--dark-fade);
 }
 .line.align-top h3 .col .uri i {
-  margin-right: 5px;
+  margin-right: 3px;
 }
 .line.align-top h3 .col .uri a {
   color: #54aeff;
   text-decoration: none;
 }
 .line.align-top h3 .col .uri {
-  padding: 5px 0;
+  opacity: 0.9;
+  padding-bottom: 2px;
   color: var(--light-fade);
-  font-size: 14px;
+  font-size: 12px;
+  font-family: verdana;
 }
 body.dark .line.align-top h3 .col .title a {
   color: var(--dark-link-color);

package/server/views/index.ejs

@@ -196,6 +196,7 @@ header .runner {
               </div>
             <% } %>
             <div class='col'>
+              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
               <!--<div class='title'><a href="<%=item.browser_url%>"><%=item.name%> <i class="fa-solid fa-angles-right"></i></a></div>-->
               <div class='description'><%=item.description%></div>
@@ -245,6 +246,7 @@ header .runner {
               </div>
             <% } %>
             <div class='col'>
+              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
             </div>