discstation 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",

package/src/discstation.py

@@ -571,6 +571,13 @@ def _record_web_status(msg):
     elif msg.startswith("CANCELLED:"):
         _web_status = msg[10:].strip() or "CANCELLED"
         _web_progress_active = False
+    elif msg.startswith(("STANDBY:", "HOME:")):
+        # idle again (tray open, insert disc, back to the menu) — clear any
+        # lingering "Ejecting..." / progress state on the web UI.
+        text = msg.split(":", 1)[1].strip()
+        _web_status = "READY" if text in ("", "DiscStation", "Select mode", "Starting...") else text
+        _web_progress = -1
+        _web_progress_active = False
     else:
         return
     _sse_publish(_status_snapshot())
@@ -3829,9 +3836,13 @@ def station_loop(ser, url, artist_hint=None, album_hint=None):
                         apply_disc_line("Disc: reading...")
                 elif st == "disc":
                     _tray_open = False
+                    transient_words = ["none", "checking", "reading", "tray open"]
+                    if discstation_host.system_name() == "darwin":
+                        # macOS slot drives take a few seconds to mount; "unknown"
+                        # is a not-ready read, not a settled answer — keep re-polling.
+                        transient_words.append("unknown")
                     have_line = last_disc_line and not any(
-                        w in last_disc_line.lower()
-                        for w in ("none", "checking", "reading", "tray open"))
+                        w in last_disc_line.lower() for w in transient_words)
                     if not have_line and _disc_poll_future is None:
                         _disc_poll_start = now
                         last_disc_poll = now

package/src/discstation_host.py

@@ -424,6 +424,7 @@ def eject_device(device, close=False):
             command.append("-t")
         command.append(device)
     elif system == "darwin":
+        global _last_disc_device
         # `drutil tray open` is a no-op on slot-load drives; `drutil eject`
         # works on both. `diskutil eject` is the fallback for a mounted disc.
         if close:
@@ -435,6 +436,10 @@ def eject_device(device, close=False):
         for command in commands:
             try:
                 if subprocess.run(command, capture_output=True, text=True, timeout=10).returncode == 0:
+                    if not close:
+                        # the /dev/diskN node is gone now — don't let disc_device()
+                        # hand back this stale node when the next disc goes in.
+                        _last_disc_device = None
                     return True
             except (OSError, subprocess.TimeoutExpired):
                 pass