add tui and persistent targets

scripts/capture_csv.py

@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
-"""Capture filament dryer CSV lines from serial into a file.
+"""Filament dryer host tools — TUI dashboard and CSV logging.
 
-Designed for a Raspberry Pi attached to the dryer Nano over USB. The Arduino
-still owns sensors and control; this script only records the csv,* stream.
+  capture_csv.py                  TUI when run in a terminal (default)
+  capture_csv.py tui              same
+  capture_csv.py log              headless CSV capture (Pi systemd logger)
 """
 
 from __future__ import annotations
@@ -33,6 +34,44 @@ def detect_serial_port() -> str | None:
     return None
 
 
+def resolve_port(port: str | None) -> str:
+    if port is not None:
+        return port
+    detected = detect_serial_port()
+    if detected is not None:
+        return detected
+    fallback = "/dev/ttyUSB0"
+    print(f"WARN: no serial device found, using {fallback}", file=sys.stderr)
+    return fallback
+
+
+def import_serial():
+    try:
+        import serial
+    except ImportError:
+        print("Install pyserial: pip install pyserial", file=sys.stderr)
+        raise SystemExit(1) from None
+    return serial
+
+
+def open_serial(port: str, baud: int):
+    serial = import_serial()
+    ser = serial.Serial()
+    ser.port = port
+    ser.baudrate = baud
+    ser.timeout = 0.1
+    # DTR low: avoid resetting the Nano (CH340) on every reconnect.
+    ser.dtr = False
+    ser.rts = False
+    ser.open()
+    time.sleep(0.3)
+    return ser
+
+
+def decode_line(raw: bytes) -> str:
+    return raw.decode("utf-8", errors="replace").strip()
+
+
 def enable_dryer_logging(ser, retries: int = 3) -> None:
     for attempt in range(retries):
         ser.reset_input_buffer()
@@ -43,7 +82,7 @@ def enable_dryer_logging(ser, retries: int = 3) -> None:
             raw = ser.readline()
             if not raw:
                 continue
-            line = raw.decode("utf-8", errors="replace").strip()
+            line = decode_line(raw)
             if line == "OK csv logging on" or line.startswith("csv_hdr,"):
                 return
             if line.startswith("csv,"):
@@ -54,50 +93,25 @@ def enable_dryer_logging(ser, retries: int = 3) -> None:
     print("WARN: did not see 'OK csv logging on' — continuing anyway", file=sys.stderr)
 
 
-def main() -> int:
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument(
-        "-p",
-        "--port",
-        help="Serial port (default: auto-detect on Pi, else /dev/ttyUSB0)",
-    )
-    parser.add_argument("-b", "--baud", type=int, default=115200)
-    parser.add_argument(
-        "-o",
-        "--output",
-        type=Path,
-        help="Output CSV file (default: logs/dryer_YYYYMMDD_HHMMSS.csv)",
-    )
-    parser.add_argument(
-        "--log-dir",
-        type=Path,
-        default=Path("logs"),
-        help="Directory for default timestamped log files",
-    )
-    parser.add_argument(
-        "--auto-log-on",
-        action=argparse.BooleanOptionalAction,
-        default=True,
-        help="Send 'log on' to the dryer after connect (default: on)",
-    )
-    args = parser.parse_args()
+def write_csv_row(fh, line: str, header_written: list[bool]) -> None:
+    if line.startswith("csv_hdr,"):
+        device_header = line[len("csv_hdr,") :]
+        fh.write("wall_time," + device_header + "\n")
+        header_written[0] = True
+        fh.flush()
+        return
+    if not line.startswith("csv,"):
+        return
+    if not header_written[0]:
+        fh.write(FALLBACK_HEADER + "\n")
+        header_written[0] = True
+    wall_time = datetime.now(timezone.utc).isoformat(timespec="seconds")
+    fh.write(wall_time + "," + line[len("csv,") :] + "\n")
+    fh.flush()
 
-    port = args.port
-    if port is None:
-        port = detect_serial_port()
-    if port is None:
-        port = "/dev/ttyUSB0"
-        print(
-            f"WARN: no serial device found, using {port}",
-            file=sys.stderr,
-        )
-
-    try:
-        import serial
-    except ImportError:
-        print("Install pyserial: pip install pyserial", file=sys.stderr)
-        return 1
 
+def cmd_log(args: argparse.Namespace) -> int:
+    port = resolve_port(args.port)
     out = args.output
     if out is None:
         out = args.log_dir / f"dryer_{datetime.now():%Y%m%d_%H%M%S}.csv"
@@ -106,12 +120,9 @@ def main() -> int:
     print(f"Logging {port} -> {out}", file=sys.stderr)
     if args.auto_log_on:
         print("Will send 'log on' after connect", file=sys.stderr)
-    else:
-        print("Send 'log on' to the dryer if CSV rows are not appearing", file=sys.stderr)
 
     header_written = False
-    with serial.Serial(port, args.baud, timeout=1) as ser, out.open("w", encoding="utf-8") as fh:
-        time.sleep(2.0)  # allow Nano reset after USB open
+    with open_serial(port, args.baud) as ser, out.open("w", encoding="utf-8") as fh:
         if args.auto_log_on:
             enable_dryer_logging(ser)
 
@@ -125,7 +136,7 @@ def main() -> int:
             if not raw:
                 continue
 
-            line = raw.decode("utf-8", errors="replace").strip()
+            line = decode_line(raw)
             if not line.startswith("csv_hdr,") and not line.startswith("csv,"):
                 if line:
                     print(line)
@@ -147,5 +158,70 @@ def main() -> int:
             fh.flush()
 
 
+def cmd_tui(args: argparse.Namespace) -> int:
+    from dryer_tui import run_tui
+
+    return run_tui(args.port, args.baud, args.log_dir, args.auto_log_on)
+
+
+def build_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(
+        description="Filament dryer host tools (CSV logging and TUI).",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=(
+            "Examples:\n"
+            "  %(prog)s tui\n"
+            "  %(prog)s log --log-dir logs\n"
+            "  %(prog)s --log-dir logs    # legacy headless logger\n"
+        ),
+    )
+    parser.add_argument("-p", "--port", help="Serial port (default: auto-detect)")
+    parser.add_argument("-b", "--baud", type=int, default=115200)
+    parser.add_argument("-o", "--output", type=Path, help="Output CSV file (log mode)")
+    parser.add_argument("--log-dir", type=Path, default=Path("logs"), help="CSV log directory")
+    parser.add_argument(
+        "--auto-log-on",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Send 'log on' after connect in log mode (default: on)",
+    )
+
+    subparsers = parser.add_subparsers(dest="action")
+    log_p = subparsers.add_parser("log", help="Headless CSV capture", add_help=False)
+    log_p.add_argument("-p", "--port")
+    log_p.add_argument("-b", "--baud", type=int, default=115200)
+    log_p.add_argument("-o", "--output", type=Path)
+    log_p.add_argument("--log-dir", type=Path, default=Path("logs"))
+    log_p.add_argument("--auto-log-on", action=argparse.BooleanOptionalAction, default=True)
+
+    tui_p = subparsers.add_parser("tui", help="Interactive curses dashboard")
+    tui_p.add_argument("-p", "--port")
+    tui_p.add_argument("-b", "--baud", type=int, default=115200)
+    tui_p.add_argument("--log-dir", type=Path, default=Path("logs"))
+    tui_p.add_argument(
+        "--auto-log-on",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Start CSV logging when TUI opens (default: on)",
+    )
+
+    return parser
+
+
+def main(argv: list[str] | None = None) -> int:
+    argv = sys.argv[1:] if argv is None else list(argv)
+    parser = build_parser()
+    args = parser.parse_args(argv)
+
+    if args.action == "tui":
+        return cmd_tui(args)
+    if args.action == "log":
+        return cmd_log(args)
+    # No subcommand: TUI in an interactive terminal, headless log otherwise (systemd).
+    if sys.stdin.isatty() and sys.stdout.isatty():
+        return cmd_tui(args)
+    return cmd_log(args)
+
+
 if __name__ == "__main__":
     raise SystemExit(main())