discstation 0.1.2 → 0.1.7

package/package.json

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

package/src/discstation.py

@@ -918,6 +918,8 @@ _tray_open_since = 0.0  # time.monotonic() of the last OLED-initiated eject
 
 
 def _tray_closed_with_disc(device):
+    if not device:
+        return False
     global _tray_open
     if not Path(device).exists():
         return False
@@ -932,6 +934,8 @@ def _tray_closed_with_disc(device):
 
 
 def disc_present(device):
+    if not device:
+        return False
     if _tray_closed_with_disc(device):
         return True
     if _tray_open:
@@ -968,6 +972,8 @@ def disc_present(device):
 
 
 def is_blank_disc(device):
+    if not device:
+        return False
     if not Path(device).exists():
         return False
 
@@ -1017,6 +1023,8 @@ def is_blank_disc(device):
 
 
 def is_rewritable_disc(device):
+    if not device:
+        return False
     """Return whether the inserted medium can be overwritten."""
     if not Path(device).exists():
         return False
@@ -1100,6 +1108,10 @@ def drive_status(device):
     Returns 'disc' | 'no_disc' | 'open' | 'loading' | 'unknown'. Single ioctl on
     an O_NONBLOCK fd — does not consult the (stale on this USB bridge) udev db and
     does not disturb the tray. Never raises."""
+    if not device:
+        return "unknown"
+    if discstation_host.system_name() != "linux":
+        return discstation_host.drive_status()
     try:
         fd = os.open(device, os.O_RDONLY | os.O_NONBLOCK)
     except OSError:
@@ -1118,6 +1130,8 @@ def drive_status(device):
 
 def _media_quick_state(device, props):
     """Fast, cheap read of whether a disc is loaded. No long probes."""
+    if not device:
+        return "empty"
     if _tray_open:
         return "empty"  # deliberate OLED eject — do not poke the drive
     st = drive_status(device)
@@ -1402,6 +1416,8 @@ def detect_disc(device, settle=True, budget=None, force=False):
     disc_status_line / disc_title / menu_items_for_disc in one refresh burst do a
     single probe. `settle=False` skips the post-insert wait (used by the web
     endpoint, which can just poll again)."""
+    if not device:
+        return _disc_info(False, "none")
     if _tray_open:
         # Tray was deliberately ejected from the OLED — report "no disc" without
         # touching the drive (cdrom_id / wodim / open() would re-close the tray).
@@ -3654,7 +3670,10 @@ def rip_audio_cd(ser, device, artist_hint=None, album_hint=None):
 def station_loop(ser, url, artist_hint=None, album_hint=None):
     global _last_burn_result, _last_burn_result_time, _tray_open, _tray_open_since
     discstation_burn.cleanup_old_jobs()
-    device = discstation_burn.disc_device()
+    try:
+        device = discstation_burn.disc_device()
+    except Exception:
+        device = None  # empty drive (e.g. macOS after an eject) — keep the loop alive
 
     for _ in range(50):
         line = read_serial_line(ser, timeout=0.2)
@@ -3708,7 +3727,10 @@ def station_loop(ser, url, artist_hint=None, album_hint=None):
     _disc_poll_start = 0
 
     def _poll_disc():
-        current_device = discstation_burn.disc_device()
+        try:
+            current_device = discstation_burn.disc_device()
+        except Exception:
+            return "Disc: none", None  # no drive/media visible right now
         return disc_status_line(current_device), current_device
 
     def apply_disc_line(new_line):

package/src/discstation_host.py

@@ -96,15 +96,25 @@ def _mac_optical_device():
     return f"/dev/{match.group(1)}" if match else None
 
 
+_last_disc_device = None
+
+
 def disc_device():
+    global _last_disc_device
     system = system_name()
     override = os.environ.get("DISC_DEVICE") or os.environ.get("DVD_DEVICE")
     if system == "darwin":
         detected = _mac_optical_device()
         if detected:
+            _last_disc_device = detected
             return detected
-        if override and Path(override).exists():
+        if override:
             return override
+        # macOS: the /dev/diskN node only exists while media is loaded. Once a
+        # disc is ejected there is nothing to detect — keep returning the last
+        # known node so the caller can still probe it (it just reports no media).
+        if _last_disc_device:
+            return _last_disc_device
     elif override:
         return override
 
@@ -134,6 +144,25 @@ def disc_device():
     raise FileNotFoundError("No optical disc drive found; set DISC_DEVICE explicitly")
 
 
+def drive_status():
+    """Non-Linux equivalent of the CDROM_DRIVE_STATUS ioctl.
+    Returns 'disc' | 'no_disc' | 'unknown'. macOS: parse `drutil status`."""
+    if system_name() != "darwin":
+        return "unknown"
+    try:
+        r = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True,
+                           text=True, check=False, timeout=4)
+    except (OSError, subprocess.TimeoutExpired):
+        return "unknown"
+    text = (r.stdout + r.stderr).lower()
+    if "no media" in text or "media is not present" in text:
+        return "no_disc"
+    if "name: /dev/disk" in text or "type: cd" in text or "type: dvd" in text \
+       or "type: bd" in text:
+        return "disc"
+    return "unknown"
+
+
 def _drutil_media_properties():
     result = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=3)
     text = result.stdout + result.stderr
@@ -364,10 +393,14 @@ def eject_device(device, close=False):
             command.append("-t")
         command.append(device)
     elif system == "darwin":
-        action = "close" if close else "open"
-        commands = [["/usr/bin/drutil", "tray", action]]
-        if device:
-            commands.append(["/usr/sbin/diskutil", "eject", 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:
+            commands = [["/usr/bin/drutil", "tray", "close"]]
+        else:
+            commands = [["/usr/bin/drutil", "eject"]]
+            if device:
+                commands.append(["/usr/sbin/diskutil", "eject", device])
         for command in commands:
             try:
                 if subprocess.run(command, capture_output=True, text=True, timeout=10).returncode == 0: