discstation 0.3.0 → 0.3.1

package/arduino/firmware/firmware.json

@@ -1 +1 @@
-{"version":"0.3.0","size":1260592,"md5":"e0959615d438880783baf38f8943ae3f"}
+{"version":"0.3.1","size":1260592,"md5":"77e56fa726b756dde0f081779164e880"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discstation",
-  "version": "0.3.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
@@ -698,7 +706,7 @@ class _WebHandler(http.server.BaseHTTPRequestHandler):
     def _serve_sw(self):
         sw = '''self.addEventListener('install', e => {
   self.skipWaiting();
-  caches.open('discstation-v47').then(c => c.addAll(['/','/static/style.css?v=47','/static/app.js?v=47']));
+  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 => {
@@ -707,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-v47').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 {
@@ -1833,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:
@@ -3207,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

@@ -327,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) {

package/src/static/index.html

@@ -63,7 +63,8 @@
                 <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>
@@ -151,7 +152,7 @@
     </footer>
   </div>
   <div id="install-slot"></div>
-  <script>if ("serviceWorker" in navigator) navigator.serviceWorker.register("/sw.js?v=47").catch(() => {});</script>
-  <script src="/static/app.js?v=47" 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);