wip

TODO.md

@@ -1,6 +1,4 @@
 - fix datetime bug in xlwings
-- allow to run whole module instead of single script
-- store pyodide version in xml
 - only store editor content if not empty/default
 - requirements.txt file vs editor
 - own repo
@@ -29,3 +27,4 @@
 - is it a problem that everything is running in the same Pyodide session?
 - use a worker
 - handle DuplicateName when re-registring custom functions
+- allow to run whole module instead of single script?

app/lite/main.py

@@ -50,9 +50,14 @@ def flush(self):
 
 
 # Print Python and Pyodide versions
-print(f"Python version: {platform.python_version()}")
-print(f"Pyodide version: {pyodide_js.version}")
-print(f"xlwings version: {xw.__version__}")
+html_output = HtmlOutput("output")
+with (
+    contextlib.redirect_stdout(html_output),
+    contextlib.redirect_stderr(html_output),
+):
+    print(
+        f"Python {platform.python_version()} | Pyodide {pyodide_js.version} | xlwings {xw.__version__}"
+    )
 
 
 async def custom_functions_call(data, module_string=None):

app/static/js/main.js

@@ -9,7 +9,7 @@ const monacoEditor = {
     requirements: {
       name: "requirements.txt",
       isActive: false,
-      defaultContent: "# Add your requirements here\n",
+      defaultContent: "",
     },
   },
 
@@ -20,9 +20,7 @@ const monacoEditor = {
   scripts: [],
   selectedScript: "",
   scriptButtonText() {
-    return this.scripts.length
-      ? `▶ ${this.selectedScript}`
-      : "▶ Select Script";
+    return this.scripts.length ? `${this.selectedScript}` : "(no script)";
   },
   selectScript() {
     this.selectedScript = this.$el.textContent;
@@ -64,7 +62,9 @@ const monacoEditor = {
       return { active: this.isTabActive(this.$el.dataset.tab) };
     },
   },
-
+  buttonDisabled() {
+    return this.isRunning || this.scripts.length === 0;
+  },
   isRunning: false,
   spinner: {
     [":class"]() {
@@ -193,10 +193,12 @@ const monacoEditor = {
 
   async saveContent(filename) {
     const content = editorInstance.getValue();
+    let pyodide = await xlwings.pyodideReadyPromise;
     // Store
     await Excel.run(async (context) => {
       const settings = context.workbook.settings;
       settings.add(filename, content);
+      settings.add("pyodideVersion", pyodide.version);
       await context.sync();
       console.log(`${filename} stored`);
       this.isSaved = true;
@@ -210,7 +212,6 @@ const monacoEditor = {
         JSON.stringify(meta),
         rendered_custom_functions_code,
       );
-      let pyodide = await xlwings.pyodideReadyPromise;
       await pyodide.FS.writeFile(
         "custom-functions-wrappers.js",
         globalThis.liteCustomFunctionsCode(content),
@@ -220,8 +221,6 @@ const monacoEditor = {
     // Install requirements.txt TODO: factor out
     if (config.onLite) {
       if (filename === "requirements.txt") {
-        let pyodide = await xlwings.pyodideReadyPromise;
-
         // Setup output redirect
         const outputDiv = document.querySelector("#output");
         outputDiv.innerHTML = "";

app/templates/examples/hello_world/taskpane_hello.html

@@ -13,7 +13,8 @@ <h1 class="my-3 px-3">xlwings Lite <span class="badge bg-warning text-dark">Prev
         {# Run button #}
         <div class="btn-group">
           {# Run button #}
-          <button type="button" class="btn btn-primary btn-sm ps-4 pe-1" @click="run" :disabled="isRunning">
+          <button type="button" class="btn btn-primary btn-sm ps-4 pe-1" @click="run" :disabled="buttonDisabled">
+            <span class="me-1">▶</span>
             <span x-text="scriptButtonText"></span>
             <span x-bind="spinner" class="spinner-border spinner-border-sm"></span>
           </button>
@@ -22,7 +23,8 @@ <h1 class="my-3 px-3">xlwings Lite <span class="badge bg-warning text-dark">Prev
             type="button"
             class="btn btn-primary btn-sm dropdown-toggle dropdown-toggle-split"
             data-bs-toggle="dropdown"
-            aria-expanded="false">
+            aria-expanded="false"
+            :disabled="buttonDisabled">
             <span class="visually-hidden">Toggle Dropdown</span>
           </button>
           <ul class="dropdown-menu">
@@ -61,7 +63,7 @@ <h1 class="my-3 px-3">xlwings Lite <span class="badge bg-warning text-dark">Prev
         </div>
         <div class="resizer" x-ref="resizer"></div>
         <div x-ref="output-container" style="height: 150px;" class="d-flex flex-column">
-          <div class="px-3 py-2 flex-grow-1" id="output" x-ref="output">Output Console</div>
+          <div class="px-3 py-2 flex-grow-1" id="output" x-ref="output"></div>
         </div>
       </div>
     </div>