pinokiod 3.0.25 → 3.0.27

package/kernel/shell.js

@@ -540,6 +540,8 @@ class Shell {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${env_path}`,
         ]
       } else {
@@ -547,6 +549,8 @@ class Shell {
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
           `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${env_path}`,
         ]
       }
@@ -555,6 +559,8 @@ class Shell {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${conda_name}`,
         ]
       } else {
@@ -565,6 +571,8 @@ class Shell {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
             `conda activate ${conda_name}`,
           ]
         } else {
@@ -572,6 +580,8 @@ class Shell {
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
             `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
             `conda activate ${conda_name}`,
           ]
         }
@@ -678,7 +688,6 @@ class Shell {
         this.kill()
       }
     })
-    console.log("Exec finished", res)
     return res
   }
   stop(message) {

package/package.json

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

package/server/index.js

@@ -716,7 +716,7 @@ class Server {
         }
 
         let template
-        template = "fullscreen_editor"
+        template = "terminal"
 
         if (req.query && req.query.mode === "source") {
           template = "editor"
@@ -1230,9 +1230,6 @@ class Server {
       running = this.getItems(running, meta, p)
       notRunning = this.getItems(notRunning, meta, p)
 
-      console.log(JSON.stringify({ running, notRunning }, null, 2))
-
-
       // check running for each
       // running_items
       items = items.map((x) => {
@@ -1323,13 +1320,16 @@ class Server {
               if (config.color) this.colors.color = config.color
               if (config.symbolColor) this.colors.symbolColor = config.symbolColor
             }
+            if (config.xterm) {
+              this.xterm = config.xterm
+              console.log("this.xterm", this.xterm)
+            }
           }
         }
       }
 
       if (meta) {
         items = running.concat(notRunning)
-        console.log({ items })
         res.render("index", {
           home_url: `http://localhost:${this.port}`,
           proxy: home_proxy,
@@ -2670,6 +2670,22 @@ class Server {
         agent: this.agent,
       })
     }))
+    this.app.get("/xterm_config", ex(async (req, res) => {
+      let exists = await fse.pathExists(this.kernel.path("web"))
+      if (exists) {
+        let config_exists = await fse.pathExists(this.kernel.path("web/config.json"))
+        if (config_exists) {
+          let config = (await this.kernel.loader.load(this.kernel.path("web/config.json"))).resolved
+          if (config) {
+            if (config.xterm) {
+              this.xterm = config.xterm
+              console.log("this.xterm", this.xterm)
+            }
+          }
+        }
+      }
+      res.json({ config: this.xterm })
+    }))
     this.app.get("/du/:name", ex(async (req, res) => {
       let p = this.kernel.path("api", req.params.name)
       let d1 = await Util.du(p)

package/server/views/editor.ejs

@@ -572,34 +572,19 @@ document.addEventListener("DOMContentLoaded", async () => {
       await this.createTerm()
       await this.start(mode)
     }
-    createTerm () {
+    async createTerm () {
       if (!this.term) {
-        const term = new Terminal({
-          //theme: xtermTheme.Piatto_Light,
-          //theme: xtermTheme.Spring,
-
-          //theme: xtermTheme.Github,
-
-          //theme: xtermTheme.Cobalt_Neon,      // top legibility
-          //theme: xtermTheme.Duotone_Dark,
-          theme: xtermTheme.FrontEndDelight,
-          //theme: xtermTheme.Seafoam_Pastel,
-          //theme: xtermTheme.IC_Green_PPL,
-          //theme: xtermTheme.FunForrest,
-          //theme: xtermTheme.Jackie_Brown,
-          //theme: xtermTheme.Ocean,
-
-          //theme: xtermTheme.Blazer,
-          //theme: xtermTheme.BirdsOfParadise,
-          //theme: xtermTheme.AtelierSulphurpool,
-          //theme: xtermTheme.Borland,
-          //rows: 20,
-          //cols: 1000,
+        let config = {
           fontSize: 12,
-          //cursorBlink: false,
-          //cursorStyle: 'block'
-
-        });
+          theme: xtermTheme.FrontEndDelight
+        }
+        let res = await fetch("/xterm_config").then((res) => {
+          return res.json()
+        })
+        if (res && res.config) {
+          config = res.config
+        }
+        const term = new Terminal(config)
         term.open(document.querySelector("#terminal"))
 
 

package/server/views/{fullscreen_editor.ejs → terminal.ejs}

@@ -109,6 +109,7 @@ body.frozen {
   overflow: auto !important;
 }
 </style>
+<link href="/terminal.css" rel="stylesheet"/>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
   <% if (error) { %>
@@ -556,35 +557,20 @@ document.addEventListener("DOMContentLoaded", async () => {
       await this.createTerm()
       await this.start(mode)
     }
-    createTerm () {
+    async createTerm () {
       if (!this.term) {
-        const term = new Terminal({
+        let config = {
           scrollback: 9999999,
-          //theme: xtermTheme.Piatto_Light,
-          //theme: xtermTheme.Spring,
-
-          //theme: xtermTheme.Github,
-
-          //theme: xtermTheme.Cobalt_Neon,      // top legibility
-          //theme: xtermTheme.Duotone_Dark,
-          //theme: xtermTheme.Batman,
-          //theme: xtermTheme.Brogrammer,
-          theme: xtermTheme.FrontEndDelight,
-          //theme: xtermTheme.Seafoam_Pastel,
-          //theme: xtermTheme.IC_Green_PPL,
-          //theme: xtermTheme.FunForrest,
-          //theme: xtermTheme.Jackie_Brown,
-          //theme: xtermTheme.Ocean,
-
-          //theme: xtermTheme.Blazer,
-          //theme: xtermTheme.BirdsOfParadise,
-          //theme: xtermTheme.AtelierSulphurpool,
-          //theme: xtermTheme.Borland,
           fontSize: 12,
-          //cursorBlink: false,
-          //cursorStyle: 'block'
-
-        });
+          theme: xtermTheme.FrontEndDelight
+        }
+        let res = await fetch("/xterm_config").then((res) => {
+          return res.json()
+        })
+        if (res && res.config) {
+          config = res.config
+        }
+        const term = new Terminal(config)
         term.open(document.querySelector("#terminal"))
 
         term.attachCustomKeyEventHandler(event => {