discstation 0.1.6 → 0.1.7

package/package.json

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

package/src/discstation.py

@@ -1110,6 +1110,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:

package/src/discstation_host.py

@@ -144,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