discstation 0.1.17 → 0.1.18

package/package.json

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

package/src/discstation.py

@@ -53,6 +53,8 @@ _last_upload_label = None
 _web_status = "READY"
 _web_progress = -1
 _web_progress_active = False
+_operation_active = False  # a burn/rip/play flow is holding the drive
+_last_disc_info = {"disc_present": False, "capacity_bytes": 0, "capacity_gb": 0, "type": "none"}
 _active_ser = None
 STATIC_DIR = Path(__file__).resolve().parent / "static"
 
@@ -146,6 +148,10 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
         self._respond(200, f'{len(files)} file(s) uploaded ({size_str}). Select BURN DATA on remote.')
 
     def _serve_disc_info(self):
+        if _operation_active:
+            # a burn/rip/play holds the drive — don't probe it, serve last-known.
+            self._respond(200, json.dumps({**_last_disc_info, "busy": True}), "application/json")
+            return
         info = {"disc_present": False, "capacity_bytes": 0, "capacity_gb": 0, "type": "none"}
         try:
             device = discstation_burn.disc_device()
@@ -163,6 +169,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
             info["label"] = di.label
         except Exception as e:
             print(f"Disc info error: {e}")
+        _last_disc_info.update(info)
         self._respond(200, json.dumps(info), "application/json")
 
     def _serve_sse(self):
@@ -212,7 +219,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
     def _serve_sw(self):
         sw = '''self.addEventListener('install', e => {
   self.skipWaiting();
-  caches.open('discstation-v7').then(c => c.addAll(['/','/static/style.css?v=7','/static/app.js?v=7']));
+  caches.open('discstation-v8').then(c => c.addAll(['/','/static/style.css?v=8','/static/app.js?v=8']));
 });
 self.addEventListener('activate', e => e.waitUntil(clients.claim()));
 self.addEventListener('fetch', e => {
@@ -221,7 +228,7 @@ self.addEventListener('fetch', e => {
   if (path === '/' || path.startsWith('/static/')) {
     e.respondWith(fetch(e.request).then(r => {
       const copy = r.clone();
-      caches.open('discstation-v7').then(c => c.put(e.request, copy));
+      caches.open('discstation-v8').then(c => c.put(e.request, copy));
       return r;
     }).catch(() => caches.match(e.request)));
   } else {
@@ -3731,7 +3738,7 @@ 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
+    global _last_burn_result, _last_burn_result_time, _tray_open, _tray_open_since, _operation_active
     discstation_burn.cleanup_old_jobs()
     try:
         device = discstation_burn.disc_device()
@@ -3934,6 +3941,7 @@ def station_loop(ser, url, artist_hint=None, album_hint=None):
         # The user picked a mode — they want to act on a disc, so the drive is
         # fair game again even if it was ejected from the OLED earlier.
         _tray_open = False
+        _operation_active = True  # stop /disc-info probing the drive during the flow
         try:
             if mode == "BURN":
                 burn_flow(ser, url)
@@ -3964,6 +3972,8 @@ def station_loop(ser, url, artist_hint=None, album_hint=None):
             _last_burn_result = f"ERROR: {e}"
             print(f"Error in {mode}: {e}")
             time.sleep(4)
+        finally:
+            _operation_active = False
 
         _last_burn_result_time = time.time()
         refresh_main_menu(ser)

package/src/discstation_burn.py

@@ -1274,22 +1274,31 @@ def _run_growisofs(ser, growisofs_cmd, log_path, device=None):
 
 def _run_hdiutil_burn(ser, image_path, device=None):
     """Burn a pre-built ISO on macOS via `hdiutil burn -puppetstrings`, streaming
-    its PERCENT: lines to the ESP32."""
+    its PERCENT: lines to the ESP32 for both the write and verify passes."""
     send(ser, "STATUS:Burning image...")
     send(ser, "PROGRESS:0%")
     cmd = discstation_host.iso_burn_command(device or disc_device(), image_path)
+    if discstation_host.system_name() == "darwin":
+        # hdiutil block-buffers stdout to a pipe -> no progress until it exits.
+        # Run it under a pty (script relays the child's exit status verbatim).
+        cmd = ["/usr/bin/script", "-q", "/dev/null", *cmd]
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
     out_lines = []
     last_pct = -1
+    phase = "burn"
     try:
         for line in iter_proc_or_cancel(proc, ser):
             out_lines.append(line)
-            m = re.search(r"PERCENT:([\d.]+)", line)
-            if m:
-                pct = int(float(m.group(1)))
-                if 0 <= pct <= 100 and pct != last_pct:
-                    last_pct = pct
-                    send(ser, f"PROGRESS:{min(pct, 99)}%")
+            low = line.lower()
+            m = re.search(r"PERCENT:(-?[\d.]+)", line)
+            pct = int(float(m.group(1))) if m else None
+            if phase == "burn" and ("verif" in low or (pct is not None and last_pct > 90 and pct < 5)):
+                phase = "verify"
+                last_pct = -1
+                send(ser, "STATUS:Verifying...")
+            if pct is not None and 0 <= pct <= 100 and pct != last_pct:
+                last_pct = pct
+                send(ser, f"PROGRESS:{min(pct, 99)}%")
     except (KeyboardInterrupt, SystemExit):
         stop_process(proc)
         raise
@@ -1300,8 +1309,11 @@ def _run_hdiutil_burn(ser, image_path, device=None):
     safe_send(ser, "PROGRESS:100%")
     try:
         discstation_host.eject_device(device or disc_device())
-    except Exception as e:
-        print(f"Disc eject skipped: {e}")
+    except Exception:
+        try:
+            discstation_host.eject_device(None)  # device-less `drutil eject`
+        except Exception as e:
+            print(f"Disc eject skipped: {e}")
 
 
 def burn(ser, dvd_dir, disc_label, speed=None, is_dual_layer=False):

package/src/static/app.js

@@ -77,6 +77,7 @@
     try {
       const response = await fetch("/disc-info", { cache: "no-store" });
       const info = await response.json();
+      if (info.busy) return;               // burn/rip in progress — keep current
       state.discBytes = Number(info.capacity_bytes || 0);
       state.discType = info.type || "none";
       renderSelection();
@@ -281,7 +282,7 @@
     setInterval(loadDiscInfo, 15000);
   }
 
-  if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=7").catch(() => {});
+  if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=8").catch(() => {});
   window.addEventListener("beforeinstallprompt", (event) => {
     event.preventDefault();
     const button = document.createElement("button");

package/src/static/index.html

@@ -105,7 +105,7 @@
     </footer>
   </div>
   <div id="install-slot"></div>
-  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=7").catch(() => {});</script>
-  <script src="/static/app.js?v=7" defer></script>
+  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=8").catch(() => {});</script>
+  <script src="/static/app.js?v=8" defer></script>
 </body>
 </html>