fix(dev): devices were shown as busy at end of script

Author: jakobrosenberg

src/Device.js

@@ -244,6 +244,17 @@ class Device {
     return result;
   }
 
+  /**
+   * Run a Python user script on this device
+   * Running user scripts sets device.action to null. This ensures that they're shown correctly in the GUI.
+   * @param {string} script
+   * @param {import("micropython-ctl-cont").RunScriptOptions=} options
+   */
+  async runUserScript(script, options) {
+    script = "# user script\n" + script;
+    this.runScript(script, options);
+  }
+
   /**
    * Creates a MicroPythonDevice
    */
@@ -256,6 +267,7 @@ class Device {
     adapter.__proxyMeta.beforeEachCall(({ item }) => {
       this.action.set(item.field.toString());
       this.busy.set(true);
+      if (item.field.toString() === "runScript" && item.args[0].startsWith("# user script\n")) this.action.set(null);
     });
 
     // emit line break to trigger a `>>>`. This triggers the `busyStatusUpdater`

src/Watcher/DeviceManager.js

@@ -108,34 +108,7 @@ class DeviceManager {
 
   restartScript(modulesToDelete) {
     this.log.log("restart script");
-    this.device.runScript(
-      [
-        "print('')",
-        `print("[dev] \'${modulesToDelete[1]}\' changed. Restarting... ")`,
-        "for name in sys.modules:",
-        '  if(hasattr(sys.modules[name], "__file__")):',
-        `    if sys.modules[name].__file__ in ${JSON.stringify(modulesToDelete)}:`,
-        '      print("[dev] Clear module: " + sys.modules[name].__file__)',
-        "      del sys.modules[name]",
-        "try:",
-        "  print('[dev] Import boot.py')",
-        "  import boot",
-        "except ImportError:",
-        "  print('[dev] No boot.py found. Skipped.')",
-        "except Exception:",
-        "  print('[dev] Exception in boot.py')",
-        "  raise",
-        "try:",
-        "  print('[dev] Import main.py')",
-        "  import main",
-        "except KeyboardInterrupt: pass",
-        "except ImportError:",
-        "  print('[dev] No main.py found. Skipped.')",
-        "except Exception as e: raise e;",
-        "",
-      ].join("\r\n"),
-      { resolveBeforeResult: true }
-    );
+    this.device.runUserScript(scripts.restart(modulesToDelete), { resolveBeforeResult: false });
   }
 
   /**

src/Watcher/scripts.js

@@ -0,0 +1,45 @@
+const rmDoubleSlash = (str) => str.replace(/\/+/, "/");
+
+const scripts = {
+  addPymakrToPath: (rootPath) =>
+    [
+      "import sys",
+      "try:",
+      `  sys.path.index('${rmDoubleSlash(rootPath + "/_pymakr_dev")}')`,
+      "except Exception as e:",
+      "  if(e.args[0] == 'object not in sequence'):",
+      `    sys.path.append('${rmDoubleSlash(rootPath + "/_pymakr_dev")}')`,
+      "  else:",
+      "    raise",
+    ].join("\r\n"),
+  restart: (modulesToDelete) =>
+    [
+      "print('')",
+      modulesToDelete[1] && `print("[dev] \'${modulesToDelete[1]}\' changed. Restarting... ")`,
+      "for name in sys.modules:",
+      '  if(hasattr(sys.modules[name], "__file__")):',
+      `    if sys.modules[name].__file__ in ${JSON.stringify(modulesToDelete)}:`,
+      '      print("[dev] Clear module: " + sys.modules[name].__file__)',
+      "      del sys.modules[name]",
+      "try:",
+      "  print('[dev] Import boot.py')",
+      "  import boot",
+      "except ImportError:",
+      "  print('[dev] No boot.py found. Skipped.')",
+      "except Exception:",
+      "  print('[dev] Exception in boot.py')",
+      "  raise",
+      "try:",
+      "  print('[dev] Import main.py')",
+      "  import main",
+      "except KeyboardInterrupt: pass",
+      "except ImportError:",
+      "  print('[dev] No main.py found. Skipped.')",
+      "except Exception as e: raise e;",
+      "",
+    ]
+      .filter(Boolean)
+      .join("\r\n"),
+};
+
+module.exports = { scripts };