discstation 0.1.35 → 0.1.37

package/src/discstation_burn.py

@@ -1,12 +1,10 @@
 #!/usr/bin/env python3
-import datetime
 import json
 import os
 import re
 import serial
 import shutil
 import subprocess
-import sys
 import threading
 import time
 import unicodedata
@@ -169,24 +167,6 @@ def reset_drive(device=None):
     print("reset_drive: no matching USB optical device found to reset")
     return False
 
-def _esp32_port_from_sysfs():
-    """Find the ESP32's USB serial port by matching VID/PID 303a:1001
-    in sysfs. Returns the device path (e.g. /dev/ttyACM0) or None."""
-    for tty in Path("/sys/class/tty").glob("ttyACM*"):
-        uevent = tty / "device" / "uevent"
-        if uevent.exists():
-            modalias = uevent.read_text()
-            if "303a/1001" in modalias or "303a:1001" in modalias:
-                dev = Path("/dev") / tty.name
-                if dev.exists():
-                    return str(dev)
-    return None
-
-
-def detect_esp32_port():
-    return discstation_host.serial_port() or ""
-
-PORT = detect_esp32_port()
 BAUD   = 115200
 
 
@@ -204,19 +184,26 @@ def check_cancel(ser):
     return False
 
 
-def iter_proc_or_cancel(proc, ser):
-    lines = Queue()
-    finished = object()
+def proc_line_queue(proc):
+    """Pump proc.stdout into a Queue from a daemon thread. Returns
+    (queue, done): `done` is the sentinel put on the queue at EOF."""
+    lines, done = Queue(), object()
 
-    def read_output():
+    def pump():
         try:
             for line in proc.stdout:
                 lines.put(line.rstrip("\r\n"))
         finally:
-            lines.put(finished)
+            lines.put(done)
+
+    threading.Thread(target=pump, daemon=True).start()
+    return lines, done
 
-    reader = threading.Thread(target=read_output, daemon=True)
-    reader.start()
+
+def iter_proc_or_cancel(proc, ser):
+    """Yield proc's output lines, PINGing the remote every 5s; a CANCEL from
+    the remote stops the process and ends the iteration."""
+    lines, done = proc_line_queue(proc)
     last_ping = time.time()
     output_done = False
     while proc.poll() is None or not output_done:
@@ -231,14 +218,12 @@ def iter_proc_or_cancel(proc, ser):
             line = lines.get(timeout=0.2)
         except Empty:
             continue
-        if line is finished:
+        if line is done:
             output_done = True
         else:
             yield line
-    reader.join(timeout=1)
 
 
-DVD_DEVICE = os.environ.get("DISC_DEVICE") or os.environ.get("DVD_DEVICE")
 DISC_SPEED = os.environ.get("DISC_SPEED")
 DISC_DISC_BYTES = 4_700_000_000
 DVD_DL_BYTES = 8_500_000_000
@@ -1737,18 +1722,7 @@ def _run_windows_burn(ser, script, *script_args):
     cmd, kwargs = discstation_host.ps_cmd(script, *script_args)
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, **kwargs)
 
-    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()
+    lines, finished = proc_line_queue(proc)
 
     out_lines, last_pct, last_real_progress, start = [], -1, 0.0, time.time()
     last_ping, output_done = time.time(), False
@@ -1784,7 +1758,6 @@ def _run_windows_burn(ser, script, *script_args):
                 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
@@ -1841,10 +1814,8 @@ def remux_and_author(ser, mpg, disc_label, disc_capacity, dvd_aspect=None):
     silent blocking subprocess call that lets the ESP32's 30s watchdog
     flip the display to "disconnected" partway through.
 
-    This is the single place the remux+author sequence lives — the
-    full download/convert pipeline, the OLED burn_mpg_flow picker, and
-    any CLI entry point all call this (via remux_and_burn below, or
-    directly), so a fix here only has to happen once.
+    This is the single place the remux+author sequence lives (burn_flow
+    calls it after the download/convert pipeline).
     """
     check_encoded_size(ser, mpg, disc_capacity)
     send(ser, f"TITLE:{disc_label}")
@@ -1894,163 +1865,3 @@ def remux_and_author(ser, mpg, disc_label, disc_capacity, dvd_aspect=None):
     dvd_dir = author(ser, fixed, fixed.parent, dvd_aspect)
     check_dvd_size(ser, dvd_dir, disc_capacity)
     return dvd_dir
-
-def remux_and_burn(ser, mpg, disc_label, disc_capacity, dl_info, burn_speed=None, dvd_aspect=None):
-    dvd_dir = remux_and_author(ser, mpg, disc_label, disc_capacity, dvd_aspect)
-    wait_for_burn_confirm(ser, dvd_dir, disc_capacity)
-    burn(ser, dvd_dir, disc_label, burn_speed, dl_info["is_dual_layer"])
-    safe_send(ser, "DONE:Burn complete!")
-    print(f"Burned {mpg} as {disc_label}")
-
-
-def main():
-    if len(sys.argv) < 2:
-        print("Usage: python3 discstation_burn.py 'video URL or file path'")
-        sys.exit(1)
-    url = sys.argv[1]
-    WORK.mkdir(parents=True, exist_ok=True)
-    job_dir = WORK / time.strftime("job_%Y%m%d_%H%M%S")
-    job_dir.mkdir()
-    ser = None
-    try:
-        ser = serial.Serial(PORT, BAUD, timeout=1)
-        reset_serial_state()
-        time.sleep(2)
-        print("Connected to DiscStation")
-        print("Running preflight...")
-        send(ser, "STATUS:Preflight...")
-        info = get_video_info(url, ser)
-        title = info["title"]
-        duration = info["duration"]
-        duration_line, fit_line, can_fit = preflight_lines(duration)
-        print(f"Title: {title}")
-        print(f"Duration: {format_duration(duration)}")
-        print(f"Preflight: {fit_line}")
-        print(f"DVD drive: {disc_device()}")
-        disc_label = sanitize_disc_label(title)
-        print(f"Disc label: {disc_label}")
-        send(ser, f"TITLE:{title}")
-        send(ser, f"META:{duration_line}")
-        send(ser, f"FIT:{fit_line}")
-        if not can_fit:
-            raise RuntimeError("Video too long for DVD5")
-
-        device = disc_device()
-        dl_info = detect_disc_type(device)
-        if dl_info["is_dual_layer"]:
-            sl_target = int(os.environ.get("DISC_TARGET_BYTES", "4300000000"))
-            try:
-                sl_plan = bitrate_plan(duration, "AUTO", sl_target)
-                if sl_plan:
-                    warn = f"DL disc for SL content"
-                    print(f"WARNING: {warn}")
-                    safe_send(ser, f"WARNING:{warn}")
-                    time.sleep(3)
-            except RuntimeError:
-                pass
-
-        print("Waiting for button press...")
-        selected_mode = "AUTO"
-        burn_speed = None
-        while True:
-            if ser.in_waiting:
-                resp = ser.readline().decode(errors='ignore').strip()
-                note_serial_activity()
-                if resp == "CANCEL":
-                    print("Cancelled by user")
-                    safe_send(ser, "CANCELLED:Cancelled")
-                    sys.exit(130)
-                elif resp.startswith("MODE:"):
-                    selected_mode = normalize_mode(resp.split(":", 1)[1])
-                    print(f"Mode: {selected_mode}")
-                elif resp.startswith("SPEED:"):
-                    burn_speed = resp.split(":", 1)[1].strip()
-                    print(f"Burn speed: {burn_speed}")
-                elif resp == "START" or resp.startswith("START:"):
-                    if ":" in resp:
-                        selected_mode = normalize_mode(resp.split(":", 1)[1])
-                    print(f"Button pressed - starting in {selected_mode} mode!")
-                    send(ser, f"STATUS:Starting {selected_mode}...")
-                    break
-            time.sleep(0.1)
-
-        start_time = time.time()
-        disc_type_label = "DL" if dl_info["is_dual_layer"] else "SL"
-        try:
-            disc_bytes = dl_info["capacity"]
-            plan = bitrate_plan(duration, selected_mode, disc_bytes)
-            video  = download(ser, url, job_dir)
-            mpg, dvd_aspect = convert(ser, video, job_dir, selected_mode, disc_bytes)
-            dvd    = remux_and_author(ser, mpg, disc_label, disc_bytes, dvd_aspect)
-            if plan["burn"]:
-                burn(ser, dvd, disc_label, burn_speed, dl_info["is_dual_layer"])
-                send(ser, "DONE:Disc complete!")
-                print("Done!")
-            else:
-                send(ser, "DONE:Test complete!")
-                print("Test complete. DVD folder was built but not burned.")
-            append_history({
-                "timestamp": datetime.datetime.now().isoformat(),
-                "title": title,
-                "disc_type": disc_type_label,
-                "mode": selected_mode,
-                "speed": burn_speed or "Auto",
-                "success": True,
-                "duration_s": round(time.time() - start_time),
-            })
-        except (KeyboardInterrupt, SystemExit):
-            append_history({
-                "timestamp": datetime.datetime.now().isoformat(),
-                "title": title,
-                "disc_type": disc_type_label,
-                "mode": selected_mode,
-                "speed": burn_speed or "Auto",
-                "success": False,
-                "error": "Cancelled",
-                "duration_s": round(time.time() - start_time),
-            })
-            raise
-        except Exception as e:
-            append_history({
-                "timestamp": datetime.datetime.now().isoformat(),
-                "title": title,
-                "disc_type": disc_type_label,
-                "mode": selected_mode,
-                "speed": burn_speed or "Auto",
-                "success": False,
-                "error": str(e)[:100],
-                "duration_s": round(time.time() - start_time),
-            })
-            raise
-    except (KeyboardInterrupt, SystemExit):
-        safe_send(ser, "CANCELLED:Stopped")
-        print("Cancelled")
-        sys.exit(130)
-    except RuntimeError as e:
-        msg = str(e)
-        if msg == "Cancelled":
-            safe_send(ser, "CANCELLED:Stopped")
-        else:
-            safe_send(ser, f"ERROR:{msg[:20]}")
-        print(f"Error: {e}")
-        sys.exit(1)
-    except Exception as e:
-        safe_send(ser, f"ERROR:{str(e)[:20]}")
-        print(f"Error: {e}")
-        sys.exit(1)
-    finally:
-        if ser:
-            ser.close()
-
-
-BURN_HISTORY = WORK / "burn_history.jsonl"
-
-
-def append_history(entry):
-    BURN_HISTORY.parent.mkdir(parents=True, exist_ok=True)
-    with open(BURN_HISTORY, "a") as f:
-        f.write(json.dumps(entry) + "\n")
-
-
-if __name__ == "__main__":
-    main()

package/src/static/style.css

@@ -177,13 +177,6 @@ h1 {
   font-weight: 900;
 }
 h1 em { font-style: normal; -webkit-text-stroke: 1px var(--ink); color: transparent; }
-.lede {
-  max-width: 560px;
-  margin: 28px 0 26px;
-  color: var(--muted);
-  font-size: 12px;
-  line-height: 1.8;
-}
 .hero-specs {
   display: flex;
   flex-wrap: wrap;

package/src/win/_imapi.ps1

@@ -0,0 +1,66 @@
+# Shared IMAPI2 helpers, dot-sourced by the burn scripts (same pattern as _json.ps1).
+
+function Get-Recorder([string]$letter) {
+    $master = New-Object -ComObject "IMAPI2.MsftDiscMaster2"
+    for ($i = 0; $i -lt $master.Count; $i++) {
+        $rec = New-Object -ComObject "IMAPI2.MsftDiscRecorder2"
+        $rec.InitializeDiscRecorder($master.Item($i))
+        foreach ($p in $rec.VolumePathNames) {
+            if ($p -and $p.TrimEnd('\') -ieq $letter) { return $rec }
+        }
+    }
+    throw "No optical recorder for $letter"
+}
+
+# Apply an optional "8x"-style write speed; not fatal if the drive refuses it.
+function Set-WriteSpeed($fmt, [string]$speed) {
+    if ($speed -and $speed -match '^\d+') {
+        try { $fmt.SetWriteSpeed([int]($speed -replace '\D',''), $false) } catch {}
+    }
+}
+
+# A data-disc (IMAPI2.MsftDiscFormat2Data) writer bound to the drive letter.
+function New-DataWriter([string]$letter, [string]$speed) {
+    $rec = Get-Recorder $letter
+    $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 {}
+    Set-WriteSpeed $fmt $speed
+    return $fmt
+}
+
+# Write $stream to the disc, streaming "PROGRESS:<pct>" lines, then eject.
+# Sets $global:BurnExit (0 ok, 1 failed) for the caller to `exit` with.
+function Write-DiscStream($fmt, $stream) {
+    # 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) { Write-Output ("PROGRESS:" + [int]([math]::Min(99, $done * 100.0 / $tot))) }
+            } catch {}
+        } | Out-Null
+    } catch {}
+
+    try {
+        $fmt.Write($stream)
+        Write-Output "PROGRESS:100"
+        $global:BurnExit = 0
+    } catch {
+        Write-Error ("burn failed: " + $_.Exception.Message)
+        $global:BurnExit = 1
+    } finally {
+        try { $stream.Close() } catch {}
+        Unregister-Event -SourceIdentifier "burn" -ErrorAction SilentlyContinue
+        try { $fmt.Recorder.EjectMedia() } catch {}
+    }
+}

package/src/win/audio-toc.ps1

@@ -6,15 +6,7 @@ param([Parameter(Mandatory = $true)] [string] $Drive)
 $ErrorActionPreference = "Stop"
 . (Join-Path $PSScriptRoot "_json.ps1")
 
-function Get-Recorder([string]$letter) {
-    $master = New-Object -ComObject "IMAPI2.MsftDiscMaster2"
-    for ($i = 0; $i -lt $master.Count; $i++) {
-        $rec = New-Object -ComObject "IMAPI2.MsftDiscRecorder2"
-        $rec.InitializeDiscRecorder($master.Item($i))
-        foreach ($p in $rec.VolumePathNames) { if ($p -and $p.TrimEnd('\') -ieq $letter) { return $rec } }
-    }
-    throw "No optical recorder for $letter"
-}
+. (Join-Path $PSScriptRoot "_imapi.ps1")
 
 $rec = Get-Recorder $Drive
 $raw = New-Object -ComObject "IMAPI2.MsftDiscFormat2RawCD"

package/src/win/burn-audio.ps1

@@ -11,17 +11,7 @@ $ErrorActionPreference = "Stop"
 $wavs = @(Get-ChildItem -LiteralPath $WavDir -Filter *.wav | Sort-Object Name)
 if ($wavs.Count -eq 0) { Write-Error "no WAV files in $WavDir"; exit 2 }
 
-function Get-Recorder([string]$letter) {
-    $master = New-Object -ComObject "IMAPI2.MsftDiscMaster2"
-    for ($i = 0; $i -lt $master.Count; $i++) {
-        $rec = New-Object -ComObject "IMAPI2.MsftDiscRecorder2"
-        $rec.InitializeDiscRecorder($master.Item($i))
-        foreach ($p in $rec.VolumePathNames) {
-            if ($p -and $p.TrimEnd('\') -ieq $letter) { return $rec }
-        }
-    }
-    throw "No optical recorder for $letter"
-}
+. (Join-Path $PSScriptRoot "_imapi.ps1")
 
 $rec = Get-Recorder $Drive
 $fmt = New-Object -ComObject "IMAPI2.MsftDiscFormat2TrackAtOnce"
@@ -29,9 +19,7 @@ if (-not $fmt.IsRecorderSupported($rec)) { Write-Error "recorder not supported";
 $fmt.Recorder = $rec
 $fmt.ClientName = "DiscStation"
 try { $fmt.NumberOfExistingTracks } catch {}
-if ($Speed -and $Speed -match '^\d+') {
-    try { $fmt.SetWriteSpeed([int]($Speed -replace '\D',''), $false) } catch {}
-}
+Set-WriteSpeed $fmt $Speed
 
 $prepared = @()
 foreach ($w in $wavs) {

package/src/win/burn-data.ps1

@@ -11,29 +11,9 @@ param(
 $ErrorActionPreference = "Stop"
 if (-not (Test-Path $Source)) { Write-Error "source not found: $Source"; exit 2 }
 
-function Get-Recorder([string]$letter) {
-    $master = New-Object -ComObject "IMAPI2.MsftDiscMaster2"
-    for ($i = 0; $i -lt $master.Count; $i++) {
-        $rec = New-Object -ComObject "IMAPI2.MsftDiscRecorder2"
-        $rec.InitializeDiscRecorder($master.Item($i))
-        foreach ($p in $rec.VolumePathNames) {
-            if ($p -and $p.TrimEnd('\') -ieq $letter) { return $rec }
-        }
-    }
-    throw "No optical recorder for $letter"
-}
+. (Join-Path $PSScriptRoot "_imapi.ps1")
 
-$rec = Get-Recorder $Drive
-$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 {}
-}
+$fmt = New-DataWriter $Drive $Speed
 
 # Filesystem image: ISO9660 + Joliet + UDF, sized to the loaded media.
 $fsi = New-Object -ComObject "IMAPI2FS.MsftFileSystemImage"
@@ -56,28 +36,5 @@ if ($item.PSIsContainer) {
 $result = $fsi.CreateResultImage()
 $stream = $result.ImageStream
 
-# 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)
-    Write-Output "PROGRESS:100"
-    exit 0
-} catch {
-    Write-Error ("burn failed: " + $_.Exception.Message)
-    exit 1
-} finally {
-    Unregister-Event -SourceIdentifier "burn" -ErrorAction SilentlyContinue
-    try { $rec.EjectMedia() } catch {}
-}
+Write-DiscStream $fmt $stream
+exit $global:BurnExit

package/src/win/burn-image.ps1

@@ -8,61 +8,12 @@ param(
 
 $ErrorActionPreference = "Stop"
 if (-not (Test-Path $Iso)) { Write-Error "ISO not found: $Iso"; exit 2 }
+. (Join-Path $PSScriptRoot "_imapi.ps1")
 
-function Get-Recorder([string]$letter) {
-    $master = New-Object -ComObject "IMAPI2.MsftDiscMaster2"
-    for ($i = 0; $i -lt $master.Count; $i++) {
-        $rec = New-Object -ComObject "IMAPI2.MsftDiscRecorder2"
-        $rec.InitializeDiscRecorder($master.Item($i))
-        foreach ($p in $rec.VolumePathNames) {
-            if ($p -and $p.TrimEnd('\') -ieq $letter) { return $rec }
-        }
-    }
-    throw "No optical recorder for $letter"
-}
-
-$rec = Get-Recorder $Drive
-$fmt = New-Object -ComObject "IMAPI2.MsftDiscFormat2Data"
-if (-not $fmt.IsRecorderSupported($rec)) { Write-Error "recorder not supported"; exit 3 }
-$fmt.Recorder = $rec
-$fmt.ClientName = "DiscStation"
-try { $fmt.ForceMediaToBeClosed = $true } catch {}
-if ($Speed -and $Speed -match '^\d+') {
-    try { $fmt.SetWriteSpeed([int]($Speed -replace '\D',''), $false) } catch {}
-}
-
-# 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 {}
-
+$fmt = New-DataWriter $Drive $Speed
 $stream = New-Object -ComObject "ADODB.Stream"
 $stream.Type = 1          # binary
 $stream.Open()
 $stream.LoadFromFile($Iso)
-
-try {
-    $fmt.Write($stream)
-    Write-Output "PROGRESS:100"
-    exit 0
-} catch {
-    Write-Error ("burn failed: " + $_.Exception.Message)
-    exit 1
-} finally {
-    $stream.Close()
-    Unregister-Event -SourceIdentifier "burn" -ErrorAction SilentlyContinue
-    try { $rec.EjectMedia() } catch {}
-}
+Write-DiscStream $fmt $stream
+exit $global:BurnExit