kryten-webqueue 0.17.0__tar.gz → 0.19.0__tar.gz

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/CHANGELOG.md

@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
+## [0.19.0] — 2026-06-17
+
+### Changed
+
+- **Z-Coin dashboard reorganized into tabs.** The account page was overcrowded with three side-by-side columns. It's now a widened account card (balance, rank, progress, perks) beside a tabbed container with **Queue History**, **Recent Transactions**, and a new **Vanity Items** tab. Each tab lazy-loads its data on first view; the vanity greeting/color editors moved out of the cramped left column into their own roomier tab. Collapses to a single column on narrow screens.
+
+[0.19.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.19.0
+
+## [0.18.0] — 2026-06-17
+
+### Fixed
+
+- **Active scheduled event lingered on the admin page after it ended.** The `active_schedule` row was only removed by the manual "Clear Active Schedule" button — the lock auto-lifted but the row (and its banner) stayed. The queue shadow now clears it automatically on the next poll once the event is genuinely over, via two signals: the last scheduled item has left the queue (event temp items auto-remove after playing), or the estimated end is more than 5 minutes in the past (safety net for a missed boundary or a restart mid-event). The schedules page also hides a well-past banner immediately and re-checks every 15s.
+
+### Added
+
+- **Live admin dashboard.** The admin page now subscribes to the same `/ws` feed as the public queue, so the queue item count and now-playing update without a reload. Job status refreshes every 5s while the tab is visible (jobs are DB-polled, not broadcast), and a fired schedule triggers an immediate jobs refresh.
+
+[0.18.0]: https://github.com/grobertson/kryten-webqueue/releases/tag/v0.18.0
+
 ## [0.17.0] — 2026-06-17
 
 ### Added

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.17.0
+Version: 0.19.0
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/kryten_webqueue/queue/shadow.py

@@ -23,6 +23,19 @@ def _to_seconds(value) -> float:
         return 0.0
 
 
+def _parse_iso(value) -> datetime | None:
+    """Parse an ISO-8601 timestamp to an aware UTC datetime, or None."""
+    if not value:
+        return None
+    try:
+        dt = datetime.fromisoformat(str(value))
+    except (ValueError, TypeError):
+        return None
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=UTC)
+    return dt
+
+
 class QueueShadow:
     """Local mirror of the CyTube playlist state."""
 
@@ -116,6 +129,7 @@ class QueueShadow:
             self._items = new_items
             await self._recalculate_estimated_starts()
             await self._maybe_lift_event_lock()
+            await self._maybe_expire_active_schedule()
 
     async def _maybe_lift_event_lock(self):
         """Auto-lift a scheduled-event lock once its last item begins playing.
@@ -142,6 +156,52 @@ class QueueShadow:
         except (TypeError, ValueError):
             return
 
+    async def _maybe_expire_active_schedule(self):
+        """Clear the active-schedule row once the event is genuinely over.
+
+        The lock auto-lifts when the last scheduled item *starts* (see
+        :meth:`_maybe_lift_event_lock`), but the row itself used to linger so the
+        admin banner kept showing a finished event. This clears it via two
+        signals:
+
+        * **Event-driven (primary):** the last scheduled item has left the queue
+          (event items are temp and auto-remove after playing), and something is
+          still playing — so the event has played out.
+        * **Time safety net:** the estimated end is well in the past (covers a
+          missed boundary, a restart mid-event, or ``last_item_uid`` never being
+          captured).
+        """
+        active = await self._db.get_active_schedule()
+        if not active:
+            return
+
+        # Event-driven: last scheduled item is gone from the queue.
+        last_uid = active.get("last_item_uid")
+        if last_uid is not None and self._now_playing is not None:
+            try:
+                last_uid_int = int(last_uid)
+            except (TypeError, ValueError):
+                last_uid_int = None
+            if last_uid_int is not None:
+                present = False
+                for it in self._items:
+                    try:
+                        if int(it.get("uid")) == last_uid_int:
+                            present = True
+                            break
+                    except (TypeError, ValueError):
+                        continue
+                if not present:
+                    await self._db.clear_active_schedule()
+                    logger.info("Active schedule cleared: last scheduled item has played out")
+                    return
+
+        # Time safety net: estimated end well in the past.
+        end_dt = _parse_iso(active.get("estimated_end_at"))
+        if end_dt is not None and datetime.now(UTC) > end_dt + timedelta(minutes=5):
+            await self._db.clear_active_schedule()
+            logger.info("Active schedule cleared: estimated end passed (stale row)")
+
     def _now_playing_index(self) -> int | None:
         """Index of the currently-playing item within ``self._items``.
 

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/kryten_webqueue/static/css/main.css

@@ -797,20 +797,50 @@ a.np-chip {
 }
 .dashboard-grid {
     display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-columns: minmax(280px, 360px) 1fr;
     gap: 1.5rem;
     margin-top: 1.5rem;
+    align-items: start;
 }
 @media (max-width: 900px) {
     .dashboard-grid {
         grid-template-columns: 1fr;
     }
 }
-.balance-card, .history-card, .transactions-card {
+.balance-card, .history-card, .transactions-card, .dashboard-tabs-card {
     background: var(--bg-card);
     border-radius: var(--radius);
     padding: 1.5rem;
 }
+
+/* Dashboard tabbed container */
+.tabs {
+    display: flex;
+    gap: 0.25rem;
+    border-bottom: 1px solid var(--border);
+    margin-bottom: 1rem;
+}
+.tab-btn {
+    background: transparent;
+    border: none;
+    border-bottom: 2px solid transparent;
+    color: var(--text-secondary);
+    cursor: pointer;
+    font-size: 0.95rem;
+    font-weight: 600;
+    padding: 0.6rem 0.9rem;
+    margin-bottom: -1px;
+}
+.tab-btn:hover {
+    color: var(--text-primary);
+}
+.tab-btn.active {
+    color: var(--accent);
+    border-bottom-color: var(--accent);
+}
+.tab-panel[hidden] {
+    display: none;
+}
 .balance-amount {
     font-size: 2rem;
     font-weight: 700;
@@ -911,17 +941,7 @@ a.np-chip {
     color: var(--success);
 }
 
-/* Vanity items (dashboard left column) */
-.vanity-section {
-    margin-top: 1.25rem;
-    padding-top: 1.25rem;
-    border-top: 1px solid var(--border);
-}
-.vanity-section h3 {
-    font-size: 0.85rem;
-    color: var(--text-secondary);
-    margin-bottom: 0.6rem;
-}
+/* Vanity items (dashboard "Vanity Items" tab) */
 .vanity-item {
     margin-bottom: 0.85rem;
 }

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/kryten_webqueue/templates/admin/index.html

@@ -234,11 +234,7 @@ async function loadAdminData() {
     // Queue status
     const qResp = await fetch('/queue/state');
     if (qResp.ok) {
-        const state = await qResp.json();
-        document.getElementById('queue-status').innerHTML = `
-            <p>Items in queue: ${(state.items || []).length}</p>
-            <p>Now playing: ${state.now_playing ? escapeHtml(state.now_playing.title || 'Unknown') : 'Nothing'}</p>
-        `;
+        renderQueueStatus(await qResp.json());
     }
 
     // Sync logs
@@ -265,6 +261,46 @@ async function loadAdminData() {
     }
 }
 
+// Render the live queue-status block. Shared by the initial load and the
+// WebSocket so the count + now-playing stay current without a reload.
+function renderQueueStatus(state) {
+    const el = document.getElementById('queue-status');
+    if (!el) return;
+    const np = state && state.now_playing;
+    el.innerHTML = `
+        <p>Items in queue: ${((state && state.items) || []).length}</p>
+        <p>Now playing: ${np ? escapeHtml(np.title || 'Unknown') : 'Nothing'}</p>
+    `;
+}
+
+// Subscribe to the same /ws feed the public queue page uses, so queue size and
+// now-playing update live. Jobs are DB-polled (below) since they aren't
+// broadcast.
+let adminWs = null;
+let adminWsReconnect = null;
+function connectAdminWebSocket() {
+    const proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
+    adminWs = new WebSocket(`${proto}//${location.host}/ws`);
+    adminWs.onmessage = (event) => {
+        let msg;
+        try { msg = JSON.parse(event.data); } catch (e) { return; }
+        if (msg.type === 'queue_state' || msg.type === 'queue_update') {
+            renderQueueStatus(msg.data);
+        } else if (msg.type === 'schedule_fired') {
+            showToast(`Scheduled playlist loaded: ${msg.data.playlist_name}`);
+            loadJobs();
+        }
+    };
+    adminWs.onclose = () => {
+        adminWsReconnect = setTimeout(connectAdminWebSocket, 3000);
+    };
+    setInterval(() => {
+        if (adminWs && adminWs.readyState === WebSocket.OPEN) {
+            adminWs.send(JSON.stringify({type: 'ping'}));
+        }
+    }, 30000);
+}
+
 function escapeHtml(str) {
     const div = document.createElement('div');
     div.textContent = str;
@@ -294,5 +330,12 @@ function summarizeRunDetail(detail) {
 
 loadAdminData();
 loadJobs();
+connectAdminWebSocket();
+
+// Jobs are DB-polled (not broadcast), so refresh them periodically while the
+// tab is visible to reflect running/finished status without a reload.
+setInterval(() => {
+    if (document.visibilityState === 'visible') loadJobs();
+}, 5000);
 </script>
 {% endblock %}

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/kryten_webqueue/templates/admin/schedules.html

@@ -42,6 +42,15 @@ async function loadActive() {
     if (!resp.ok) { banner.classList.add('hidden'); return; }
     const a = await resp.json();
     if (!a || !a.schedule_id) { banner.classList.add('hidden'); return; }
+    // Treat a well-past estimated end as ended even before the backend clears
+    // the row on its next poll, so the banner never lingers.
+    if (a.estimated_end_at) {
+        const end = new Date(a.estimated_end_at);
+        if (!isNaN(end) && (Date.now() - end.getTime()) > 5 * 60 * 1000) {
+            banner.classList.add('hidden');
+            return;
+        }
+    }
     const name = playlistMap[a.playlist_id] || `Playlist #${a.playlist_id}`;
     banner.classList.remove('hidden');
     const locked = a.is_immutable && !a.lock_disabled;
@@ -203,5 +212,11 @@ function showModal(html) {
 function closeModal() { const m = document.getElementById('admin-modal'); if (m) m.remove(); }
 
 loadSchedules();
+
+// Keep the active-event banner fresh without a reload: re-check every 15s while
+// the tab is visible (the backend clears the row once the event plays out).
+setInterval(() => {
+    if (document.visibilityState === 'visible') loadActive();
+}, 15000);
 </script>
 {% endblock %}

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/kryten_webqueue/templates/user/dashboard.html

@@ -10,7 +10,7 @@
     </div>
 
     <div class="dashboard-grid">
-        <!-- LEFT: Account -->
+        <!-- LEFT: Account (widened) -->
         <div class="balance-card">
             <h2>Z Coin Balance</h2>
             <p class="balance-amount" id="balance-amount">Loading…</p>
@@ -18,9 +18,37 @@
 
             <div class="account-rank" id="account-rank"></div>
             <div class="account-perks" id="account-perks"></div>
+        </div>
+
+        <!-- RIGHT: Tabbed container -->
+        <div class="dashboard-tabs-card">
+            <div class="tabs" role="tablist">
+                <button class="tab-btn active" data-tab="queue" role="tab" aria-selected="true">Queue History</button>
+                <button class="tab-btn" data-tab="transactions" role="tab" aria-selected="false">Recent Transactions</button>
+                <button class="tab-btn" data-tab="vanity" role="tab" aria-selected="false">Vanity Items</button>
+            </div>
+
+            <div class="tab-panel" id="tab-queue" role="tabpanel">
+                <div id="queue-history">
+                    <p class="empty-state">Loading…</p>
+                </div>
+                <div class="history-pager" id="queue-pager"></div>
+            </div>
 
-            <div class="vanity-section" id="vanity-section">
-                <h3>Vanity</h3>
+            <div class="tab-panel" id="tab-transactions" role="tabpanel" hidden>
+                <div class="tx-toggle" id="tx-toggle">
+                    <button class="tx-toggle-btn active" data-filter="all">All</button>
+                    <button class="tx-toggle-btn" data-filter="credit">Credits</button>
+                    <button class="tx-toggle-btn" data-filter="debit">Debits</button>
+                </div>
+                <div id="transactions">
+                    <p class="empty-state">Loading…</p>
+                </div>
+                <div class="tx-pager" id="tx-pager"></div>
+            </div>
+
+            <div class="tab-panel" id="tab-vanity" role="tabpanel" hidden>
+                <p class="muted">Personalize how the bot greets you and your chat color. Each update is a one-time purchase.</p>
                 <div class="vanity-item">
                     <div class="vanity-row">
                         <span class="vanity-label">Greeting</span>
@@ -37,29 +65,6 @@
                 </div>
             </div>
         </div>
-
-        <!-- MIDDLE: Queue history -->
-        <div class="history-card">
-            <h2>Queue History</h2>
-            <div id="queue-history">
-                <p class="empty-state">Loading…</p>
-            </div>
-            <div class="history-pager" id="queue-pager"></div>
-        </div>
-
-        <!-- RIGHT: Transactions -->
-        <div class="transactions-card">
-            <h2>Recent Transactions</h2>
-            <div class="tx-toggle" id="tx-toggle">
-                <button class="tx-toggle-btn active" data-filter="all">All</button>
-                <button class="tx-toggle-btn" data-filter="credit">Credits</button>
-                <button class="tx-toggle-btn" data-filter="debit">Debits</button>
-            </div>
-            <div id="transactions">
-                <p class="empty-state">Loading…</p>
-            </div>
-            <div class="tx-pager" id="tx-pager"></div>
-        </div>
     </div>
 </div>
 {% endblock %}
@@ -442,8 +447,31 @@ document.querySelectorAll('.tx-toggle-btn').forEach(b => b.addEventListener('cli
     renderTransactions();
 }));
 
+// Tabs: show one panel at a time; lazy-load each panel's data on first view.
+const tabLoaded = { queue: false, transactions: false, vanity: false };
+function loadTabOnce(tab) {
+    if (tabLoaded[tab]) return;
+    tabLoaded[tab] = true;
+    if (tab === 'queue') loadQueue(0);
+    else if (tab === 'transactions') loadTransactions(true);
+    // 'vanity' needs no fetch — populated by loadAccount().
+}
+function showTab(tab) {
+    document.querySelectorAll('.tab-btn').forEach(b => {
+        const on = b.dataset.tab === tab;
+        b.classList.toggle('active', on);
+        b.setAttribute('aria-selected', on ? 'true' : 'false');
+    });
+    document.querySelectorAll('.tab-panel').forEach(p => {
+        p.hidden = p.id !== `tab-${tab}`;
+    });
+    loadTabOnce(tab);
+}
+document.querySelectorAll('.tab-btn').forEach(b => {
+    b.addEventListener('click', () => showTab(b.dataset.tab));
+});
+
 loadAccount();
-loadQueue(0);
-loadTransactions(true);
+showTab('queue');  // default tab; lazy-loads queue history
 </script>
 {% endblock %}

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.17.0"
+version = "0.19.0"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"

{kryten_webqueue-0.17.0 → kryten_webqueue-0.19.0}/tests/test_phase4_live_fixes.py

@@ -152,6 +152,52 @@ async def test_event_lock_stays_until_last_item(db):
     assert await db.is_event_lock_active() is True
 
 
+# --- active-schedule auto-expiry (v0.18.0) ---
+
+async def test_active_schedule_cleared_when_last_item_plays_out(db):
+    await _make_event(db, last_item_uid=3)
+    shadow = QueueShadow(db)
+    # The last scheduled item (uid=3) is still in the queue -> row kept.
+    await shadow.apply_poll_result(
+        [_polled(1), _polled(2), _polled(3)], {"uid": 2, "seconds": 100, "currentTime": 0}
+    )
+    assert (await db.get_active_schedule()) is not None
+    # uid=3 has now left the queue (played out, temp item removed) -> row cleared.
+    await shadow.apply_poll_result(
+        [_polled(4), _polled(5)], {"uid": 4, "seconds": 100, "currentTime": 0}
+    )
+    assert (await db.get_active_schedule()) is None
+
+
+async def test_active_schedule_not_cleared_when_nothing_playing(db):
+    await _make_event(db, last_item_uid=3)
+    shadow = QueueShadow(db)
+    # Last item absent but nothing is playing (transient empty poll) -> keep row.
+    await shadow.apply_poll_result([], None)
+    assert (await db.get_active_schedule()) is not None
+
+
+async def test_active_schedule_cleared_when_estimated_end_passed(db):
+    # last_item_uid is None so the event-driven path can't fire; rely on the
+    # time safety net with an estimated end well in the past.
+    pid = await db.create_saved_playlist(
+        name="Stale", description=None, is_immutable=True, created_by="admin"
+    )
+    sid = await db.create_schedule(
+        playlist_id=pid, label="Stale", fire_at=datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%S"),
+        is_active=1, created_by="admin",
+    )
+    past = datetime.now(UTC) - timedelta(hours=1)
+    await db.set_active_schedule(
+        schedule_id=sid, playlist_id=pid, is_immutable=True,
+        started_at=(past - timedelta(hours=1)).isoformat(),
+        estimated_end_at=past.isoformat(), last_item_uid=None,
+    )
+    shadow = QueueShadow(db)
+    await shadow.apply_poll_result([_polled(1)], {"uid": 1, "seconds": 100, "currentTime": 0})
+    assert (await db.get_active_schedule()) is None
+
+
 # --- #4 pre-fire lock override ---
 
 async def test_pre_fire_lock_can_be_disabled(db):