discstation 0.1.39 → 0.1.40

package/package.json

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

package/src/discstation_host.py

@@ -184,6 +184,22 @@ def _mac_optical_device():
 
 _last_disc_device = None
 
+
+class NoMediaError(FileNotFoundError):
+    """The optical drive is present but has no disc it can see."""
+
+
+def _mac_drive_name():
+    """Drive model from ioreg, which lists it whether or not a disc is loaded
+    (the /dev/diskN node only exists while media is)."""
+    try:
+        out = subprocess.run(["/usr/sbin/ioreg", "-r", "-c", "IODVDServices", "-l"],
+                             capture_output=True, text=True, check=False, timeout=3).stdout
+    except (OSError, subprocess.TimeoutExpired):
+        return None
+    m = re.search(r'"Product Name"="([^"]+)"', out)
+    return m.group(1) if m else None
+
 # --- Windows: IMAPI2 / WMI probes via bundled PowerShell helpers ---------------
 _WIN_DIR = Path(__file__).resolve().parent / "win"
 _win_info_cache = (0.0, None)
@@ -259,6 +275,9 @@ def disc_device():
         # known node so the caller can still probe it (it just reports no media).
         if _last_disc_device:
             return _last_disc_device
+        drive = _mac_drive_name()
+        if drive:
+            raise NoMediaError(f"Drive found ({drive}) but no disc is readable")
     elif override:
         return override
 
@@ -272,7 +291,7 @@ def disc_device():
             return str(drives[0])
     elif system == "darwin":
         try:
-            status = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=3)
+            status = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=15)
         except (OSError, subprocess.TimeoutExpired):
             status = None
         if status:
@@ -304,7 +323,7 @@ def drive_status():
         return "unknown"
     try:
         r = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True,
-                           text=True, check=False, timeout=4)
+                           text=True, check=False, timeout=15)
     except (OSError, subprocess.TimeoutExpired):
         return "unknown"
     text = (r.stdout + r.stderr).lower()
@@ -330,7 +349,7 @@ def _tag_rewritable(props, media_type):
 
 
 def _drutil_media_properties():
-    result = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=3)
+    result = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=15)
     text = result.stdout + result.stderr
     lowered = text.lower()
     if result.returncode != 0 or "no media" in lowered:
@@ -382,7 +401,9 @@ def media_properties(device):
         mount_point = fields.get("Mount Point", "")
         if mount_point and mount_point != "Not applicable":
             props["ID_MOUNT_POINT"] = mount_point
-        if label.lower() == "audio cd":
+        if label.lower() == "audio cd" or props.get("ID_FS_TYPE") == "cddafs":
+            # cddafs is macOS's filesystem for Red Book audio - the only signal
+            # that works for a burned CD-R, whose media type ("CD-R") has an "r".
             props["ID_CDROM_MEDIA_TYPE"] = "audio"
         elif "cd" in optical.lower() and "r" not in optical.lower():
             props["ID_CDROM_MEDIA_TYPE"] = "audio"
@@ -430,7 +451,7 @@ def media_capacity_bytes(device):
         try:
             result = subprocess.run(["/usr/sbin/diskutil", "info", device], capture_output=True, text=True, check=False, timeout=3)
         except subprocess.TimeoutExpired:
-            result = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=3)
+            result = subprocess.run(["/usr/bin/drutil", "status"], capture_output=True, text=True, check=False, timeout=15)
             match = re.search(r"blocks:\s*(\d+)\s*/", result.stdout + result.stderr, re.IGNORECASE)
             if match:
                 return int(match.group(1)) * 2048