discstation 0.2.0 → 0.3.1

package/README.md

@@ -71,7 +71,7 @@ remote can talk to the host over Wi-Fi instead of a USB cable.
 |------|-------------|
 | **Burn Video DVD** | YouTube URL or local file → ffmpeg 2-pass → DVD-Video disc |
 | **Burn Data DVD** | Any files/folders → ISO/Joliet data disc (no quality loss) |
-| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) — both the OLED remote and the web/app on-screen remote show a live spectrum visualizer of the actual audio (Linux only for now; see `docs/PLATFORM_SUPPORT.md`); while a track plays the screen keeps the track/volume view (or the visualizer) up — the spinning-disc screensaver only appears on the home/standby screens or after playback has been paused for 15 s |
+| **Play** | Playback via mpv (DVD-Video, Audio CD, VCD, SVCD) — both the OLED remote and the web/app on-screen remote show a live spectrum visualizer of the actual audio (Linux only for now; see `docs/PLATFORM_SUPPORT.md`); while a track plays the screen keeps the track/volume view (or the visualizer) up — the OLED's spinning-disc screensaver appears on its home/standby screens or after playback has been paused for 15 s, while the web/app remote shows the same spinning disc immediately in place of the visualizer any time there's no real audio data to show (paused, or a host platform that can't capture audio at all) |
 | **Rip** | Audio CD → FLAC (MusicBrainz); DVD-Video → VIDEO_TS mirror or HandBrake MKV (TMDb naming) |
 
 ## Project Structure
@@ -175,7 +175,9 @@ self-signed cert. On startup the host prints the LAN URL to open
   — and picking one starts it directly, no separate confirm step. Its
   screen mirrors the physical OLED remote: the disc title/status and offered
   modes at idle, and a glowing peak-hold spectrum visualizer that fills the
-  width of the screen during playback (see Play, above). EJECT/CLOSE toggle,
+  width of the screen during playback (see Play, above) - or a spinning-disc
+  animation in its place whenever there's no real audio data to visualize
+  (paused, or a host platform with no audio capture). EJECT/CLOSE toggle,
   volume, and full playback transport including PREV/NEXT track for audio
   CDs. Greys out and auto-collapses the instant a physical remote is
   detected, so the two never fight for control — including mid-burn/rip/play:
@@ -190,9 +192,13 @@ The `mobile/` Expo app (enter the host's LAN address in its settings screen)
 has the same on-screen remote as the web UI, rendered inline in the main
 screen rather than a popup — same "REMOTE" tag toggle, opens automatically
 with no ESP32 attached, mode buttons filtered to what the disc actually
-supports, and picking one starts it directly. Same auto-collapse behavior
-when a physical ESP32 shows up — mid-operation and without interruption, same
-as the web UI — and the same underlying `/remote/button` protocol.
+supports, and picking one starts it directly. Its screen has the same
+idle title/offered-modes view, live spectrum visualizer (or spinning-disc
+fallback when there's no real audio data to show) and PREV/NEXT track
+controls for audio CDs as the web UI's playback screen - subscribed to the
+same `/events` SSE stream. Same auto-collapse behavior when a physical ESP32
+shows up — mid-operation and without interruption, same as the web UI — and
+the same underlying `/remote/button` protocol.
 
 ## Disc Support
 

package/arduino/firmware/firmware.json

@@ -1 +1 @@
-{"version":"0.2.0","size":1260592,"md5":"94fb8a04146735daa1824da53304702b"}
+{"version":"0.3.1","size":1260592,"md5":"77e56fa726b756dde0f081779164e880"}

package/package.json

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

package/src/discstation.py

@@ -483,6 +483,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
         upload_dir = Path(discstation_burn.WORK) / f"upload_{time.strftime('%Y%m%d_%H%M%S')}"
         upload_dir.mkdir(parents=True, exist_ok=True)
         total = 0
+        upload_order = []  # relative paths, in the order the client sent them
         for i, (filename, data) in enumerate(files):
             rel = filename
             if i < len(paths_list) and paths_list[i].get('p'):
@@ -495,7 +496,14 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
                 continue
             dest.parent.mkdir(parents=True, exist_ok=True)
             dest.write_bytes(data)
+            upload_order.append(rel.lstrip('/'))
             total += len(data)
+        # burn_audio_flow() prefers this order over its alphabetical fallback,
+        # so an audio burn tracks the order files were actually selected/
+        # arranged on the web page or app, not whatever order their filenames
+        # happen to sort in (the bug: picking "03 intro, 01 verse, 02 chorus"
+        # used to always burn 01/02/03 regardless of pick order).
+        (upload_dir / ".upload_order.json").write_text(json.dumps(upload_order))
         # wait_for_web_url() (already running on the OLED side once a burn
         # mode is selected first - the normal flow: scan the QR code, then
         # upload) only ever reads from _burn_url_queue, same as a pasted
@@ -600,10 +608,35 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
             # the one already running (CANCEL/EJECT stay available regardless).
             self._respond(200, json.dumps({**_last_disc_info, "busy": True, "menu_items": [], "appliance": _appliance_mode}), "application/json")
             return
+        device = discstation_burn.disc_device()
+        if not _detect_lock.acquire(timeout=1.5):
+            # Something else (almost always the background poller) is already
+            # deep into a classify for this disc - waiting on detect_disc()'s
+            # own (unbounded, blocking) internal acquire would just queue
+            # behind it for however long that takes (seen ~90s on a disc whose
+            # blkid/wodim-toc probes both time out) - an earlier version of
+            # this fix acquired-then-released this same lock before calling
+            # detect_disc() as a "quick test," which didn't actually help: by
+            # the time detect_disc() re-acquired the lock for real, another
+            # thread could (and, live-tested, did) grab it first and leave
+            # this request blocked on that *second*, timeout-less acquire
+            # anyway. Holding the lock we already have for the whole classify
+            # - calling _detect_disc_locked() directly instead of going back
+            # through detect_disc() - is what actually bounds the wait.
+            stale = {**_last_disc_info}
+            stale.setdefault("type", "reading")
+            self._respond(200, json.dumps({**stale, "appliance": _appliance_mode}), "application/json")
+            return
         info = {"disc_present": False, "capacity_bytes": 0, "capacity_gb": 0, "type": "none"}
         try:
-            device = discstation_burn.disc_device()
-            di = detect_disc(device, settle=False, budget=15)
+            try:
+                cached = _detect_cache.get(device)
+                if cached and time.monotonic() - cached[0] < DISC_DETECT_CACHE_TTL:
+                    di = cached[1]
+                else:
+                    di = _detect_disc_locked(device, settle=False, budget=15)
+            finally:
+                _detect_lock.release()
             info["disc_present"] = di.present
             info["capacity_bytes"] = di.capacity_bytes
             info["capacity_gb"] = round(di.capacity_bytes / 1e9, 2)
@@ -673,7 +706,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
     def _serve_sw(self):
         sw = '''self.addEventListener('install', e => {
   self.skipWaiting();
-  caches.open('discstation-v46').then(c => c.addAll(['/','/static/style.css?v=46','/static/app.js?v=46']));
+  caches.open('discstation-v48').then(c => c.addAll(['/','/static/style.css?v=48','/static/app.js?v=48']));
 });
 self.addEventListener('activate', e => e.waitUntil(clients.claim()));
 self.addEventListener('fetch', e => {
@@ -682,7 +715,7 @@ self.addEventListener('fetch', e => {
   if (path === '/' || path.startsWith('/static/')) {
     e.respondWith(fetch(e.request).then(r => {
       const copy = r.clone();
-      caches.open('discstation-v46').then(c => c.put(e.request, copy));
+      caches.open('discstation-v48').then(c => c.put(e.request, copy));
       return r;
     }).catch(() => caches.match(e.request)));
   } else {
@@ -1808,8 +1841,15 @@ def drive_status(device):
     except OSError:
         return "unknown"
     try:
-        st = fcntl.ioctl(fd, _CDROM_DRIVE_STATUS, 0)
-    except OSError:
+        # Hard-timeout, not just the OSError below: on a wedged/dying drive this
+        # ioctl can block in uninterruptible D-state (blk_execute_rq) forever -
+        # O_NONBLOCK on the fd doesn't bound a block-layer command wait. Without
+        # this, a stuck call here holds _detect_lock forever and wedges the
+        # whole service (every other thread needing disc state queues up behind
+        # it) - see _run_hard_timeout's own docstring for why this is the only
+        # way to get control back.
+        st = _run_hard_timeout(lambda: fcntl.ioctl(fd, _CDROM_DRIVE_STATUS, 0), timeout=3)
+    except Exception:
         return "unknown"
     finally:
         try:
@@ -3182,13 +3222,30 @@ def burn_audio_flow(ser):
     audio_files = []
     audio_exts = {".wav", ".flac", ".mp3", ".aac", ".ogg", ".wma", ".m4a", ".opus"}
     if src_path.is_dir():
-        # rglob, not iterdir: a browser folder upload preserves the
-        # original relative paths (e.g. "Album Name/track.flac"), so the
-        # audio files usually sit one level below src_path, not at its
-        # top - a plain iterdir() only ever saw the subfolder itself.
-        for f in sorted(src_path.rglob("*")):
-            if f.is_file() and f.suffix.lower() in audio_exts:
-                audio_files.append(f)
+        # Prefer the order the web/app upload actually sent (.upload_order.json,
+        # written by _handle_upload) over re-deriving one from the filesystem -
+        # burning in alphabetical-by-filename order regardless of how the user
+        # arranged/picked the files was the whole bug this guards against.
+        order_file = src_path / ".upload_order.json"
+        if order_file.is_file():
+            try:
+                for rel in json.loads(order_file.read_text()):
+                    f = src_path / rel
+                    if f.is_file() and f.suffix.lower() in audio_exts:
+                        audio_files.append(f)
+            except Exception as e:
+                print(f"Upload order manifest unreadable, falling back to alphabetical: {e}")
+                audio_files = []
+        if not audio_files:
+            # rglob, not iterdir: a browser folder upload preserves the
+            # original relative paths (e.g. "Album Name/track.flac"), so the
+            # audio files usually sit one level below src_path, not at its
+            # top - a plain iterdir() only ever saw the subfolder itself.
+            # Also the fallback for a typed/pasted directory path (no upload,
+            # so no order manifest) - alphabetical is the best guess there.
+            for f in sorted(src_path.rglob("*")):
+                if f.is_file() and f.suffix.lower() in audio_exts:
+                    audio_files.append(f)
     elif src_path.is_file():
         audio_files = [src_path]
 

package/src/static/app.js

@@ -212,6 +212,33 @@
     rpBarFillEls.forEach((fill) => { fill.style.height = "0%"; });
     rpBarPeakEls.forEach((peak) => { peak.style.bottom = "0%"; peak.style.opacity = "0"; });
     if (rpBarRafId !== null) { cancelAnimationFrame(rpBarRafId); rpBarRafId = null; }
+    lastVuFrameAt = 0;
+  }
+
+  // Real VU data only ever flows on Linux (PulseAudio capture - see
+  // docs/PLATFORM_SUPPORT.md for why macOS/Windows can't) and stops the moment
+  // playback is paused even there, but `progress.playing` stays true throughout
+  // a pause - so "is a real frame actually arriving right now" has to be tracked
+  // separately, mirroring the firmware's own lastVuAt/VU_TIMEOUT_MS fallback
+  // (arduino/DiscStation/DiscStation.ino). Whenever it isn't, show a spinning
+  // disc in the same slot instead of empty/frozen bars.
+  let lastVuFrameAt = 0;
+  let rpLastIdleWithDisc = false;
+  const VU_TIMEOUT_MS = 1200;
+  function updateVuSlot() {
+    // idleWithDisc owns the slot instead (the title+modes menu) - otherwise
+    // this slot is always showing *something*: real bars while they're
+    // actually flowing, the spinning disc otherwise - covering paused,
+    // platforms with no VU capture, and plain idle-with-no-disc alike (that
+    // last one used to just sit blank).
+    if (rpLastIdleWithDisc) {
+      $("rp-bars").hidden = true;
+      $("rp-discsaver").hidden = true;
+      return;
+    }
+    const vuFlowing = rpLastPlaying && Date.now() - lastVuFrameAt < VU_TIMEOUT_MS;
+    $("rp-bars").hidden = !vuFlowing;
+    $("rp-discsaver").hidden = vuFlowing;
   }
 
   let rpLastPlaying = false;
@@ -232,10 +259,12 @@
       // never chops a word off abruptly mid-string.
       $("rp-status").textContent = (progress.status || "READY").toUpperCase();
     }
-    // Bars belong on screen only while something is actually playing - not just
-    // "not idle-with-a-disc" (that left them visibly stuck at their last frame
-    // once playback stopped with no disc left to show a menu for instead).
-    $("rp-bars").hidden = !progress.playing;
+    // Bars (or, lacking real VU data, the spinning-disc fallback) belong on
+    // screen only while something is actually playing - not just "not
+    // idle-with-a-disc" (that left them visibly stuck at their last frame once
+    // playback stopped with no disc left to show a menu for instead).
+    rpLastIdleWithDisc = idleWithDisc;
+    updateVuSlot();
     if (wasPlaying && !progress.playing) resetVuBars(); // clear the last frame, don't leave it stuck
     $("rp-menu").hidden = !idleWithDisc;
     if (idleWithDisc) {
@@ -298,6 +327,29 @@
   });
   initRpBars();
 
+  // Fullscreen toggle for the OLED-mirror screen (e.g. blown up on a
+  // monitor/TV while music plays). iOS Safari has no element-level
+  // Fullscreen API - feature-detect and hide the button there instead of
+  // leaving a control that does nothing.
+  {
+    const rpScreen = $("rp-screen");
+    const fsBtn = $("rp-fullscreen-btn");
+    const requestFs = rpScreen.requestFullscreen || rpScreen.webkitRequestFullscreen;
+    const exitFs = document.exitFullscreen || document.webkitExitFullscreen;
+    if (!requestFs || !exitFs) {
+      fsBtn.hidden = true;
+    } else {
+      const isFs = () => (document.fullscreenElement || document.webkitFullscreenElement) === rpScreen;
+      const syncLabel = () => fsBtn.setAttribute("aria-label", isFs() ? "Exit fullscreen" : "Fullscreen");
+      fsBtn.addEventListener("click", () => {
+        if (isFs()) exitFs.call(document);
+        else requestFs.call(rpScreen);
+      });
+      document.addEventListener("fullscreenchange", syncLabel);
+      document.addEventListener("webkitfullscreenchange", syncLabel);
+    }
+  }
+
   // Firmware row: outside the remote panel on purpose - a hardware remote hides
   // that panel, and hardware is exactly when there is a remote to update.
   function applyFirmwareState(progress) {
@@ -588,7 +640,7 @@
       let d;
       try { d = JSON.parse(ev.data); } catch (_) { return; }
       if (d.type === "disc-changed") { loadDiscInfo(); return; }
-      if (d.type === "vu") { renderVuBars(d.levels); return; }
+      if (d.type === "vu") { lastVuFrameAt = Date.now(); renderVuBars(d.levels); updateVuSlot(); return; }
       setConnection(true);
       setLiveStatus(d.status);
       setProgress(d.status, Number(d.progress), d.active);
@@ -604,6 +656,10 @@
     // Backstops: catch a zombie SSE connection, and refresh disc state slowly.
     setInterval(() => { if (!es || es.readyState !== 1) pollStatus(); }, 8000);
     setInterval(loadDiscInfo, 15000);
+    // Nothing else re-checks the clock once VU frames stop arriving (pause, a
+    // host platform with no capture, a dropped connection) - this is what
+    // actually notices and flips to the spinning-disc fallback promptly.
+    setInterval(updateVuSlot, 300);
   }
 
   if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=8").catch(() => {});

package/src/static/index.html

@@ -63,9 +63,11 @@
                 <button class="rp-btn rp-trackbtn" type="button" data-role="prev" data-cmd="REW:BIG" aria-label="Previous track"><span class="rp-glyph">&#x23EE;</span></button>
                 <button class="rp-btn rp-trackbtn" type="button" data-role="next" data-cmd="FF:BIG" aria-label="Next track"><span class="rp-glyph">&#x23ED;</span></button>
               </div>
-              <div class="rp-screen">
+              <div id="rp-screen" class="rp-screen">
+                <button id="rp-fullscreen-btn" class="rp-fullscreen-btn" type="button" aria-label="Fullscreen">&#x26F6;</button>
                 <div id="rp-status" class="rp-status">READY</div>
                 <div id="rp-bars" class="rp-bars"></div>
+                <div id="rp-discsaver" class="rp-discsaver" hidden></div>
                 <div id="rp-menu" class="rp-menu" hidden></div>
               </div>
               <input id="rp-volume" type="range" min="0" max="100" value="70" aria-label="Volume">
@@ -150,7 +152,7 @@
     </footer>
   </div>
   <div id="install-slot"></div>
-  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=46").catch(() => {});</script>
-  <script src="/static/app.js?v=46" defer></script>
+  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=48").catch(() => {});</script>
+  <script src="/static/app.js?v=48" defer></script>
 </body>
 </html>

package/src/static/style.css

@@ -317,6 +317,7 @@ h2 { margin-top: 8px; font-family: var(--display); font-size: clamp(30px, 7vw, 6
 }
 .rp-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 10px; }
 .rp-screen {
+  position: relative;
   background: #0a0a0a;
   border: 1px solid var(--ink);
   border-radius: 3px;
@@ -328,6 +329,38 @@ h2 { margin-top: 8px; font-family: var(--display); font-size: clamp(30px, 7vw, 6
   flex-direction: column;
   gap: 8px;
 }
+/* Corner overlay, not a layout element - doesn't push the status/bars around. */
+.rp-fullscreen-btn {
+  position: absolute;
+  top: 4px;
+  right: 6px;
+  z-index: 1;
+  border: 0;
+  background: none;
+  color: #8a8a8a;
+  font-size: 13px;
+  line-height: 1;
+  padding: 2px;
+  cursor: pointer;
+  opacity: 0.5;
+  transition: opacity 0.15s linear;
+}
+.rp-fullscreen-btn:hover, .rp-fullscreen-btn:focus-visible { opacity: 1; }
+.rp-fullscreen-btn[hidden] { display: none; }
+/* Blown up to fill the display (e.g. a monitor/TV while music plays) - same
+   OLED look, just bigger. .rp-bars/.rp-bar-col need no changes: they already
+   fill available space, and buildRpBars' ResizeObserver (app.js) recomputes
+   bar count from the now much wider #rp-bars on its own. */
+.rp-screen:fullscreen, .rp-screen:-webkit-full-screen {
+  padding: 28px 32px 24px;
+  justify-content: center;
+}
+.rp-screen:fullscreen .rp-status, .rp-screen:-webkit-full-screen .rp-status {
+  font-size: 22px;
+}
+.rp-screen:fullscreen .rp-fullscreen-btn, .rp-screen:-webkit-full-screen .rp-fullscreen-btn {
+  font-size: 20px;
+}
 .rp-status {
   color: #f2f2f2;
   font-family: var(--mono);
@@ -386,7 +419,33 @@ h2 { margin-top: 8px; font-family: var(--display); font-size: clamp(30px, 7vw, 6
    default [hidden] { display: none } (author styles always win over the UA
    stylesheet) - the `hidden` attribute was being set correctly in JS but doing
    nothing visually without this. */
-.rp-bars[hidden], .rp-menu[hidden] { display: none; }
+.rp-bars[hidden], .rp-menu[hidden], .rp-discsaver[hidden] { display: none; }
+
+/* Fallback for whenever real VU data isn't actually flowing (paused, a host
+   platform with no audio-capture support, or just-started-playing before the
+   first frame arrives) - see updateVuSlot() in app.js. A CSS-only spinning
+   vinyl-record glyph, matching this page's existing all-CSS/Unicode-glyph
+   iconography (no SVG/bitmap assets anywhere else in this file). */
+.rp-discsaver {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-top: 1px solid #262626;
+  padding-top: 4px;
+}
+.rp-discsaver::before {
+  content: "";
+  width: 34px;
+  height: 34px;
+  border-radius: 50%;
+  border: 2px solid var(--accent);
+  background: radial-gradient(circle, #0a0a0a 0 22%, transparent 23%),
+              repeating-radial-gradient(var(--ink) 0 1px, transparent 1px 4px);
+  box-shadow: 0 0 6px var(--accent);
+  animation: rp-disc-spin 2.4s linear infinite;
+}
+@keyframes rp-disc-spin { to { transform: rotate(360deg); } }
 .rp-main input[type="range"] { width: 100%; accent-color: var(--accent); }
 .rp-buttons { display: flex; flex-direction: column; gap: 8px; }
 .rp-btn {