discstation 0.1.18 → 0.1.21

package/README.md

@@ -64,7 +64,7 @@ Windows.
 |----|-----------|-----------------|
 | Linux | `install.sh` — apt deps, venv, systemd `--user` service, self-signed cert | full burn / rip / play |
 | macOS | `install-macos.sh` — Homebrew deps, venv, launchd agent, cert | burn / rip / play (audio-CD *burning* is best-effort; set `DISC_DEVICE` if detection fails) |
-| Windows | `install-windows.ps1` — files + venv | web / serial control only, no burn backend |
+| Windows | `install-windows.ps1` — Python + venv, self-signed cert, firewall rules, auto-start Scheduled Task | burn (ISO / data / audio CD) via IMAPI2 on Windows 10/11 and 7; DVD rip (HandBrake main-feature mode) and play (mpv) use the shared cross-platform path; full VIDEO_TS mirror rip and audio-CD rip aren't implemented on Windows yet |
 
 ### Or run the platform script directly
 
@@ -80,7 +80,7 @@ arduino-cli lib install QRCode
 # macOS host
 ./install-macos.sh
 
-# Windows host (web/control workflow)
+# Windows host
 PowerShell -ExecutionPolicy Bypass -File .\install-windows.ps1
 ```
 
@@ -88,8 +88,10 @@ PowerShell -ExecutionPolicy Bypass -File .\install-windows.ps1
 
 Linux and macOS both run the complete optical workflow (burn, rip, play) —
 macOS via `xorriso` / `hdiutil` / `cd-paranoia` / `dvdbackup` / HandBrake, with
-audio-CD *burning* the one best-effort area. Windows runs the shared Python/web
-workflow only; it has no burn backend yet. See `docs/PLATFORM_SUPPORT.md`.
+audio-CD *burning* the one best-effort area. Windows burns (ISO / data / audio
+CD) via IMAPI2 and plays via mpv; DVD ripping works in HandBrake main-feature
+mode but not full VIDEO_TS mirror or audio-CD ripping yet. See
+`docs/PLATFORM_SUPPORT.md`.
 
 ## Web Interface
 
@@ -114,7 +116,7 @@ Built-in web server on port 8080 (HTTPS with self-signed cert):
 | `DISC_CLEANUP_DAYS` | 2 | Auto-cleanup old job directories |
 | `DISC_OUTPUT_LIMIT_BYTES` | 4300000000 | Conservative DVD5 payload limit |
 | `DISC_DL_OUTPUT_LIMIT_BYTES` | 8000000000 | Conservative DVD9 payload limit |
-| `DISC_DEVICE` | auto | Optical drive node override (required on Windows) |
+| `DISC_DEVICE` | auto | Optical drive node override |
 | `DISC_PORT` | auto | ESP32 serial port override |
 | `DISCSTATION_HTTP_PORT` | 8081 | Plain-HTTP port for the mobile app (`0` disables) |
 | `DISCSTATION_DVD_RIP_MODE` | mirror | `mkv` = HandBrake main-feature transcode instead of a full VIDEO_TS mirror |

package/arduino/c6/DiscStation_C6.ino

@@ -510,7 +510,13 @@ void parseMessage(String msg) {
     line1 = msg.substring(7);
     line2 = "";
     line3 = "";
-    progressPercent = -1;
+    // Don't reset progressPercent here - a STATUS: label change (e.g.
+    // "Copying files..." -> "Converting...") is often immediately
+    // followed by a fresh PROGRESS: for the same ongoing operation.
+    // Wiping it every time flipped the bar to the indeterminate dots
+    // and back on every single label update, flickering between the
+    // two. DONE:/CANCELLED:/ERROR:/NO_DISC: still reset it below - those
+    // really are the end of an operation.
     drawStatus();
 
   } else if (msg.startsWith("PROGRESS:")) {

package/arduino/v1/DiscStation.ino

@@ -535,7 +535,10 @@ void parseMessage(String msg) {
     line1 = msg.substring(7);
     line2 = "";
     line3 = "";
-    progressPercent = -1;
+    // Don't reset progressPercent here - see arduino/c6/DiscStation_C6.ino's
+    // matching comment: STATUS: label changes mid-operation are usually
+    // immediately followed by a fresh PROGRESS:, so wiping it every time
+    // flickered the bar to the indeterminate dots and back.
     drawStatus();
 
   } else if (msg.startsWith("PROGRESS:")) {

package/docs/PLATFORM_SUPPORT.md

@@ -29,10 +29,28 @@ the drive on recent macOS; DiscStation reports this clearly instead of hanging.
 
 ## Windows
 
-The Python host and web/control workflow can run from PowerShell. Optical
-burning needs a Windows IMAPI backend or a separately installed compatible
-burning tool. The Windows installer deliberately reports this limitation
-instead of silently attempting Linux commands.
+Runs the same Python host and web UI as Linux/macOS, triggered the same way
+via the ESP32 OLED remote. `install-windows.ps1` sets up Python + venv, a
+self-signed cert, firewall rules for 8080/8081, and a per-user auto-start
+Scheduled Task (headless `pythonw.exe`, no admin needed).
+
+- **Detect / eject** — WMI (`Win32_CDROMDrive`, `Win32_LogicalDisk`) + IMAPI2
+  for media type, blank/rewritable state, and capacity
+  (`src/win/disc-info.ps1`, `src/win/eject.ps1`).
+- **Burn** — data, ISO, and audio CD all go through IMAPI2
+  (`src/win/burn-{image,data,audio}.ps1`), with live progress streamed to the
+  OLED; `isoburn.exe /q` is the zero-dependency fallback for a raw ISO.
+  Works on Windows 7 SP1 and 10/11.
+- **Rip** — DVD main-feature mode via HandBrakeCLI (winget on 10/11) works;
+  a full unencrypted VIDEO_TS mirror and audio-CD ripping aren't implemented
+  yet (no Windows path for `dvdbackup`/`cd-paranoia`).
+- **Play** — `mpv`, via the same code path as Linux/macOS (device letter for
+  DVD-Video, `cdda://` for audio CD, mounted drive for data/VCD).
+
+Windows 7 (no `winget`) gets the host, detection, eject, and all three burn
+modes; rip/play need tools that don't install cleanly on 7, so those OLED
+actions report "not supported" there. Set `DISC_DEVICE` to override drive
+auto-detection.
 
 ## Shared Components
 
@@ -43,4 +61,5 @@ instead of silently attempting Linux commands.
 - QR-code web URL display
 
 The optical-drive backend is the platform boundary. Linux and macOS are
-complete (bar macOS audio-CD burning); Windows still needs its writer backend.
+complete (bar macOS audio-CD burning); Windows burns and plays, with DVD-mirror
+and audio-CD ripping still to come.

package/install-windows.ps1

@@ -1,29 +1,173 @@
+# DiscStation host installer for Windows 10/11 (and best-effort on 7 SP1).
+#   powershell -ExecutionPolicy Bypass -File install-windows.ps1
+# Sets up: Python + venv, optical CLI tools (winget), self-signed cert,
+# a per-user auto-start Scheduled Task, and inbound firewall rules for 8080/8081.
 $ErrorActionPreference = "Stop"
+$ProgressPreference = "SilentlyContinue"  # Invoke-WebRequest's progress bar breaks over SSH/non-interactive hosts
 
-$Root = Split-Path -Parent $MyInvocation.MyCommand.Path
-$App = if ($env:DISCSTATION_APP_DIR) { $env:DISCSTATION_APP_DIR } else { Join-Path $env:LOCALAPPDATA "DiscStation\app" }
-$Venv = if ($env:DISCSTATION_VENV_DIR) { $env:DISCSTATION_VENV_DIR } else { Join-Path $env:LOCALAPPDATA "DiscStation\venv" }
+$Root   = Split-Path -Parent $MyInvocation.MyCommand.Path
+$Base   = if ($env:DISCSTATION_CONFIG_DIR) { $env:DISCSTATION_CONFIG_DIR } else { Join-Path $env:APPDATA "DiscStation" }
+$App    = if ($env:DISCSTATION_APP_DIR)    { $env:DISCSTATION_APP_DIR }    else { Join-Path $Base "app" }
+$Venv   = if ($env:DISCSTATION_VENV_DIR)   { $env:DISCSTATION_VENV_DIR }   else { Join-Path $Base "venv" }
+$IsWin7 = [Environment]::OSVersion.Version.Major -eq 6
+$winget = (Get-Command winget -ErrorAction SilentlyContinue)
 
-if (-not (Get-Command py -ErrorAction SilentlyContinue)) {
-    throw "Install Python 3 from https://www.python.org/downloads/windows/ first."
+function Have($name) { [bool](Get-Command $name -ErrorAction SilentlyContinue) }
+function Winget-Install($id) {
+    if (-not $winget) { return $false }
+    try { winget install -e --id $id --accept-source-agreements --accept-package-agreements --silent | Out-Null; return $true }
+    catch { Write-Host "  winget $id failed (skipping)"; return $false }
 }
 
-New-Item -ItemType Directory -Force -Path $App, $Venv | Out-Null
+# --- 1. Python -------------------------------------------------------------------
+if (-not (Have "python") -and -not (Have "py")) {
+    Write-Host "Installing Python..."
+    if ($winget -and -not $IsWin7) {
+        Winget-Install "Python.Python.3.12" | Out-Null
+        $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "User") + ";" + $env:Path
+    } else {
+        $pyver = if ($IsWin7) { "3.8.10" } else { "3.12.6" }
+        $url = "https://www.python.org/ftp/python/$pyver/python-$pyver-amd64.exe"
+        $exe = Join-Path $env:TEMP "python-$pyver-amd64.exe"
+        Invoke-WebRequest $url -OutFile $exe -UseBasicParsing
+        Start-Process $exe -ArgumentList "/quiet","InstallAllUsers=0","PrependPath=1","Include_test=0" -Wait
+        $env:Path = (Join-Path $env:LOCALAPPDATA "Programs\Python\Python$($pyver.Substring(0,4) -replace '\.','')") + ";" + $env:Path + ";" +
+                    (Join-Path $env:LOCALAPPDATA "Programs\Python\Python$($pyver.Substring(0,4) -replace '\.','')\Scripts")
+    }
+}
+if (Have "python") { $PyExe = "python"; $PyArgs = @() }
+elseif (Have "py") { $PyExe = "py"; $PyArgs = @("-3") }
+else { throw "Python install failed. Install Python 3 manually and re-run." }
+
+# --- 2. Optical CLI tools (winget when available; Win10/11 only; best-effort,
+#        strictly time-bounded so a slow/blocked mirror can never hang the install) --
+if ($winget -and -not $IsWin7) {
+    Write-Host "Installing optical tools via winget (best effort)..."
+    foreach ($id in "libburnia.xorriso","mpv.mpv","HandBrake.HandBrake.CLI","Gyan.FFmpeg","yt-dlp.yt-dlp") {
+        Winget-Install $id | Out-Null
+    }
+} elseif (-not $IsWin7) {
+    Write-Host "winget unavailable - fetching optical tools directly (best effort, 25s timeout each)..."
+    $tools = Join-Path $Base "tools"
+    New-Item -ItemType Directory -Force -Path $tools | Out-Null
+    function Get-Zip($url, $dest) {
+        try {
+            $zip = Join-Path $env:TEMP ([IO.Path]::GetFileName($url))
+            Invoke-WebRequest $url -OutFile $zip -UseBasicParsing -TimeoutSec 25
+            Expand-Archive -Path $zip -DestinationPath $dest -Force
+            Remove-Item $zip -ErrorAction SilentlyContinue
+            return $true
+        } catch { Write-Host "  fetch failed: $url"; return $false }
+    }
+    if (-not (Have "yt-dlp")) {
+        try { Invoke-WebRequest "https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp.exe" -OutFile (Join-Path $tools "yt-dlp.exe") -UseBasicParsing -TimeoutSec 25 }
+        catch { Write-Host "  yt-dlp fetch skipped" }
+    }
+    if (-not (Have "ffmpeg")) { Get-Zip "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip" $tools | Out-Null }
+    if (-not (Have "mpv")) {
+        # The SourceForge "latest" mpv build is a .7z (Expand-Archive can't
+        # open it); mpv's own first-party CI release ships plain .zip builds.
+        try {
+            $mpvRelease = Invoke-RestMethod "https://api.github.com/repos/mpv-player/mpv/releases/tags/git-release" -UseBasicParsing -TimeoutSec 25
+            $mpvAsset = $mpvRelease.assets | Where-Object { $_.name -match "x86_64-w64-mingw32\.zip$" } | Select-Object -First 1
+            if ($mpvAsset) { Get-Zip $mpvAsset.browser_download_url (Join-Path $tools "mpv") | Out-Null }
+        } catch { Write-Host "  mpv fetch skipped" }
+    }
+    if (-not (Have "HandBrakeCLI")) {
+        try {
+            $hbRelease = Invoke-RestMethod "https://api.github.com/repos/HandBrake/HandBrake/releases/latest" -UseBasicParsing -TimeoutSec 25
+            $hbAsset = $hbRelease.assets | Where-Object { $_.name -match "^HandBrakeCLI-.*-win-x86_64\.zip$" } | Select-Object -First 1
+            if ($hbAsset) { Get-Zip $hbAsset.browser_download_url (Join-Path $tools "handbrake") | Out-Null }
+        } catch { Write-Host "  HandBrakeCLI fetch skipped" }
+    }
+    # dvdauthor + spumux (DVD-Video authoring/subtitles) have no winget package;
+    # this VideoHelp-hosted plain .zip (no rar/unrar needed) is the only
+    # reliable direct-download source found.
+    if (-not (Have "dvdauthor")) { Get-Zip "https://download.videohelp.com/gfd/edcounter.php?file=download/dvdauthor_winbin.zip" (Join-Path $tools "dvdauthor") | Out-Null }
+    if (Test-Path $tools) {
+        $env:Path = $env:Path + ";" + $tools + ";" +
+            ((Get-ChildItem $tools -Recurse -Filter "ffmpeg.exe" -ErrorAction SilentlyContinue | Select-Object -First 1).DirectoryName)
+    }
+    Write-Host "xorriso and HandBrakeCLI have no simple direct-download URL - install manually if you need"
+    Write-Host "video-DVD ISO packaging / DVD ripping (see the plan's Windows setup notes)."
+} else {
+    Write-Host "winget unavailable (Windows 7). ISO + data + audio burn work via IMAPI2."
+    Write-Host "For rip/play/video-DVD install manually: xorriso, HandBrakeCLI 1.5.1, ffmpeg, mpv, yt-dlp."
+}
+
+# --- 3. App files + venv ------------------------------------------------------
+New-Item -ItemType Directory -Force -Path $Base, $App | Out-Null
 Copy-Item -Recurse -Force (Join-Path $Root "src\*") $App
-py -3 -m venv $Venv
-& (Join-Path $Venv "Scripts\python.exe") -m pip install --upgrade pip
+& $PyExe @PyArgs -m venv $Venv
 $Py = Join-Path $Venv "Scripts\python.exe"
+& $Py -m pip install --upgrade pip
 $Req = Join-Path $Root "requirements.txt"
-if (Test-Path $Req) {
-    & $Py -m pip install -r $Req
-} else {
-    & $Py -m pip install pyserial mutagen requests yt-dlp
+if (Test-Path $Req) { & $Py -m pip install -r $Req } else { & $Py -m pip install pyserial mutagen requests yt-dlp }
+$Opt = Join-Path $Root "requirements-optional.txt"
+try { if (Test-Path $Opt) { & $Py -m pip install -r $Opt } else { & $Py -m pip install musicbrainzngs tmdbsimple } }
+catch { Write-Host "Optional metadata deps skipped (host still works)." }
+
+# --- 4. Self-signed cert (HTTPS on :8080; :8081 works without it) --------------
+$crt = Join-Path $Base "server.crt"; $key = Join-Path $Base "server.key"
+if (-not (Test-Path $crt) -or -not (Test-Path $key)) {
+    try {
+        $c = New-SelfSignedCertificate -DnsName "discstation.local" -CertStoreLocation "Cert:\CurrentUser\My" -NotAfter (Get-Date).AddYears(10)
+        $pwd = ConvertTo-SecureString -String "discstation" -Force -AsPlainText
+        $pfx = Join-Path $env:TEMP "ds.pfx"
+        Export-PfxCertificate -Cert $c -FilePath $pfx -Password $pwd | Out-Null
+        & $Py -c "import ssl" 2>$null
+        # Convert PFX -> PEM via Python cryptography if present, else leave HTTPS off.
+        & $Py -m pip install cryptography 2>$null
+        & $Py -c "import sys;from cryptography.hazmat.primitives.serialization import pkcs12,Encoding,PrivateFormat,NoEncryption;d=open(sys.argv[1],'rb').read();k,c,_=pkcs12.load_key_and_certificates(d,b'discstation');open(sys.argv[2],'wb').write(c.public_bytes(Encoding.PEM));open(sys.argv[3],'wb').write(k.private_bytes(Encoding.PEM,PrivateFormat.TraditionalOpenSSL,NoEncryption()))" $pfx $crt $key
+        Remove-Item $pfx -ErrorAction SilentlyContinue
+    } catch { Write-Host "Cert generation skipped; the host will serve plain HTTP on 8081." }
 }
-# Optional metadata deps — best effort, never fatal.
-try { & $Py -m pip install musicbrainzngs tmdbsimple } catch {
-    Write-Host "Optional metadata deps skipped (host still works)."
+
+# --- 5. Firewall -------------------------------------------------------------
+foreach ($port in 8080, 8081) {
+    $name = "DiscStation $port"
+    try {
+        if (Get-Command New-NetFirewallRule -ErrorAction SilentlyContinue) {
+            if (-not (Get-NetFirewallRule -DisplayName $name -ErrorAction SilentlyContinue)) {
+                New-NetFirewallRule -DisplayName $name -Direction Inbound -Action Allow -Protocol TCP -LocalPort $port | Out-Null
+            }
+        } else {
+            netsh advfirewall firewall add rule name="$name" dir=in action=allow protocol=TCP localport=$port | Out-Null
+        }
+    } catch {}
 }
 
-Write-Host "DiscStation host files installed at $App"
-Write-Host "The web/control workflow is available; optical burning requires a Windows IMAPI backend or compatible burning tools."
-Write-Host "Run: $Venv\Scripts\python.exe $App\discstation.py"
+# --- 6. Auto-start Scheduled Task -----------------------------------------------
+$pyw = Join-Path $Venv "Scripts\pythonw.exe"
+$target = Join-Path $App "discstation.py"
+try {
+    if (Get-Command Register-ScheduledTask -ErrorAction SilentlyContinue) {
+        $action    = New-ScheduledTaskAction -Execute $pyw -Argument "`"$target`"" -WorkingDirectory $App
+        $trigger   = New-ScheduledTaskTrigger -AtLogOn -User $env:USERNAME
+        $set       = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
+        # Interactive: attaches to the logged-in desktop session, same
+        # lifecycle as `systemctl --user`/launchd LaunchAgents on the other
+        # two platforms - required so PLAY's mpv window actually renders
+        # somewhere visible (S4U runs headlessly with no session to render
+        # into, which silently made every mpv window invisible). Trade-off,
+        # same one Linux/macOS already accept: won't start until someone is
+        # logged into the desktop.
+        # RunLevel Limited (standard, non-elevated): nothing here needs admin -
+        # IMAPI2 burning, WMI reads, and binding ports >1024 all work as a normal
+        # user, and elevation is what put "Administrator" on the flashing console
+        # windows this used to spawn.
+        $principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType Interactive -RunLevel Limited
+        Register-ScheduledTask -TaskName "DiscStation" -Action $action -Trigger $trigger -Settings $set -Principal $principal -Force | Out-Null
+        Start-ScheduledTask -TaskName "DiscStation"
+    } else {
+        schtasks /create /tn "DiscStation" /sc onlogon /f /tr "`"$pyw`" `"$target`"" | Out-Null
+        schtasks /run /tn "DiscStation" | Out-Null
+    }
+} catch { Write-Host "Auto-start task not created: $_" }
+
+$ip = (Get-NetIPAddress -AddressFamily IPv4 -ErrorAction SilentlyContinue | Where-Object { $_.IPAddress -notmatch '^127\.|^169\.254\.' } | Select-Object -First 1).IPAddress
+Write-Host ""
+Write-Host "DiscStation installed at $App"
+Write-Host "  Web UI:  http://localhost:8081/   (also http://$ip`:8081 on the LAN)"
+Write-Host "  Run 'discstation' any time to open it. Detection/eject/ISO+data+audio burn use IMAPI2 (no extra tools)."
+try { node (Join-Path $Root "scripts\open.mjs") } catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "description": "DiscStation optical-media appliance host — one cross-OS installer",
   "bin": {
     "discstation-setup": "scripts/setup.mjs",
@@ -21,6 +21,7 @@
     "scripts/",
     "src/*.py",
     "src/static/",
+    "src/win/",
     "arduino/",
     "systemd/",
     "docs/",

package/scripts/setup.mjs

@@ -19,7 +19,7 @@ if (args.includes('-h') || args.includes('--help')) {
 Runs the installer for the current OS:
   linux    install.sh          full: apt deps, venv, systemd --user service, self-signed cert
   darwin   install-macos.sh    full: Homebrew deps, venv, launchd agent, cert (audio-CD burn is best-effort)
-  windows  install-windows.ps1 files + venv only; web/serial control, no burn backend
+  windows  install-windows.ps1 venv + cert + firewall + auto-start task; burn via IMAPI2 (10/11 and 7)
 
 Prereqs: Node 16+, Python 3 (python3 / py on PATH), and either bash (linux/macOS)
 or PowerShell (Windows). Homebrew is auto-installed on macOS if missing; the