discstation 0.1.20 → 0.1.21

package/src/discstation_burn.py

@@ -721,7 +721,7 @@ def get_local_video_info(path):
     return {"title": stem, "duration": dur}
 
 
-def get_video_info(source):
+def get_video_info(source, ser=None):
     p = Path(source)
     if p.is_dir():
         videos = find_video_files(source)
@@ -733,11 +733,25 @@ def get_video_info(source):
         return get_local_video_info(source)
     errors = []
     for player_client in YTDLP_PLAYER_CLIENTS or (None,):
-        r = subprocess.run(
-            [*ytdlp_base_args(player_client), '--dump-single-json', '--skip-download', source],
-            capture_output=True,
-            text=True,
-        )
+        # This yt-dlp metadata fetch can take a while (retries, slow network) -
+        # without a PING during the wait, the ESP32's 30s silence watchdog
+        # flips the OLED to "disconnected" while the host is still alive and
+        # just blocked on subprocess.run. Same keepalive download() uses.
+        stop_ping, pt = _start_keepalive(ser) if ser else (None, None)
+        try:
+            r = subprocess.run(
+                [*ytdlp_base_args(player_client), '--dump-single-json', '--skip-download', source],
+                capture_output=True,
+                text=True,
+                timeout=90,
+            )
+        except subprocess.TimeoutExpired:
+            errors.append(f"{player_client or 'default'} client timed out")
+            continue
+        finally:
+            if stop_ping:
+                stop_ping.set()
+                pt.join(timeout=1)
         if r.returncode != 0:
             errors.append(r.stderr.strip() or f"{player_client or 'default'} client failed")
             continue
@@ -1101,7 +1115,11 @@ def author(ser, mpg, job_dir, aspect="4:3"):
     send(ser, "PROGRESS:Building IFO/VOB")
     dvd_dir = job_dir / "dvd_out"
     dvd_dir.mkdir(parents=True, exist_ok=True)
-    xml = f"""<dvdauthor dest={chr(34) + str(dvd_dir) + chr(34)} format="pal">
+    # Format is conveyed via the VIDEO_FORMAT env var below, not this XML
+    # attribute - some dvdauthor builds (the Windows one) reject a `format`
+    # attribute on <dvdauthor> outright ("Cannot match attribute 'format'"),
+    # which would fail authoring on every single burn.
+    xml = f"""<dvdauthor dest={chr(34) + str(dvd_dir) + chr(34)}>
   <vmgm />
   <titleset>
     <titles>
@@ -1566,23 +1584,83 @@ def _stage_dir(paths):
     return str(staging)
 
 
+def _estimate_burn_seconds(source):
+    """Rough total write time for the synthetic progress fallback below,
+    assuming a ~4x DVD write speed (5.54MB/s) - real speed varies by drive
+    and media, so this is a ceiling to tune if it drifts, not a promise."""
+    p = Path(source)
+    size = tree_size(p) if p.is_dir() else (p.stat().st_size if p.is_file() else 0)
+    return max(size / (5.54 * 1024 * 1024), 1.0)
+
+
 def _run_windows_burn(ser, script, *script_args):
     """Run a src/win/<script> IMAPI2 burn helper, streaming its PROGRESS:<pct>
-    lines to the ESP32. Raises RuntimeError on a non-zero exit."""
+    lines to the ESP32. Raises RuntimeError on a non-zero exit.
+
+    IMAPI2's progress event doesn't reliably reach PowerShell on every
+    setup (COM event dispatch needs the calling thread to pump messages,
+    which it can't do while blocked inside the synchronous native Write()
+    call) - so real PROGRESS lines may never arrive until the very end.
+    While waiting, synthesize a smoothly-climbing estimate from elapsed
+    time vs. the source size at a conservative write speed, capped at 95%
+    until the process actually exits; real PROGRESS lines (from scripts
+    where the event does work, e.g. burn-audio.ps1's per-track updates)
+    still take priority whenever they show up.
+    """
     send(ser, "STATUS:Burning...")
     send(ser, "PROGRESS:0%")
+    est_total = _estimate_burn_seconds(script_args[1]) if len(script_args) > 1 else None
     cmd, kwargs = discstation_host.ps_cmd(script, *script_args)
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, **kwargs)
-    out_lines, last_pct = [], -1
+
+    lines = Queue()
+    finished = object()
+
+    def read_output():
+        try:
+            for line in proc.stdout:
+                lines.put(line.rstrip("\r\n"))
+        finally:
+            lines.put(finished)
+
+    reader = threading.Thread(target=read_output, daemon=True)
+    reader.start()
+
+    out_lines, last_pct, last_real_progress, start = [], -1, 0.0, time.time()
+    last_ping, output_done = time.time(), False
     try:
-        for line in iter_proc_or_cancel(proc, ser):
-            out_lines.append(line)
-            m = re.search(r"PROGRESS:(-?\d+)", line)
-            if m:
-                pct = int(m.group(1))
-                if 0 <= pct <= 100 and pct != last_pct:
-                    last_pct = pct
-                    send(ser, f"PROGRESS:{min(pct, 99)}%")
+        while proc.poll() is None or not output_done:
+            if time.time() - last_ping >= 5:
+                last_ping = time.time()
+                send(ser, "PING")
+            if check_cancel(ser):
+                stop_process(proc)
+                return
+            try:
+                line = lines.get(timeout=0.2)
+            except Empty:
+                line = None
+            if line is finished:
+                output_done = True
+            elif line is not None:
+                out_lines.append(line)
+                m = re.search(r"PROGRESS:(-?\d+)", line)
+                if m:
+                    pct = int(m.group(1))
+                    if 0 <= pct <= 100 and pct != last_pct:
+                        last_pct, last_real_progress = pct, time.time()
+                        send(ser, f"PROGRESS:{min(pct, 99)}%")
+                    continue
+            # No fresh real progress recently - IMAPI2's Write() blocks the
+            # PowerShell thread the whole time, so its Update event often
+            # never gets dispatched until the call returns. Estimate from
+            # elapsed time instead of leaving the OLED stuck at 0%.
+            if est_total and time.time() - last_real_progress > 3:
+                est_pct = int(min(95, (time.time() - start) / est_total * 100))
+                if est_pct > last_pct:
+                    last_pct = est_pct
+                    send(ser, f"PROGRESS:{est_pct}%")
+        reader.join(timeout=1)
     except (KeyboardInterrupt, SystemExit):
         stop_process(proc)
         raise
@@ -1717,7 +1795,7 @@ def main():
         print("Connected to DiscStation")
         print("Running preflight...")
         send(ser, "STATUS:Preflight...")
-        info = get_video_info(url)
+        info = get_video_info(url, ser)
         title = info["title"]
         duration = info["duration"]
         duration_line, fit_line, can_fit = preflight_lines(duration)

package/src/discstation_host.py

@@ -9,6 +9,8 @@ import platform
 import re
 import shutil
 import subprocess
+import sys
+import threading
 from pathlib import Path
 
 from serial.tools import list_ports
@@ -101,6 +103,7 @@ _last_disc_device = None
 # --- Windows: IMAPI2 / WMI probes via bundled PowerShell helpers ---------------
 _WIN_DIR = Path(__file__).resolve().parent / "win"
 _win_info_cache = (0.0, None)
+_win_info_lock = threading.Lock()
 
 
 def ps_cmd(script_name, *args):
@@ -126,25 +129,34 @@ def _run_ps(script_name, *args, timeout=25):
 
 
 def _win_disc_info(force=False):
-    """Cached (~2s) dict from src/win/disc-info.ps1, or {} on failure."""
+    """Cached (~2s) dict from src/win/disc-info.ps1, or {} on failure.
+
+    Locked: disc-info.ps1's IMAPI2 calls appear to serialize on the physical
+    drive, so a burst of concurrent callers (multiple web UI tabs, the HTTP
+    /disc-info endpoint racing station_loop's own poll) each missing the
+    cache at once used to spawn a pile of concurrent powershell.exe
+    processes that queued up behind each other and blew past the timeout -
+    reporting a false "no disc". One in-flight refresh, shared by whoever's
+    waiting, instead of one per caller."""
     import json as _json
     import time
     global _win_info_cache
-    ts, cached = _win_info_cache
-    if not force and cached is not None and time.time() - ts < 2.0:
-        return cached
-    override = os.environ.get("DISC_DEVICE") or os.environ.get("DVD_DEVICE") or ""
-    rc, out, _ = _run_ps("disc-info.ps1", *([override] if override else []), timeout=20)
-    info = {}
-    for line in out.splitlines():
-        line = line.strip()
-        if line.startswith("{"):
-            try:
-                info = _json.loads(line)
-            except ValueError:
-                pass
-    _win_info_cache = (time.time(), info)
-    return info
+    with _win_info_lock:
+        ts, cached = _win_info_cache
+        if not force and cached is not None and time.time() - ts < 2.0:
+            return cached
+        override = os.environ.get("DISC_DEVICE") or os.environ.get("DVD_DEVICE") or ""
+        rc, out, _ = _run_ps("disc-info.ps1", *([override] if override else []), timeout=20)
+        info = {}
+        for line in out.splitlines():
+            line = line.strip()
+            if line.startswith("{"):
+                try:
+                    info = _json.loads(line)
+                except ValueError:
+                    pass
+        _win_info_cache = (time.time(), info)
+        return info
 
 
 def disc_device():
@@ -349,9 +361,28 @@ def tool(name):
     local = user_home() / ".local" / "bin" / name
     if local.exists():
         return str(local)
+    # pip-installed console scripts (yt-dlp, etc. from requirements.txt) land
+    # in the venv's own Scripts/bin dir, which isn't necessarily on PATH -
+    # e.g. the Windows Scheduled Task runs pythonw.exe directly, no shell
+    # activation. sys.exec_prefix is the venv root we're actually running in.
+    venv_bin = Path(sys.exec_prefix) / ("Scripts" if system_name() == "windows" else "bin")
+    for candidate_name in ((name + ".exe", name) if system_name() == "windows" else (name,)):
+        candidate = venv_bin / candidate_name
+        if candidate.exists():
+            return str(candidate)
     path = shutil.which(name)
     if path:
         return path
+    if system_name() == "windows":
+        # install-windows.ps1's no-winget fallback downloads ffmpeg/yt-dlp
+        # into config_dir()/tools (e.g. an extracted "ffmpeg-9.0-essentials
+        # build\bin\"), and only puts it on the *installer script's own*
+        # session PATH - gone the moment the installer exits. Search that
+        # tree directly instead of relying on PATH.
+        exe = name if name.lower().endswith(".exe") else name + ".exe"
+        match = next((config_dir() / "tools").rglob(exe), None) if (config_dir() / "tools").exists() else None
+        if match:
+            return str(match)
     if system_name() == "darwin":
         candidates = [
             Path("/opt/homebrew/bin") / name,

package/src/static/app.js

@@ -66,6 +66,7 @@
       setConnection(true);
       setLiveStatus(progress.status);
       setProgress(progress.status, Number(progress.progress), progress.active);
+      applyRemoteState(progress);
     } catch (_) {
       setConnection(false);
       setLiveStatus("OFFLINE");
@@ -73,10 +74,67 @@
     }
   }
 
+  // --- On-screen remote: the exact same text commands the ESP32 sends -----
+  // POSTed to /remote/button, which feeds a VirtualSerial standing in for a
+  // real appliance. Only usable when no hardware remote is attached.
+  const remoteKey = "discstation-remote-visible";
+
+  function setRemoteVisible(visible, persist = false) {
+    $("remote-panel").hidden = !visible;
+    $("brand-link").classList.toggle("remote-active", visible);
+    if (persist) localStorage.setItem(remoteKey, visible ? "1" : "0");
+  }
+
+  function toggleRemotePanel() {
+    setRemoteVisible($("remote-panel").hidden, true);
+  }
+
+  function applyRemoteState(progress) {
+    const hardware = progress.appliance === "hardware";
+    if (hardware && !$("remote-panel").hidden) setRemoteVisible(false, true);
+    $("remote-note").textContent = hardware
+      ? "A physical remote is attached — on-screen controls are disabled."
+      : "No physical remote detected — control DiscStation from here.";
+    $("remote-controls").querySelectorAll("button, input").forEach((el) => { el.disabled = hardware; });
+    $("remote-transport").hidden = !progress.playing;
+    const ejectBtn = $("remote-eject-btn");
+    const open = !!progress.tray_open;
+    ejectBtn.textContent = open ? "CLOSE TRAY" : "EJECT";
+    ejectBtn.dataset.cmd = open ? "CONFIRM" : "EJECT";
+  }
+
+  async function sendRemoteCmd(cmd) {
+    try {
+      await fetch("/remote/button", {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: new URLSearchParams({ cmd })
+      });
+    } catch (_) { /* next poll/SSE tick reflects reality */ }
+  }
+
+  $("brand-link").addEventListener("click", (event) => {
+    event.preventDefault();
+    toggleRemotePanel();
+  });
+  setRemoteVisible(localStorage.getItem(remoteKey) === "1");
+
+  $("remote-controls").addEventListener("click", (event) => {
+    const button = event.target.closest("[data-cmd]");
+    if (button && !button.disabled) sendRemoteCmd(button.dataset.cmd);
+  });
+  let volumeTimer;
+  $("remote-volume").addEventListener("input", (event) => {
+    clearTimeout(volumeTimer);
+    const value = event.target.value;
+    volumeTimer = setTimeout(() => sendRemoteCmd(`POT:${value}`), 150);
+  });
+
   async function loadDiscInfo() {
     try {
       const response = await fetch("/disc-info", { cache: "no-store" });
       const info = await response.json();
+      renderDiscStatus(info);
       if (info.busy) return;               // burn/rip in progress — keep current
       state.discBytes = Number(info.capacity_bytes || 0);
       state.discType = info.type || "none";
@@ -84,9 +142,22 @@
     } catch (_) {
       state.discBytes = 0;
       state.discType = "none";
+      renderDiscStatus(null);
     }
   }
 
+  function renderDiscStatus(info) {
+    const el = $("remote-disc-status");
+    if (!el) return;
+    if (!info) { el.textContent = "DISC: UNKNOWN"; return; }
+    if (info.busy) { el.textContent = "DISC: BUSY (see status above)"; return; }
+    if (!info.disc_present) { el.textContent = "DISC: NONE"; return; }
+    const kind = (info.type || info.kind || "unknown").toUpperCase();
+    const label = info.label ? ` "${info.label}"` : "";
+    const size = info.capacity_gb ? ` // ${info.capacity_gb}GB` : "";
+    el.textContent = `DISC: ${kind}${label}${size}`;
+  }
+
   function renderSelection() {
     const list = $("selection-list");
     const total = state.entries.reduce((sum, entry) => sum + entry.file.size, 0);
@@ -269,6 +340,7 @@
       setConnection(true);
       setLiveStatus(d.status);
       setProgress(d.status, Number(d.progress), d.active);
+      applyRemoteState(d);
     });
     es.addEventListener("open", () => { setConnection(true); loadDiscInfo(); });
     es.addEventListener("error", () => {

package/src/static/index.html

@@ -13,9 +13,10 @@
 <body>
   <div class="page-shell">
     <header class="topbar">
-      <a class="brand" href="/" aria-label="DiscStation home">
+      <a class="brand" href="/" id="brand-link" aria-label="DiscStation home / toggle remote">
         <span class="brand-mark">DS</span>
         <span>DISCSTATION</span>
+        <span id="remote-hint" class="remote-hint">REMOTE</span>
       </a>
       <div class="topbar-actions">
         <button id="theme-toggle" class="theme-toggle" type="button" aria-label="Switch to dark mode">&#x263E;</button>
@@ -34,6 +35,39 @@
         <div><strong>04</strong><span>RIP / PLAY</span></div>
       </section>
 
+      <section id="remote-panel" class="remote-panel section-rule" hidden aria-labelledby="remote-title">
+        <div class="panel-heading">
+          <div>
+            <div class="section-kicker">ON-SCREEN REMOTE</div>
+            <h2 id="remote-title">CONTROL SURFACE</h2>
+          </div>
+          <span class="panel-index">DISCSTN-02</span>
+        </div>
+        <p id="remote-note" class="field-note"></p>
+        <div id="remote-disc-status" class="remote-disc-status">DISC: CHECKING</div>
+        <div id="remote-controls">
+          <div class="remote-grid">
+            <button class="outline-button" type="button" data-cmd="SELECT:BURN">BURN</button>
+            <button class="outline-button" type="button" data-cmd="SELECT:BURN DATA">BURN DATA</button>
+            <button class="outline-button" type="button" data-cmd="SELECT:BURN AUDIO">BURN AUDIO</button>
+            <button class="outline-button" type="button" data-cmd="SELECT:RIP">RIP</button>
+            <button class="outline-button" type="button" data-cmd="SELECT:PLAY">PLAY</button>
+            <button class="outline-button" type="button" data-cmd="CANCEL">CANCEL / HOME</button>
+            <button class="outline-button" type="button" id="remote-eject-btn" data-cmd="EJECT">EJECT</button>
+          </div>
+          <div id="remote-transport" class="remote-transport" hidden>
+            <div class="remote-grid">
+              <button class="outline-button" type="button" data-cmd="REW:BIG">&#x23EE; PREV</button>
+              <button class="outline-button" type="button" data-cmd="PLAY_BUTTON">&#x23EF; PLAY/PAUSE</button>
+              <button class="outline-button" type="button" data-cmd="FF:BIG">&#x23ED; NEXT</button>
+              <button class="outline-button" type="button" data-cmd="PLAY_STOP">&#x23F9; STOP</button>
+            </div>
+            <label class="field-label" for="remote-volume">VOLUME</label>
+            <input id="remote-volume" type="range" min="0" max="100" value="70">
+          </div>
+        </div>
+      </section>
+
       <section class="burn-panel section-rule" aria-labelledby="burn-title">
         <div class="panel-heading">
           <div>
@@ -105,7 +139,7 @@
     </footer>
   </div>
   <div id="install-slot"></div>
-  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=8").catch(() => {});</script>
-  <script src="/static/app.js?v=8" defer></script>
+  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=17").catch(() => {});</script>
+  <script src="/static/app.js?v=17" defer></script>
 </body>
 </html>

package/src/static/style.css

@@ -99,6 +99,27 @@ button { color: inherit; }
   color: var(--ink);
   text-decoration: none;
   font-weight: 700;
+  cursor: pointer;
+}
+
+.remote-hint {
+  display: inline-flex;
+  align-items: center;
+  height: 16px;
+  padding: 0 6px;
+  border: 1px solid var(--soft-line);
+  color: var(--muted);
+  font-size: 8px;
+  font-weight: 700;
+  letter-spacing: 0.08em;
+  white-space: nowrap;
+  text-shadow: none;
+  transition: color 0.2s ease, border-color 0.2s ease, text-shadow 0.2s ease;
+}
+.brand.remote-active .remote-hint {
+  color: var(--ink);
+  border-color: var(--ink);
+  text-shadow: 0 0 6px var(--accent);
 }
 
 .brand-mark {
@@ -278,6 +299,21 @@ h2 { margin-top: 8px; font-family: var(--display); font-size: clamp(30px, 7vw, 6
 .form-message.error { color: #9d4035; }
 .form-message.ok { color: #287346; }
 
+.remote-panel { padding: 26px 0 30px; }
+.remote-disc-status {
+  margin: 10px 0 4px;
+  padding: 10px 12px;
+  border: 1px solid var(--ink);
+  background: var(--surface);
+  font-size: 11px;
+  font-weight: 700;
+  letter-spacing: 0.06em;
+}
+.remote-grid { display: grid; grid-template-columns: repeat(2, 1fr); gap: 8px; margin-top: 16px; }
+#remote-controls button:disabled, #remote-controls input:disabled { cursor: not-allowed; opacity: 0.4; }
+.remote-transport { margin-top: 20px; padding-top: 18px; border-top: 1px solid var(--soft-line); }
+.remote-transport input[type="range"] { width: 100%; margin-top: 4px; accent-color: var(--accent); }
+
 .footer-stamp {
   display: flex;
   justify-content: space-between;
@@ -315,6 +351,8 @@ h2 { margin-top: 8px; font-family: var(--display); font-size: clamp(30px, 7vw, 6
   .capability-strip div:not(:last-child) { border-right: 1px solid var(--soft-line); }
   .capability-strip div + div { padding-left: 18px; }
   .burn-panel { width: min(100%, 720px); margin-left: auto; margin-right: auto; }
+  .remote-panel { width: min(100%, 720px); margin-left: auto; margin-right: auto; }
+  .remote-panel .remote-grid { grid-template-columns: repeat(3, 1fr); }
 }
 
 @media (max-width: 600px) {

package/src/win/burn-audio.ps1

@@ -44,14 +44,28 @@ foreach ($w in $wavs) {
             $offset = $i + 8; break
         }
     }
-    $raw = New-Object byte[] ($bytes.Length - $offset)
-    [Array]::Copy($bytes, $offset, $raw, 0, $raw.Length)
+    $rawLen = $bytes.Length - $offset
+    # Red Book requires each track's byte length to be an exact multiple of
+    # the 2352-byte CD-DA sector - real-world track lengths essentially
+    # never land on that boundary naturally. AddAudioTrack rejects anything
+    # else outright ("The provided audio stream is not valid."). Pad with
+    # silence up to the next sector boundary (and up to the 4-second/
+    # 300-sector minimum a track must have) rather than trim real audio.
+    $sectorSize = 2352
+    $minLen = 300 * $sectorSize
+    $paddedLen = [Math]::Ceiling([Math]::Max($rawLen, $minLen) / $sectorSize) * $sectorSize
+    $raw = New-Object byte[] $paddedLen
+    [Array]::Copy($bytes, $offset, $raw, 0, $rawLen)
     $prepared += ,@{ name = $w.Name; data = $raw }
 }
 
 $total = $prepared.Count
 $done = 0
 try {
+    # AddAudioTrack throws E_IMAPI_DF2TAO_MEDIA_IS_NOT_PREPARED ("only valid
+    # when media has been prepared") without this - PrepareMedia locks the
+    # drive for the write session, ReleaseMedia below hands it back.
+    $fmt.PrepareMedia()
     foreach ($t in $prepared) {
         $stream = New-Object -ComObject "ADODB.Stream"
         $stream.Type = 1; $stream.Open()
@@ -62,11 +76,12 @@ try {
         $done++
         Write-Output ("PROGRESS:" + [int]([math]::Min(99, $done * 100.0 / $total)))
     }
-    $fmt.Close()
+    $fmt.ReleaseMedia()
     $fmt.Recorder.EjectMedia()
     Write-Output "PROGRESS:100"
     exit 0
 } catch {
+    try { $fmt.ReleaseMedia() } catch {}
     Write-Error ("audio burn failed: " + $_.Exception.Message)
     exit 1
 }

package/src/win/burn-data.ps1

@@ -28,6 +28,9 @@ $fmt = New-Object -ComObject "IMAPI2.MsftDiscFormat2Data"
 if (-not $fmt.IsRecorderSupported($rec)) { Write-Error "recorder not supported"; exit 3 }
 $fmt.Recorder = $rec
 $fmt.ClientName = "DiscStation"
+# Without this the disc session never finalizes - the drive reports the
+# disc as still blank afterward even though the data is physically there.
+try { $fmt.ForceMediaToBeClosed = $true } catch {}
 if ($Speed -and $Speed -match '^\d+') {
     try { $fmt.SetWriteSpeed([int]($Speed -replace '\D',''), $false) } catch {}
 }
@@ -41,7 +44,11 @@ $fsi.FreeMediaBlocks = -1            # -1 = use the whole disc
 
 $item = Get-Item -LiteralPath $Source
 if ($item.PSIsContainer) {
-    foreach ($child in Get-ChildItem -LiteralPath $Source) { $fsi.Root.AddTree($child.FullName, $false) }
+    # AddTree's 2nd arg is IncludeBaseDirectory: $false flattens a folder
+    # child into just its contents at the disc root (dropping the folder
+    # name entirely) - wrong for VIDEO_TS/AUDIO_TS or any subfolder, which
+    # need to keep their own name. $true preserves it as a real subfolder.
+    foreach ($child in Get-ChildItem -LiteralPath $Source) { $fsi.Root.AddTree($child.FullName, $true) }
 } else {
     $fsi.Root.AddTree($item.FullName, $false)
 }
@@ -49,14 +56,19 @@ if ($item.PSIsContainer) {
 $result = $fsi.CreateResultImage()
 $stream = $result.ImageStream
 
-Register-ObjectEvent -InputObject $fmt -EventName "Update" -SourceIdentifier "burn" -Action {
-    $s = $EventArgs
-    try {
-        $done = [double]$s.LastWrittenLba
-        $tot  = [double]$s.SectorCount
-        if ($tot -gt 0) { Write-Output ("PROGRESS:" + [int]([math]::Min(99, $done * 100.0 / $tot))) }
-    } catch {}
-} | Out-Null
+# Not fatal if registration fails (seen on some setups: "Cannot register
+# for the specified event... does not exist") - the burn itself doesn't
+# need it, just no live PROGRESS lines.
+try {
+    Register-ObjectEvent -InputObject $fmt -EventName "Update" -SourceIdentifier "burn" -Action {
+        $s = $EventArgs
+        try {
+            $done = [double]$s.LastWrittenLba
+            $tot  = [double]$s.SectorCount
+            if ($tot -gt 0) { Write-Output ("PROGRESS:" + [int]([math]::Min(99, $done * 100.0 / $tot))) }
+        } catch {}
+    } | Out-Null
+} catch {}
 
 try {
     $fmt.Write($stream)

package/src/win/burn-image.ps1

@@ -31,19 +31,23 @@ if ($Speed -and $Speed -match '^\d+') {
     try { $fmt.SetWriteSpeed([int]($Speed -replace '\D',''), $false) } catch {}
 }
 
-# Progress: IMAPI2 raises an Update event with sector counts.
-$script:total = 1
-Register-ObjectEvent -InputObject $fmt -EventName "Update" -SourceIdentifier "burn" -Action {
-    $s = $EventArgs
-    try {
-        $done = [double]$s.LastWrittenLba
-        $tot  = [double]$s.SectorCount
-        if ($tot -gt 0) {
-            $pct = [int]([math]::Min(99, $done * 100.0 / $tot))
-            Write-Output "PROGRESS:$pct"
-        }
-    } catch {}
-} | Out-Null
+# Progress: IMAPI2 raises an Update event with sector counts. Not fatal if
+# registration fails (seen on some setups: "Cannot register for the
+# specified event... does not exist") - the burn itself doesn't need it,
+# just no live PROGRESS lines.
+try {
+    Register-ObjectEvent -InputObject $fmt -EventName "Update" -SourceIdentifier "burn" -Action {
+        $s = $EventArgs
+        try {
+            $done = [double]$s.LastWrittenLba
+            $tot  = [double]$s.SectorCount
+            if ($tot -gt 0) {
+                $pct = [int]([math]::Min(99, $done * 100.0 / $tot))
+                Write-Output "PROGRESS:$pct"
+            }
+        } catch {}
+    } | Out-Null
+} catch {}
 
 $stream = New-Object -ComObject "ADODB.Stream"
 $stream.Type = 1          # binary

package/src/win/disc-info.ps1

@@ -23,11 +23,18 @@ try {
 if (-not $out.media_loaded) { Write-Output (ConvertTo-JsonCompat $out); exit 0 }
 
 # Volume label + filesystem (WMI logical disk).
+$isAudioCd = $false
 try {
     $ld = Get-WmiObject Win32_LogicalDisk -Filter ("DeviceID='" + $out.drive + "'")
     if ($ld) {
         if ($ld.VolumeName) { $out.label = $ld.VolumeName }
-        if ($ld.FileSystem) {
+        # Windows presents a synthetic CDFS view (fixed volume name "Audio
+        # CD") for audio discs, purely so Explorer can browse track01.cda
+        # files - it's not a real filesystem. Treating it as one made every
+        # audio CD misclassify as a data disc.
+        if ($ld.VolumeName -eq "Audio CD" -and "$($ld.FileSystem)" -ieq "CDFS") {
+            $isAudioCd = $true
+        } elseif ($ld.FileSystem) {
             $fs = $ld.FileSystem.ToLower()
             if ($fs -match "udf") { $out.fs = "udf" }
             elseif ($fs -match "cdfs|iso9660") { $out.fs = "iso9660" }
@@ -64,13 +71,11 @@ try {
     }
 } catch {}
 
-# An audio CD has readable media, no filesystem, and (usually) no IMAPI type.
-if (-not $out.fs -and -not $out.blank -and ($out.media_type -eq "" -or $out.media_type -match "^cd")) {
-    try {
-        $ld2 = Get-WmiObject Win32_CDROMDrive -Filter ("Drive='" + $out.drive + "'")
-        # Win32_CDROMDrive has no track info; treat "media loaded, no FS, not blank" as audio.
-        $out.media_type = "audio_cd"
-    } catch {}
+# $isAudioCd (Windows' own synthetic "Audio CD" CDFS view, detected above) is
+# authoritative - overrides whatever IMAPI2's physical-media-type guess said,
+# since a finalized audio CD-R still reports as generic "cd-rom" there.
+if ($isAudioCd) {
+    $out.media_type = "audio_cd"
 }
 
 Write-Output (ConvertTo-JsonCompat $out)