pinokiod 3.227.0 → 3.229.0

package/kernel/bin/conda.js

@@ -185,8 +185,10 @@ report_errors: false`)
       }
     }
     this.kernel.bin.installed.conda = conda
-    this.installed.conda_versions = conda_versions
+    this.kernel.bin.installed.conda_versions = conda_versions
     return conda_check.conda && conda_check.mamba && conda_check.sqlite
+    console.log("2 this.installed.conda", this.kernel.bin.installed.conda)
+    console.log("2 this.installed.conda_versions", this.kernel.bin.installed.conda_versions)
     //return conda_check.conda && conda_check.mamba
   }
   async install(req, ondata) {

package/kernel/bin/cuda.js

@@ -1,4 +1,6 @@
 const semver = require('semver')
+const fs = require('fs')
+const path = require('path')
 class Cuda {
   async install(req, ondata) {
     if (this.kernel.platform === "win32") {
@@ -14,6 +16,18 @@ class Cuda {
           "conda install -y nvidia/label/cuda-12.8.1::cuda"
         ]
       }, ondata)
+      const folder = this.kernel.bin.path("miniconda/etc/conda/activate.d")
+      let deactivate_list = [
+        "~cuda-nvcc_activate.bat",
+        "vs2019_compiler_vars.bat",
+        "vs2022_compiler_vars.bat",
+      ]
+      for(let item of deactivate_list) {
+        const old_name = path.resolve(folder, item)
+        const new_name = path.resolve(folder, item + ".disabled")
+        console.log("rename", { old_name, new_name })
+        await fs.promises.rename(old_name, new_name)
+      }
     } else {
       await this.kernel.bin.exec({
         message: [
@@ -45,7 +59,27 @@ class Cuda {
           console.log("cuda version", coerced)
           if (semver.satisfies(coerced, ">=12.8.1")) {
             console.log("cuda satisfied")
-            return true
+            let deactivate_list = [
+              "~cuda-nvcc_activate.bat",
+              "vs2019_compiler_vars.bat",
+              "vs2022_compiler_vars.bat",
+            ]
+            const folder = this.kernel.bin.path("miniconda/etc/conda/activate.d")
+            let at_least_one_exists = false
+            for(let item of deactivate_list) {
+              let exists = await this.kernel.exists("bin/miniconda/etc/conda/activate.d/" + item)
+              if (exists) {
+                // break if at least one exists
+                at_least_one_exists = true
+                break
+              }
+            }
+            console.log("nvcc_activate exists?", at_least_one_exists)
+            if (at_least_one_exists) {
+              return false
+            } else {
+              return true
+            }
           }
         }
       }

package/package.json

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

package/server/views/app.ejs

@@ -6492,6 +6492,29 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     if (target) {
       e.preventDefault()
       e.stopPropagation()
+      if (typeof e.stopImmediatePropagation === "function") {
+        e.stopImmediatePropagation()
+      }
+      const parentLink = target.closest(".frame-link")
+      if (parentLink) {
+        let selectorCandidate = ""
+        const targetAttr = parentLink.getAttribute("target")
+        if (targetAttr) {
+          const escapedTarget = escapeTargetSelector(targetAttr)
+          if (escapedTarget) {
+            selectorCandidate = `.frame-link[target="${escapedTarget}"]`
+          }
+        }
+        if (!selectorCandidate && parentLink.href) {
+          const escapedHref = escapeTargetSelector(parentLink.getAttribute("href"))
+          if (escapedHref) {
+            selectorCandidate = `.frame-link[href="${escapedHref}"]`
+          }
+        }
+        if (selectorCandidate) {
+          global_selector = selectorCandidate
+        }
+      }
       let shell = target.closest("[data-shell]")
       if (shell) {
         let shell_id = shell.getAttribute("data-shell")