labnotes 0.0.57__tar.gz → 0.0.59__tar.gz

{labnotes-0.0.57 → labnotes-0.0.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: labnotes
-Version: 0.0.57
+Version: 0.0.59
 Summary: Browse experiment designs, notes, and run data from a folder.
 Project-URL: Repository, https://github.com/thekevinscott/labnotes
 Author-email: Kevin Scott <me@thekevinscott.com>

{labnotes-0.0.57 → labnotes-0.0.59}/src/labnotes/static/note-edit.js

@@ -4,6 +4,7 @@ if (note) {
   const prose = note.querySelector(".prose");
   const status = note.querySelector(".edit-status");
   const editor = import(note.dataset.editor);
+  const source = JSON.parse(note.querySelector(".note-source").textContent);
   let editing = null;
 
   editor.then(
@@ -25,7 +26,13 @@ if (note) {
 
   new EventSource(note.dataset.changesUrl).addEventListener("message", (event) => {
     if (JSON.parse(event.data) !== note.dataset.note) return;
-    if (editing) editing.pull();
-    else location.reload();
+    if (editing) return editing.pull();
+    // A touch or a duplicate event leaves the text alone, and reloading then
+    // would swallow a click that is opening the editor.
+    fetch(note.dataset.saveUrl, { cache: "no-store" })
+      .then((response) => response.text())
+      .then((text) => {
+        if (text !== source) location.reload();
+      });
   });
 }

{labnotes-0.0.57 → labnotes-0.0.59}/src/labnotes/tui/run_app.py

@@ -25,6 +25,7 @@ VIEWING_ACTIONS = {"leave", "quit", "interrupt", "command_palette"}
 
 
 class RunApp(App[None]):
+    CSS = "#concurrency { dock: right; width: auto; padding: 0 1; }"
     BINDINGS = [
         Binding("ctrl+c", "interrupt", "Stop runs"),
         Binding("n", "run_next", "Run next"),
@@ -89,6 +90,7 @@ class RunApp(App[None]):
             table.add_column(column, key=column)
         self.query_one(Input).display = False
         self.query_one(Log).display = False
+        self.query_one(Header).mount(Static(id="concurrency"))
         table.set_interval(0.1, self.spin)
 
     def on_ready(self) -> None:
@@ -116,7 +118,6 @@ class RunApp(App[None]):
                     self.pending.add(planned["run"])
                 self.redraw(table.cursor_row)
                 self.show_concurrency(event)
-                self.show(describe_event(event))
                 match event["mode"], event["runs"]:
                     case "adhoc", [only]:
                         self.view(only["run"])  # type: ignore[index]
@@ -128,7 +129,12 @@ class RunApp(App[None]):
                 if run == self.next_run:
                     self.show("")
                 args = " ".join(param_args(event["params"]))  # type: ignore[arg-type]
-                cells = (run, args, SPINNER[self.frame], format_elapsed(0))
+                cells = (
+                    run.rpartition("/")[2],
+                    args,
+                    SPINNER[self.frame],
+                    format_elapsed(0),
+                )
                 for column, cell in zip(COLUMNS, cells):
                     self.set_cell(run, column, cell)
             case "ended":
@@ -173,7 +179,6 @@ class RunApp(App[None]):
                 self.show_summary()
             case "concurrency":
                 self.show_concurrency(event)
-                self.show(describe_event(event))
             case "stopping":
                 for pending in self.pending:
                     self.set_cell(pending, "status", dim(SKIPPED))
@@ -212,7 +217,7 @@ class RunApp(App[None]):
 
     def show_concurrency(self, event: dict[str, object]) -> None:
         self.concurrency = int(event["concurrency"])  # type: ignore[call-overload]
-        self.sub_title = f"{self.concurrency} at a time"
+        self.query_one("#concurrency", Static).update(f"{self.concurrency} at a time")
 
     def tick(self) -> None:
         for run, began in self.started.items():
@@ -325,7 +330,7 @@ class RunApp(App[None]):
             self.viewing = None
             self.query_one(Log).display = False
             self.query_one(DataTable).display = True
-            self.sub_title = f"{self.concurrency} at a time"
+            self.sub_title = ""
             self.refresh_bindings()
             if self.idle:
                 self.show_summary()