pinokiod 3.2.153 → 3.2.155

package/kernel/bin/conda.js

@@ -99,45 +99,56 @@ create_default_packages:
     console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     let conda_check = {}
+    let conda = new Set()
+    let start = false
     for(let line of lines) {
-      let chunks = line.split(/\s+/).filter(x => x)
-      if (chunks.length > 1) {
-        let name = chunks[0]
-        let version = chunks[1]
-        if (name === "conda") {
-          if (String(version) === "24.11.1") {
-            conda_check.conda = true
+      console.log({ line, start })
+      if (start) {
+        let chunks = line.split(/\s+/).filter(x => x)
+        if (chunks.length > 1) {
+          let name = chunks[0]
+          let version = chunks[1]
+          conda.add(name)
+          if (name === "conda") {
+            if (String(version) === "24.11.1") {
+              conda_check.conda = true
+            }
           }
-        }
-        // check conda-libmamba-solver is up to date
-        // sometimes it just fails silently so need to check
-        if (name === "conda-libmamba-solver") {
-          //if (String(version) === "24.7.0") {
-          let channel = chunks[3]
-          let coerced = semver.coerce(version)
-          let mamba_requirement = ">=24.11.1"
-          console.log({ name, channel, version })
-          if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
-            conda_check.mamba = true
+          // check conda-libmamba-solver is up to date
+          // sometimes it just fails silently so need to check
+          if (name === "conda-libmamba-solver") {
+            //if (String(version) === "24.7.0") {
+            let channel = chunks[3]
+            let coerced = semver.coerce(version)
+            let mamba_requirement = ">=24.11.1"
+            console.log({ name, channel, version })
+            if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
+              conda_check.mamba = true
+            }
           }
-        }
 
-        // Use sqlite to check if `conda update -y --all` went through successfully
-        // sometimes it just fails silently so need to check
-        if (name === "sqlite") {
-          let coerced = semver.coerce(version)
-          let sqlite_requirement = ">=3.47.2"
-          console.log({ coerced, version, sqlite_requirement })
-          if (semver.satisfies(coerced, sqlite_requirement)) {
-            console.log("semver satisfied")
-            conda_check.sqlite = true
-          } else {
-            console.log("semver NOT satisfied")
+          // Use sqlite to check if `conda update -y --all` went through successfully
+          // sometimes it just fails silently so need to check
+          if (name === "sqlite") {
+            let coerced = semver.coerce(version)
+            let sqlite_requirement = ">=3.47.2"
+            console.log({ coerced, version, sqlite_requirement })
+            if (semver.satisfies(coerced, sqlite_requirement)) {
+              console.log("semver satisfied")
+              conda_check.sqlite = true
+            } else {
+              console.log("semver NOT satisfied")
+            }
           }
         }
+      } else {
+        if (/.*name.*version.*build.*channel/i.test(line)) {
+          start = true 
+        }
       }
     }
-    console.log("> Check", { conda_check })
+    console.log("> Check", { conda_check, conda })
+    this.kernel.bin.installed.conda = conda
     return conda_check.conda && conda_check.mamba && conda_check.sqlite
   }
   async install(req, ondata) {

package/kernel/bin/index.js

@@ -244,6 +244,7 @@ class Bin {
     console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     for(let line of lines) {
+      console.log({ line, start })
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
         if (chunks.length > 1) {
@@ -280,7 +281,7 @@ class Bin {
           }
         }
       } else {
-        if (/name.*version.*build.*channel/i.test(line)) {
+        if (/.*name.*version.*build.*channel/i.test(line)) {
           start = true 
         }
       }
@@ -486,10 +487,10 @@ class Bin {
 
     let install = requirement.install // custom install command
     let args = requirement.args || ""
-    if (requirement.installed) {
-      console.log("Already installed", requirement)
-    } else {
-      console.log("Not yet installed", requirement)
+//    if (requirement.installed) {
+//      console.log("Already installed", requirement)
+//    } else {
+//      console.log("Not yet installed", requirement)
       /*
         {
           platform: win32|darwin|linux|<none>,
@@ -542,7 +543,7 @@ class Bin {
         }
 
       }
-    }
+//    }
   }
   async install(req, ondata) {
     /*

package/kernel/util.js

@@ -25,6 +25,7 @@ if( __dirname.includes(".asar") ) {
 }
 const { getFolderSize, getFolderSizeBin, getFolderSizeWasm, } = g
 const du = async (folderpath) => {
+  return 0;
   console.time("disk size calc")
   let totalSize = await getFolderSizeBin(folderpath)
   console.timeEnd("disk size calc")

package/package.json

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