discstation 0.1.37 → 0.1.38

package/arduino/DiscStation/DiscStation.ino

@@ -221,6 +221,8 @@ String discLine = "Disc: none";
 String line1 = "Status: READY";
 String line2 = "";
 String line3 = "";
+bool trayOpen = false;        // host says the tray is open (eject wait / STANDBY:Tray open) - EJECT button then closes it
+bool waitingIsTray = false;   // the WAITING screen is the eject "close tray" wait, not the pre-burn confirm
 String waitingLine1 = "";
 String waitingLine2 = "";
 int progressPercent = -1;
@@ -456,7 +458,7 @@ void drawWaiting() {
   printUpper(waitingLine2);
 
   display.setCursor(2, 49);
-  display.print("SHORT // GO");
+  display.print(waitingIsTray ? "EJECT BTN // CLOSE" : "SHORT // GO");
 
   display.display();
 }
@@ -774,6 +776,7 @@ void parseMessage(String msg) {
   Out.println(msg);
 
   if (msg.startsWith("HOME:")) {
+    trayOpen = false;
     drawHome();
 
   } else if (msg.startsWith("DISC:")) {
@@ -802,6 +805,7 @@ void parseMessage(String msg) {
     if (uiState == UI_HOME) drawHome();
 
   } else if (msg.startsWith("STANDBY:")) {
+    trayOpen = msg.substring(8) == "Tray open";
     drawStandby();
 
   } else if (msg.startsWith("TITLE:")) {
@@ -855,8 +859,13 @@ void parseMessage(String msg) {
   } else if (msg.startsWith("WAITING:")) {
     returnToHomeAt = 0;
     String rest = msg.substring(8);
+    waitingIsTray = rest.indexOf("close tray") >= 0;
+    if (waitingIsTray) trayOpen = true;
     int slash = rest.indexOf('/');
-    if (slash >= 0) {
+    if (waitingIsTray) {
+      waitingLine1 = "TRAY OPEN";
+      waitingLine2 = "";
+    } else if (slash >= 0) {
       waitingLine1 = "Data: " + rest.substring(0, slash);
       waitingLine1.trim();
       waitingLine2 = "Disc: " + rest.substring(slash + 1);
@@ -989,14 +998,6 @@ void handleSelectPress(bool longPress) {
       drawStatus();
     }
 
-  } else if (uiState == UI_STANDBY) {
-    Out.println("EJECT");
-    line1 = "Ejecting...";
-    line2 = "";
-    line3 = "";
-    returnToHomeAt = millis() + 5000;
-    drawStatus();
-
   } else if (uiState == UI_STATUS && line1 == "Ejecting...") {
     // Manual escape if stuck on eject screen with no app response
     drawStandby();
@@ -1011,7 +1012,7 @@ void handleSelectPress(bool longPress) {
     if (longPress) {
       Out.println("CANCEL");
       drawHome();
-    } else {
+    } else if (!waitingIsTray) {   // tray close moved to the EJECT button
       Out.println("CONFIRM");
       line1 = "Confirmed!";
       line2 = "";
@@ -1144,7 +1145,15 @@ void handleEncoderCCW() {
 void handleEjectButton() {
   if (wakeDisplay()) { lastInputTime = millis(); return; }
   lastInputTime = millis();
-  if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_DISCONNECTED || uiState == UI_PLAY) {
+  if (trayOpen && (uiState == UI_STANDBY || uiState == UI_HOME || (uiState == UI_WAITING && waitingIsTray))) {
+    Out.println("CONFIRM");            // host closes the tray
+    trayOpen = false;
+    line1 = "Closing tray...";
+    line2 = "";
+    line3 = "";
+    returnToHomeAt = millis() + 5000;
+    drawStatus();
+  } else if (uiState == UI_HOME || uiState == UI_STANDBY || uiState == UI_DISCONNECTED || uiState == UI_PLAY) {
     Out.println("EJECT");
     line1 = "Ejecting...";
     line2 = "";

package/install.sh

@@ -52,6 +52,10 @@ if [[ ! -f "$CONFIG_DIR/server.crt" || ! -f "$CONFIG_DIR/server.key" ]]; then
 fi
 
 sudo usermod -aG dialout,cdrom "$USER" || true
+# Don't let the kernel re-close an ejected tray whenever some process (a desktop
+# volume monitor, a disc probe) opens the drive.
+echo 'dev.cdrom.autoclose = 0' | sudo tee /etc/sysctl.d/90-discstation.conf >/dev/null \
+  && sudo sysctl -q -w dev.cdrom.autoclose=0 || true
 mkdir -p "$HOME/.config/systemd/user"
 cp "$ROOT_DIR/systemd/discstation.service" "$HOME/.config/systemd/user/discstation.service"
 systemctl --user daemon-reload

package/package.json

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

package/src/discstation.py

@@ -1002,30 +1002,41 @@ def eject_disc(ser, device):
             safe_send(ser, "ERROR:Eject failed")
             safe_send(ser, "STANDBY:Insert disc")
         return ok
-    subprocess.run(["sync"], timeout=5)
+    # The kernel closes the tray again (dev.cdrom.autoclose) when anything opens
+    # the drive while it's out, and every disc probe (blkid/lsdvd/wodim/mediainfo,
+    # driven by the background poll and by the web/phone /disc-info requests)
+    # does exactly that. So: mark the tray open BEFORE the eject command runs (new
+    # probes now bail out) and hold _detect_lock so any probe already in flight
+    # finishes first - otherwise a probe landing inside the few seconds the eject
+    # takes shuts the tray right after it opens.
+    with _detect_lock:
+        _tray_open = True
+        _tray_open_since = time.monotonic()
+        subprocess.run(["sync"], timeout=5)
 
-    subprocess.run(["sg_raw", device, "1e", "00", "00", "00", "00", "00"],
-                   timeout=5, capture_output=True)
+        subprocess.run(["sg_raw", device, "1e", "00", "00", "00", "00", "00"],
+                       timeout=5, capture_output=True)
 
-    ok = False
-    for cmd in (["eject", device], ["sg_raw", device, "1b", "00", "00", "00", "02", "00"]):
-        if ok:
-            break
-        try:
-            r = subprocess.run(cmd, timeout=10, capture_output=True)
-            ok = r.returncode == 0
+        ok = False
+        for cmd in (["eject", device], ["sg_raw", device, "1b", "00", "00", "00", "02", "00"]):
             if ok:
-                print(f"{cmd[0]} eject ok")
-            else:
-                err = (r.stderr or r.stdout or b"failed").decode(errors="ignore").strip()[:40]
-                print(f"{cmd[0]} eject failed: {err}")
-        except Exception as e:
-            print(f"{cmd[0]} eject error: {e}")
+                break
+            try:
+                r = subprocess.run(cmd, timeout=10, capture_output=True)
+                ok = r.returncode == 0
+                if ok:
+                    print(f"{cmd[0]} eject ok")
+                else:
+                    err = (r.stderr or r.stdout or b"failed").decode(errors="ignore").strip()[:40]
+                    print(f"{cmd[0]} eject failed: {err}")
+            except Exception as e:
+                print(f"{cmd[0]} eject error: {e}")
+        if not ok:
+            _tray_open = False
 
     if ok:
-        _tray_open = True
         _tray_open_since = time.monotonic()
-        safe_send(ser, "WAITING:Press SELECT/to close tray")
+        safe_send(ser, "WAITING:Press EJECT/to close tray")
         # WAITING: isn't in _record_web_status()'s prefix whitelist, so the
         # send above never reaches the web page - _tray_open has to be
         # published explicitly here, same as DISC: gets its own dedicated
@@ -1064,7 +1075,7 @@ def eject_disc(ser, device):
                 continue
             if line == "PONG":
                 continue
-            if line == "CONFIRM":
+            if line in ("CONFIRM", "EJECT"):   # EJECT button doubles as close while the tray is out
                 print("Closing tray...")
                 safe_send(ser, "STATUS:Closing tray...")
                 for close_cmd in (
@@ -1265,7 +1276,7 @@ def _refresh_udev(device):
 def udev_cdrom_properties(device, refresh=False):
     if discstation_host.system_name() != "linux":
         return discstation_host.media_properties(device)
-    overlay = _refresh_udev(device) if refresh else {}
+    overlay = _refresh_udev(device) if refresh and not _tray_open else {}
     properties = _udev_props_via_pyudev(device)
     if properties is None:
         # pyudev unavailable — fall back to parsing `udevadm info` output.
@@ -1306,7 +1317,7 @@ def _device_present(device):
 
 
 def is_blank_disc(device):
-    if not device:
+    if not device or _tray_open:   # probing an open tray re-closes it
         return False
     if not _device_present(device):
         return False
@@ -1357,7 +1368,7 @@ def is_blank_disc(device):
 
 
 def is_rewritable_disc(device):
-    if not device:
+    if not device or _tray_open:   # probing an open tray re-closes it
         return False
     """Return whether the inserted medium can be overwritten."""
     if not _device_present(device):
@@ -1714,6 +1725,8 @@ def _maybe_reset_stuck_drive(device, failed_probes):
 
 
 def _detect_disc_locked(device, settle, budget):
+    if _tray_open:   # an eject started while we waited for the lock
+        return _disc_info(False, "none")
     deadline = time.monotonic() + (DISC_DETECT_BUDGET if budget is None else budget)
     props = udev_cdrom_properties(device, refresh=True)
 
@@ -4138,6 +4151,9 @@ def station_loop(ser):
             print(f"Menu: {line.split(':', 1)[1]}")
             continue
 
+        if line == "EJECT" and _tray_open:
+            line = "CONFIRM"   # EJECT is a toggle: with the tray already out, close it
+
         if line == "EJECT":
             try:
                 device = discstation_burn.disc_device()