From 263b531ee0c1ded9b709da70b98d45ee5271b26f Mon Sep 17 00:00:00 2001
From: "jampick@microsoft.com" <jampick@microsoft.com>
Date: Sun, 5 Apr 2026 08:06:59 -0700
Subject: [PATCH 1/3] feat: unify printing on/off with quiet hours into single
 print mode

Replace separate "PRINTING: ON/OFF" toggle and "Enable quiet hours"
checkbox with a single 3-state print_mode selector: Always On,
Scheduled (quiet hours), or Off. Quiet hours settings are greyed out
when not in Scheduled mode, simplifying the UI.

Includes backward-compatible migration from legacy enabled/quiet_enabled
config fields to the new print_mode field.

Fixes #70

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pi/appliance.py                |  14 +++-
 pi/webapp/server.py            |  25 +++---
 pi/webapp/templates/index.html | 138 +++++++++++++--------------------
 printpulse/pi_launcher.py      |   9 ++-
 tests/test_appliance.py        |  48 +++++++++++-
 tests/test_server.py           |   2 +-
 6 files changed, 134 insertions(+), 102 deletions(-)

diff --git a/pi/appliance.py b/pi/appliance.py
index 8ef2c08..6b3c06b 100644
--- a/pi/appliance.py
+++ b/pi/appliance.py
@@ -27,11 +27,10 @@ def default_config() -> dict:
         "max_prints": 3,
         "theme": "green",
         "printer_device": "/dev/usb/lp0",
-        "quiet_enabled": True,
+        "print_mode": "scheduled",  # "on", "scheduled", or "off"
         "quiet_start": "22:00",
         "quiet_end": "08:00",
         "quiet_wake_mode": "latest",
-        "enabled": True,
         "auth_user": "",
         "auth_hash": "",
         "secret_key": "",
@@ -50,6 +49,17 @@ def load_config() -> dict:
             saved = json.load(f)
         # Merge saved values over defaults so new keys get defaults
         merged = {**defaults, **saved}
+        # Migrate legacy enabled/quiet_enabled to print_mode
+        if "print_mode" not in saved:
+            if not saved.get("enabled", True):
+                merged["print_mode"] = "off"
+            elif saved.get("quiet_enabled", True):
+                merged["print_mode"] = "scheduled"
+            else:
+                merged["print_mode"] = "on"
+        # Clean up legacy keys
+        merged.pop("enabled", None)
+        merged.pop("quiet_enabled", None)
         return merged
     except Exception:
         return defaults
diff --git a/pi/webapp/server.py b/pi/webapp/server.py
index c2b3c5c..891d9a9 100644
--- a/pi/webapp/server.py
+++ b/pi/webapp/server.py
@@ -534,8 +534,11 @@ def validate_save_input(form) -> tuple[dict | None, list[str]]:
         errors.append(f"Invalid theme. Must be one of: {', '.join(sorted(_VALID_THEMES))}.")
         theme = "green"
 
-    # --- Quiet hours ---
-    quiet_enabled = form.get("quiet_enabled") == "1"
+    # --- Print mode (unified on/scheduled/off) ---
+    print_mode = form.get("print_mode", "scheduled")
+    if print_mode not in ("on", "scheduled", "off"):
+        errors.append("Print mode must be 'on', 'scheduled', or 'off'.")
+        print_mode = "scheduled"
 
     quiet_start = form.get("quiet_start", "22:00").strip()
     quiet_end = form.get("quiet_end", "08:00").strip()
@@ -588,7 +591,7 @@ def validate_save_input(form) -> tuple[dict | None, list[str]]:
         "max_prints": max_prints,
         "theme": theme,
         "printer_device": printer_device,
-        "quiet_enabled": quiet_enabled,
+        "print_mode": print_mode,
         "quiet_start": quiet_start,
         "quiet_end": quiet_end,
         "quiet_wake_mode": quiet_wake_mode,
@@ -627,11 +630,11 @@ def _quiet_hours_active() -> dict:
     from datetime import datetime, time as dtime
 
     config = load_config()
-    enabled = config.get("quiet_enabled", False)
+    print_mode = config.get("print_mode", "scheduled")
     start_str = config.get("quiet_start", "22:00")
     end_str = config.get("quiet_end", "08:00")
 
-    if not enabled:
+    if print_mode != "scheduled":
         return {"enabled": False, "active": False, "start": start_str, "end": end_str}
 
     now = datetime.now().time()
@@ -701,7 +704,7 @@ def save():
     config["max_prints"] = validated["max_prints"]
     config["theme"] = validated["theme"]
     config["printer_device"] = validated["printer_device"]
-    config["quiet_enabled"] = validated["quiet_enabled"]
+    config["print_mode"] = validated["print_mode"]
     config["quiet_start"] = validated["quiet_start"]
     config["quiet_end"] = validated["quiet_end"]
     config["quiet_wake_mode"] = validated["quiet_wake_mode"]
@@ -876,22 +879,24 @@ def status_api():
         "printer": _printer_detected(),
         "auto_update": _auto_update_state.copy(),
         "quiet_hours": _quiet_hours_active(),
-        "enabled": cfg.get("enabled", True),
+        "print_mode": cfg.get("print_mode", "scheduled"),
     })
 
 
 @app.route("/toggle_enabled", methods=["POST"])
 @require_auth
 def toggle_enabled():
-    """Toggle the print enabled/disabled state."""
+    """Cycle print mode: on -> scheduled -> off -> on."""
     client_ip = request.remote_addr or "unknown"
     if _check_rate_limit(f"toggle:{client_ip}"):
         abort(429)
 
     config = load_config()
-    config["enabled"] = not config.get("enabled", True)
+    cycle = {"on": "scheduled", "scheduled": "off", "off": "on"}
+    current = config.get("print_mode", "scheduled")
+    config["print_mode"] = cycle.get(current, "on")
     save_config(config)
-    logger.info("Printing %s via toggle button.", "enabled" if config["enabled"] else "disabled")
+    logger.info("Print mode changed to '%s' via toggle.", config["print_mode"])
     return redirect(url_for("index"))
 
 
diff --git a/pi/webapp/templates/index.html b/pi/webapp/templates/index.html
index 0fdeb32..01c9951 100644
--- a/pi/webapp/templates/index.html
+++ b/pi/webapp/templates/index.html
@@ -52,43 +52,6 @@
             font-size: 0.85em;
         }
 
-        .print-toggle {
-            display: flex;
-            justify-content: center;
-            margin-bottom: 20px;
-        }
-
-        .print-toggle button {
-            font-size: 1.2em;
-            padding: 14px 40px;
-            letter-spacing: 2px;
-            font-weight: bold;
-            border-width: 3px;
-            transition: all 0.15s ease;
-        }
-
-        .print-toggle .toggle-on {
-            border-color: #33ff33;
-            color: #33ff33;
-            text-shadow: 0 0 8px #33ff33;
-        }
-        .print-toggle .toggle-on:hover {
-            background: #33ff33;
-            color: #0a0a0a;
-            text-shadow: none;
-        }
-
-        .print-toggle .toggle-off {
-            border-color: #ff3333;
-            color: #ff3333;
-            text-shadow: 0 0 8px #ff3333;
-        }
-        .print-toggle .toggle-off:hover {
-            background: #ff3333;
-            color: #0a0a0a;
-            text-shadow: none;
-        }
-
         .status-bar {
             display: flex;
             justify-content: center;
@@ -247,18 +210,6 @@ <h1 style="white-space:nowrap;">[ PRINTPULSE ]</h1>
     </div>
     <div class="subtitle">Appliance Configuration</div>
 
-    <!-- Print On/Off Toggle -->
-    <div class="print-toggle">
-        <form action="/toggle_enabled" method="post">
-            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-            {% if config.enabled %}
-            <button type="submit" class="toggle-on" id="print-toggle-btn">[ PRINTING: ON ]</button>
-            {% else %}
-            <button type="submit" class="toggle-off" id="print-toggle-btn">[ PRINTING: OFF ]</button>
-            {% endif %}
-        </form>
-    </div>
-
     <!-- Status Bar -->
     <div class="status-bar">
         <div class="status-item">
@@ -273,10 +224,10 @@ <h1 style="white-space:nowrap;">[ PRINTPULSE ]</h1>
                   id="prt-dot"></span>
             <span>Printer: <strong id="prt-text">{% if printer_ok %}connected{% else %}not found{% endif %}</strong></span>
         </div>
-        <div class="status-item" id="quiet-status" style="{% if not quiet_hours.enabled %}display:none;{% endif %}">
-            <span class="dot {% if quiet_hours.active %}dot-yellow{% else %}dot-green{% endif %}"
-                  id="quiet-dot"></span>
-            <span>Quiet: <strong id="quiet-text">{% if quiet_hours.active %}active ({{ quiet_hours.start }}&ndash;{{ quiet_hours.end }}){% else %}off{% endif %}</strong></span>
+        <div class="status-item" id="print-mode-status">
+            <span class="dot {% if config.print_mode == 'off' %}dot-red{% elif config.print_mode == 'scheduled' and quiet_hours.active %}dot-yellow{% else %}dot-green{% endif %}"
+                  id="mode-dot"></span>
+            <span>Print: <strong id="mode-text">{% if config.print_mode == 'off' %}off{% elif config.print_mode == 'on' %}on{% elif quiet_hours.active %}quiet ({{ quiet_hours.start }}&ndash;{{ quiet_hours.end }}){% else %}scheduled{% endif %}</strong></span>
         </div>
     </div>
 
@@ -331,14 +282,19 @@ <h1 style="white-space:nowrap;">[ PRINTPULSE ]</h1>
         </div>
 
         <div class="panel">
-            <div class="panel-title">// QUIET HOURS</div>
-            <div class="checkbox-row">
-                <input type="checkbox" name="quiet_enabled" id="quiet_enabled"
-                       value="1" {% if config.quiet_enabled %}checked{% endif %}
-                       onchange="document.getElementById('quiet-times').style.opacity = this.checked ? '1' : '0.4'">
-                <label for="quiet_enabled">Enable quiet hours</label>
+            <div class="panel-title">// PRINTING</div>
+            <label for="print_mode">Print mode:</label>
+            <select name="print_mode" id="print_mode" onchange="updatePrintMode()">
+                <option value="on" {% if config.print_mode == 'on' %}selected{% endif %}>Always on</option>
+                <option value="scheduled" {% if config.print_mode == 'scheduled' %}selected{% endif %}>Scheduled (quiet hours)</option>
+                <option value="off" {% if config.print_mode == 'off' %}selected{% endif %}>Off</option>
+            </select>
+            <div class="help" id="print-mode-help" style="margin-top:-10px;">
+                {% if config.print_mode == 'on' %}Prints whenever new items arrive.
+                {% elif config.print_mode == 'off' %}Printing is paused. Items are still tracked.
+                {% else %}Prints outside quiet hours. Items during quiet hours are queued.{% endif %}
             </div>
-            <div id="quiet-times" style="opacity: {% if config.quiet_enabled %}1{% else %}0.4{% endif %}">
+            <div id="quiet-times" style="{% if config.print_mode != 'scheduled' %}opacity:0.4; pointer-events:none;{% endif %}">
                 <div class="row">
                     <div>
                         <label for="quiet_start">Start (no printing after):</label>
@@ -423,6 +379,25 @@ <h1 style="white-space:nowrap;">[ PRINTPULSE ]</h1>
 
     <!-- Live status polling -->
     <script>
+        function updatePrintMode() {
+            var mode = document.getElementById('print_mode').value;
+            var qt = document.getElementById('quiet-times');
+            var help = document.getElementById('print-mode-help');
+            if (mode === 'scheduled') {
+                qt.style.opacity = '1';
+                qt.style.pointerEvents = '';
+                help.textContent = 'Prints outside quiet hours. Items during quiet hours are queued.';
+            } else {
+                qt.style.opacity = '0.4';
+                qt.style.pointerEvents = 'none';
+                if (mode === 'on') {
+                    help.textContent = 'Prints whenever new items arrive.';
+                } else {
+                    help.textContent = 'Printing is paused. Items are still tracked.';
+                }
+            }
+        }
+
         function doTestPrint() {
             var btn = document.getElementById('test-print-btn');
             var result = document.getElementById('test-print-result');
@@ -510,31 +485,26 @@ <h1 style="white-space:nowrap;">[ PRINTPULSE ]</h1>
                         }
                     }
 
-                    // Print enabled/disabled toggle
-                    var toggleBtn = document.getElementById('print-toggle-btn');
-                    if (toggleBtn && data.enabled !== undefined) {
-                        if (data.enabled) {
-                            toggleBtn.textContent = '[ PRINTING: ON ]';
-                            toggleBtn.className = 'toggle-on';
+                    // Print mode + quiet hours status
+                    var modeDot = document.getElementById('mode-dot');
+                    var modeText = document.getElementById('mode-text');
+                    if (modeDot && modeText && data.print_mode) {
+                        var pm = data.print_mode;
+                        var qh = data.quiet_hours || {};
+                        if (pm === 'off') {
+                            modeDot.className = 'dot dot-red';
+                            modeText.textContent = 'off';
+                        } else if (pm === 'on') {
+                            modeDot.className = 'dot dot-green';
+                            modeText.textContent = 'on';
                         } else {
-                            toggleBtn.textContent = '[ PRINTING: OFF ]';
-                            toggleBtn.className = 'toggle-off';
-                        }
-                    }
-
-                    // Quiet hours status
-                    if (data.quiet_hours) {
-                        var qh = data.quiet_hours;
-                        var qStatus = document.getElementById('quiet-status');
-                        var qDot = document.getElementById('quiet-dot');
-                        var qText = document.getElementById('quiet-text');
-                        if (qStatus) {
-                            qStatus.style.display = qh.enabled ? '' : 'none';
-                            if (qh.enabled) {
-                                qDot.className = 'dot ' + (qh.active ? 'dot-yellow' : 'dot-green');
-                                qText.textContent = qh.active
-                                    ? 'active (' + qh.start + '\u2013' + qh.end + ')'
-                                    : 'off';
+                            // scheduled
+                            if (qh.active) {
+                                modeDot.className = 'dot dot-yellow';
+                                modeText.textContent = 'quiet (' + qh.start + '\u2013' + qh.end + ')';
+                            } else {
+                                modeDot.className = 'dot dot-green';
+                                modeText.textContent = 'scheduled';
                             }
                         }
                     }
diff --git a/printpulse/pi_launcher.py b/printpulse/pi_launcher.py
index 08a9b39..137a8dc 100644
--- a/printpulse/pi_launcher.py
+++ b/printpulse/pi_launcher.py
@@ -20,8 +20,9 @@ def main():
 
     config = load_config()
 
-    if not config.get("enabled", True):
-        print("PrintPulse appliance is disabled in config. Exiting.")
+    print_mode = config.get("print_mode", "scheduled")
+    if print_mode == "off":
+        print("PrintPulse appliance is disabled (print_mode=off). Exiting.")
         sys.exit(0)
 
     feeds = config.get("feeds", [])
@@ -52,8 +53,8 @@ def main():
     theme = config.get("theme", "green")
     argv.extend(["--theme", theme])
 
-    # Quiet hours
-    if config.get("quiet_enabled", True):
+    # Quiet hours (only in scheduled mode)
+    if print_mode == "scheduled":
         quiet_start = config.get("quiet_start", "22:00")
         quiet_end = config.get("quiet_end", "08:00")
         argv.extend(["--quiet-start", quiet_start, "--quiet-end", quiet_end])
diff --git a/tests/test_appliance.py b/tests/test_appliance.py
index 0b34ac9..bae5915 100644
--- a/tests/test_appliance.py
+++ b/tests/test_appliance.py
@@ -24,7 +24,7 @@ def test_has_required_keys(self):
         assert "max_prints" in cfg
         assert "theme" in cfg
         assert "printer_device" in cfg
-        assert "enabled" in cfg
+        assert "print_mode" in cfg
 
     def test_has_auth_fields(self):
         cfg = default_config()
@@ -43,6 +43,52 @@ def test_default_feed_is_https(self):
         for feed in cfg["feeds"]:
             assert feed.startswith("https://")
 
+    def test_print_mode_default(self):
+        cfg = default_config()
+        assert cfg["print_mode"] == "scheduled"
+
+
+class TestConfigMigration:
+    """Test migration from legacy enabled/quiet_enabled to print_mode."""
+
+    def test_legacy_disabled_migrates_to_off(self, tmp_path, monkeypatch):
+        import json
+        from pi import appliance
+        cfg_path = tmp_path / "config.json"
+        cfg_path.write_text(json.dumps({"enabled": False, "quiet_enabled": True}))
+        monkeypatch.setattr(appliance, "CONFIG_PATH", str(cfg_path))
+        cfg = appliance.load_config()
+        assert cfg["print_mode"] == "off"
+        assert "enabled" not in cfg
+        assert "quiet_enabled" not in cfg
+
+    def test_legacy_enabled_quiet_on_migrates_to_scheduled(self, tmp_path, monkeypatch):
+        import json
+        from pi import appliance
+        cfg_path = tmp_path / "config.json"
+        cfg_path.write_text(json.dumps({"enabled": True, "quiet_enabled": True}))
+        monkeypatch.setattr(appliance, "CONFIG_PATH", str(cfg_path))
+        cfg = appliance.load_config()
+        assert cfg["print_mode"] == "scheduled"
+
+    def test_legacy_enabled_quiet_off_migrates_to_on(self, tmp_path, monkeypatch):
+        import json
+        from pi import appliance
+        cfg_path = tmp_path / "config.json"
+        cfg_path.write_text(json.dumps({"enabled": True, "quiet_enabled": False}))
+        monkeypatch.setattr(appliance, "CONFIG_PATH", str(cfg_path))
+        cfg = appliance.load_config()
+        assert cfg["print_mode"] == "on"
+
+    def test_new_config_no_migration(self, tmp_path, monkeypatch):
+        import json
+        from pi import appliance
+        cfg_path = tmp_path / "config.json"
+        cfg_path.write_text(json.dumps({"print_mode": "off"}))
+        monkeypatch.setattr(appliance, "CONFIG_PATH", str(cfg_path))
+        cfg = appliance.load_config()
+        assert cfg["print_mode"] == "off"
+
 
 class TestPasswordHashing:
     def test_hash_produces_pbkdf2_format(self):
diff --git a/tests/test_server.py b/tests/test_server.py
index 7cd20c7..69eb8db 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -114,7 +114,7 @@ def _base_form(self, **overrides):
             "max_prints": "3",
             "theme": "green",
             "printer_device": "/dev/usb/lp0",
-            "quiet_enabled": "",
+            "print_mode": "scheduled",
             "quiet_start": "22:00",
             "quiet_end": "08:00",
             "auto_update_enabled": "",

From 87874b4f4efe679887e0a8295bf91f131f25d246 Mon Sep 17 00:00:00 2001
From: "jampick@microsoft.com" <jampick@microsoft.com>
Date: Sun, 5 Apr 2026 08:08:14 -0700
Subject: [PATCH 2/3] fix: remove duplicate redirect import in wifi_routes

Fixes pre-existing ruff F811 lint error that was blocking CI.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 pi/webapp/wifi_routes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pi/webapp/wifi_routes.py b/pi/webapp/wifi_routes.py
index c65a675..b6a9bf0 100644
--- a/pi/webapp/wifi_routes.py
+++ b/pi/webapp/wifi_routes.py
@@ -11,7 +11,7 @@
 
 import logging
 
-from flask import Blueprint, render_template, request, redirect, jsonify, abort
+from flask import Blueprint, render_template, request, jsonify, abort
 
 logger = logging.getLogger("printpulse.wifi_routes")
 

From b9c1d129a39a615193689666cf4023b99887a514 Mon Sep 17 00:00:00 2001
From: "jampick@microsoft.com" <jampick@microsoft.com>
Date: Sun, 5 Apr 2026 08:09:30 -0700
Subject: [PATCH 3/3] fix: update test assertions to match template text ("No
 changes")
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pre-existing test failures — template renders "No changes" not "Up to date".

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 tests/test_server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_server.py b/tests/test_server.py
index 69eb8db..95842c6 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -187,7 +187,7 @@ def test_update_log_backward_compat_old_entries(self):
         with patch("pi.webapp.server._load_update_log", return_value=[old_entry]):
             resp = client.get("/update_log")
         assert resp.status_code == 200
-        assert b"Up to date" in resp.data
+        assert b"No changes" in resp.data
 
     def test_update_log_shows_entries(self):
         client = _make_client()
@@ -200,7 +200,7 @@ def test_update_log_shows_entries(self):
         with patch("pi.webapp.server._load_update_log", return_value=fake_log):
             resp = client.get("/update_log")
         assert resp.status_code == 200
-        assert b"Up to date" in resp.data
+        assert b"No changes" in resp.data
         assert b"Updated" in resp.data
         assert b"feat: add new feature" in resp.data