discstation 0.1.6 → 0.1.8

package/package.json

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

package/src/discstation.py

@@ -1046,6 +1046,9 @@ def is_rewritable_disc(device):
             "",
         )
         return "rw" in media_line
+    # Non-Linux: the RW signal comes from the ID_CDROM_MEDIA_*_RW keys above,
+    # which discstation_host.media_properties() tags from the drutil/diskutil
+    # media type.
     return False
 
 
@@ -1110,6 +1113,8 @@ def drive_status(device):
     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:
@@ -1246,6 +1251,12 @@ def _classify_disc(device, props, failed, deadline):
                 print(f"Disc inspection failed: {e}")
             kind = kind or "data_disc"
             return _disc_info(True, kind, web_type=_web_type_for(kind, 0))
+        if props.get("ID_CDROM_MEDIA_STATE") == "blank":
+            try:
+                cap = discstation_burn.disc_capacity_bytes(device) or 0
+            except Exception:
+                cap = 0
+            return _disc_info(True, "blank", capacity_bytes=cap, web_type="BLANK")
         return _disc_info(True, "unknown", web_type="UNKNOWN", failed_probes=failed)
 
     # Fast path for a blank disc: cdrom_id reports this reliably in ~20ms, and

package/src/discstation_host.py

@@ -144,6 +144,38 @@ 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 _tag_rewritable(props, media_type):
+    """Set the ID_CDROM_MEDIA_*_RW key that discstation.is_rewritable_disc reads,
+    from a lowercased media-type string (drutil 'Type:' or diskutil 'Optical
+    Media Type'). ponytail: substring match — same heuristic as the rest of this
+    module."""
+    if "cd-rw" in media_type or "cdrw" in media_type:
+        props["ID_CDROM_MEDIA_CD_RW"] = "1"
+    elif "dvd-rw" in media_type or "dvd-ram" in media_type:
+        props["ID_CDROM_MEDIA_DVD_RW"] = "1"
+    elif "dvd+rw" in media_type or "bd-re" in media_type:
+        props["ID_CDROM_MEDIA_DVD_PLUS_RW"] = "1"
+
+
 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
@@ -151,12 +183,16 @@ def _drutil_media_properties():
     if result.returncode != 0 or "no media" in lowered:
         return {}
     props = {"ID_CDROM": "1", "ID_CDROM_MEDIA": "1"}
-    if "space used:" in lowered and "00:00:00" in lowered.split("space used:", 1)[1][:24]:
+    blank = "space used:" in lowered and "00:00:00" in lowered.split("space used:", 1)[1][:24]
+    if blank:
         props["ID_CDROM_MEDIA_STATE"] = "blank"
-    if "type: cd" in lowered:
-        props["ID_CDROM_MEDIA_TYPE"] = "audio"
-    elif "type: dvd" in lowered:
+    match = re.search(r"type:\s*([a-z0-9+\-]+)", lowered)
+    media_type = match.group(1) if match else ""
+    if media_type.startswith("dvd") or media_type.startswith("bd"):
         props["ID_CDROM_MEDIA_TYPE"] = "dvd"
+    elif media_type.startswith("cd") and not blank and "-r" not in media_type:
+        props["ID_CDROM_MEDIA_TYPE"] = "audio"
+    _tag_rewritable(props, media_type)
     return props
 
 
@@ -168,7 +204,7 @@ def media_properties(device):
         except subprocess.TimeoutExpired:
             return _drutil_media_properties()
         if disk.returncode != 0:
-            return {}
+            return _drutil_media_properties()
         fields = {}
         for line in disk.stdout.splitlines():
             if ":" in line:
@@ -176,7 +212,7 @@ def media_properties(device):
                 fields[key.strip()] = value.strip()
         optical = fields.get("Optical Media Type", "")
         if not optical and not fields.get("Device / Media Name"):
-            return {}
+            return _drutil_media_properties()
         props = {"ID_CDROM": "1", "ID_CDROM_MEDIA": "1"}
         label = fields.get("Volume Name", "")
         filesystem = fields.get("Type (Bundle)") or fields.get("File System Personality")
@@ -204,8 +240,9 @@ def media_properties(device):
         optical = optical.lower()
         if "dvd+r dl" in optical or "dvd-r dl" in optical:
             props["ID_CDROM_MEDIA_DVD_PLUS_R_DL"] = "1"
-        elif "dvd+r" in optical or "dvd-r" in optical:
+        elif ("dvd+r" in optical or "dvd-r" in optical) and "rw" not in optical:
             props["ID_CDROM_MEDIA_DVD_PLUS_R"] = "1"
+        _tag_rewritable(props, optical)
         return props
     return {}