discstation 0.1.13 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "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())
@@ -2745,6 +2752,13 @@ def burn_data_flow(ser):
         if not files_to_burn:
             raise RuntimeError("No files to burn")
 
+        # A single .iso (loose, a local path, or an upload folder holding just
+        # the .iso) is written verbatim as a bootable image, not repackaged.
+        if len(files_to_burn) == 1 and files_to_burn[0].is_dir():
+            inner = [p for p in files_to_burn[0].iterdir() if p.is_file()]
+            if len(inner) == 1 and inner[0].suffix.lower() == ".iso":
+                files_to_burn = inner
+
         total_bytes = sum(f.stat().st_size for f in files_to_burn if f.is_file())
         for d in files_to_burn:
             if d.is_dir():
@@ -3829,9 +3843,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

@@ -295,23 +295,30 @@ def build_data_image(source_paths, output_path, label, video=False):
         # xorriso's mkisofs emulation is the same lineage as Linux's
         # genisoimage/growisofs; -dvd-video gives a set-top-compatible
         # VIDEO_TS layout (the arg is the dir *containing* VIDEO_TS).
+        # xorriso's mkisofs emulation does NOT accept `-udf`; -dvd-video alone
+        # gives a DVD-Video-compliant ISO9660 layout set-top players read.
         command = [tool("xorriso"), "-as", "mkisofs", "-V", label, "-o", str(output_path)]
         if video:
-            command += ["-dvd-video", "-udf", str(source_paths[0])]
+            command += ["-dvd-video", str(source_paths[0])]
         else:
-            command += ["-iso-level", "3", "-J", "-R", "-udf",
-                        *[str(path) for path in source_paths]]
+            command += ["-iso-level", "3", "-J", "-R", *[str(path) for path in source_paths]]
     else:
         raise RuntimeError("Image building is only used by non-Linux optical backends")
-    subprocess.run(command, check=True, capture_output=True, text=True)
+    result = subprocess.run(command, capture_output=True, text=True)
+    if result.returncode != 0:
+        lines = [ln.strip() for ln in (result.stderr or result.stdout).splitlines() if ln.strip()]
+        tail = next((ln for ln in reversed(lines) if "FAILURE" in ln.upper()),
+                    lines[-1] if lines else f"exit {result.returncode}")
+        raise RuntimeError(f"xorriso: {tail[:200]}")
     return output_path
 
 
 def iso_burn_command(device, image_path):
     system = system_name()
     if system == "darwin":
-        # -puppetstrings emits machine-readable PERCENT: / MESSAGE: lines.
-        return [tool("hdiutil"), "burn", "-puppetstrings", str(image_path)]
+        # -puppetstrings emits machine-readable PERCENT: / MESSAGE: lines;
+        # -nosynth writes the image verbatim so a bootable ISO stays bootable.
+        return [tool("hdiutil"), "burn", "-puppetstrings", "-nosynth", str(image_path)]
     if system == "windows":
         return [tool("isoburn.exe"), "/Q", device, str(image_path)]
     raise RuntimeError("ISO command requested on Linux; use growisofs backend")
@@ -424,6 +431,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 +443,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