kryten-webqueue 0.9.3__tar.gz → 0.9.5__tar.gz

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/CHANGELOG.md

@@ -6,6 +6,23 @@ 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.9.5] — 2026-06-11
+
+### Changed
+
+- No code changes — version bump only, to refresh the PyPI release index.
+
+## [0.9.4] — 2026-06-11
+
+### Added
+
+- **App version in the footer.** Every view now shows the running `kryten-webqueue` version (e.g. `v0.9.4`) in the footer, sourced from the installed package metadata.
+- **Scheduled-event fallback playlist.** Each schedule can name an optional *mutable* fallback playlist that is appended to the live CyTube queue right after the event's items, so the queue is no longer left empty once a scheduled event is exhausted — no manual intervention required. The fallback items aren't part of the "scheduled event", so they stay available for pay-to-play/search and don't affect when the event lock lifts. Configured via a dropdown (mutable playlists only) in the admin Schedule editor.
+
+### Fixed
+
+- **Playlist rows with a description no longer break row formatting.** The admin table action cell was a `display:flex` `<td>`, which dropped it from the table layout so its bottom border stopped aligning once a name + description grew taller. Action cells are now normal table cells (top-aligned, inline button layout), so buttons and row separators line up regardless of description length.
+
 ## [0.9.3] — 2026-06-11
 
 ### Fixed

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/PKG-INFO

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

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/catalog/db.py

@@ -284,6 +284,12 @@ MIGRATIONS = [
     ALTER TABLE active_schedule ADD COLUMN last_item_uid INTEGER;
     ALTER TABLE active_schedule ADD COLUMN lock_disabled INTEGER NOT NULL DEFAULT 0;
     """,
+    # v9: Optional fallback (mutable) playlist appended to the live queue after a
+    # scheduled event's items, so the queue isn't left empty when the event is
+    # exhausted. NULL = no fallback (legacy behaviour).
+    """
+    ALTER TABLE playlist_schedules ADD COLUMN fallback_playlist_id INTEGER REFERENCES saved_playlists(id) ON DELETE SET NULL;
+    """,
 ]
 
 

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/playlists/fire.py

@@ -48,6 +48,29 @@ async def fire_schedule(*, schedule_id: int, api_gate, db, shadow, ws_manager):
             except Exception as e:
                 logger.warning(f"Schedule fire: failed to add {item['media_id']}: {e}")
 
+        # Append the optional fallback (mutable) playlist AFTER the event items so
+        # the live queue isn't left empty once the event is exhausted. The
+        # fallback items are not part of the "scheduled event", so they do not
+        # change last_item_uid (the event lock still lifts when the last EVENT
+        # item begins) and they remain available for pay-to-play/search.
+        fallback_id = schedule.get("fallback_playlist_id")
+        if fallback_id:
+            fallback_items = await db.get_saved_playlist_items(fallback_id)
+            for item in fallback_items:
+                try:
+                    await api_gate.playlist_add(
+                        media_type=item["media_type"],
+                        media_id=item["media_id"],
+                        position="end",
+                    )
+                except Exception as e:
+                    logger.warning(f"Schedule fire: failed to add fallback {item['media_id']}: {e}")
+            if fallback_items:
+                logger.info(
+                    f"Schedule {schedule_id}: appended {len(fallback_items)} fallback item(s) "
+                    f"from playlist {fallback_id}"
+                )
+
         # Update active schedule
         now = datetime.now(UTC)
         await db.set_active_schedule(

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/routes/admin_schedules.py

@@ -53,6 +53,7 @@ async def create_schedule(request: Request, user: dict = Depends(require_admin))
         is_recurring=body.get("is_recurring", False),
         rrule=body.get("rrule"),
         pre_fire_lock_minutes=body.get("pre_fire_lock_minutes", 15),
+        fallback_playlist_id=body.get("fallback_playlist_id"),
         is_active=True,
         created_by=user["username"],
     )

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/routes/pages.py

@@ -8,6 +8,10 @@ from ..auth.session import get_current_user
 
 templates = Jinja2Templates(directory=str(Path(__file__).parent.parent / "templates"))
 
+# Expose the package version to every template (used in the footer).
+from .. import __version__ as _wq_version
+templates.env.globals["app_version"] = _wq_version
+
 router = APIRouter(tags=["pages"])
 
 # Sort keys exposed in the browse/search UI. Order defines the dropdown order.

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/static/css/main.css

@@ -804,6 +804,7 @@ a.np-chip {
     padding: 0.5rem;
     text-align: left;
     border-bottom: 1px solid var(--border);
+    vertical-align: top;
 }
 .admin-table th {
     color: var(--text-secondary);
@@ -934,6 +935,11 @@ a.np-chip {
     border-top: 1px solid var(--border);
     margin-top: 4rem;
 }
+.footer-version {
+    opacity: 0.7;
+    margin-left: 0.35rem;
+    font-variant-numeric: tabular-nums;
+}
 
 /* Schedule info */
 .schedule-info {
@@ -1056,10 +1062,15 @@ a.np-chip {
 .btn-xs:hover { background: var(--bg-hover); }
 .btn-xs:disabled { opacity: 0.4; cursor: not-allowed; }
 .row-actions {
-    display: flex;
-    gap: 0.4rem;
-    justify-content: flex-end;
-    flex-wrap: wrap;
+    /* Kept as a normal table cell: applying display:flex to a <td> drops it
+       from the table layout, so its bottom border stops aligning with the rest
+       of the row once another cell (e.g. a playlist name + description) grows
+       taller. Lay the buttons out inline instead. */
+    white-space: nowrap;
+    text-align: right;
+}
+.row-actions > * + * {
+    margin-left: 0.4rem;
 }
 .muted { color: var(--text-secondary); font-size: 0.85rem; }
 

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/templates/admin/schedules.html

@@ -22,6 +22,7 @@
 {% block scripts %}
 <script>
 let playlistMap = {};
+let playlistRows = [];
 
 function escapeHtml(str) { const d = document.createElement('div'); d.textContent = str == null ? '' : str; return d.innerHTML; }
 
@@ -30,6 +31,7 @@ async function loadPlaylistsForSelect() {
     if (!resp.ok) return [];
     const rows = await resp.json();
     playlistMap = {};
+    playlistRows = rows;
     rows.forEach(p => playlistMap[p.id] = p.name);
     return rows;
 }
@@ -88,7 +90,7 @@ async function loadSchedules() {
             const preFireLocked = inPreFire && !s.lock_disabled;
             return `<tr>
                 <td>${escapeHtml(s.label)}${s.is_recurring ? ' <span class="badge">↻</span>' : ''}</td>
-                <td>${escapeHtml(playlistMap[s.playlist_id] || ('#' + s.playlist_id))}</td>
+                <td>${escapeHtml(playlistMap[s.playlist_id] || ('#' + s.playlist_id))}${s.fallback_playlist_id ? `<div class="muted">then: ${escapeHtml(playlistMap[s.fallback_playlist_id] || ('#' + s.fallback_playlist_id))}</div>` : ''}</td>
                 <td>${formatLocalDateTime(s.fire_at)}</td>
                 <td>${lockMin}m${preFireLocked ? ' <button class="btn btn-xs" onclick="unlockNow()" title="Lift the active pre-fire lock now">Unlock</button>' : (inPreFire && s.lock_disabled ? ' <span class="muted">(unlocked)</span>' : '')}</td>
                 <td><span class="job-status job-status-${fired === 'pending' ? 'running' : (fired === 'fired' ? 'completed' : 'cancelled')}">${s.is_active ? fired : 'disabled'}</span></td>
@@ -106,6 +108,11 @@ function scheduleForm(s) {
     s = s || {};
     const opts = Object.entries(playlistMap).map(([id, name]) =>
         `<option value="${id}" ${s.playlist_id == id ? 'selected' : ''}>${escapeHtml(name)}</option>`).join('');
+    // Fallback options: mutable (non-immutable) playlists only, plus a "none" choice.
+    const mutable = playlistRows.filter(p => !p.is_immutable);
+    const fallbackOpts = '<option value="">— none (leave queue empty) —</option>' +
+        mutable.map(p =>
+            `<option value="${p.id}" ${s.fallback_playlist_id == p.id ? 'selected' : ''}>${escapeHtml(p.name)}</option>`).join('');
     // fire_at → datetime-local value (local tz)
     let dtLocal = '';
     if (s.fire_at) {
@@ -116,6 +123,8 @@ function scheduleForm(s) {
         <h3>${s.id ? 'Edit' : 'New'} Schedule</h3>
         <label class="field"><span>Label</span><input type="text" id="s-label" value="${escapeHtml(s.label || '')}"></label>
         <label class="field"><span>Playlist</span><select id="s-playlist">${opts}</select></label>
+        <label class="field"><span>Fallback playlist</span><select id="s-fallback">${fallbackOpts}</select></label>
+        <p class="muted" style="font-size:0.8rem;margin-top:-0.25rem;">Plays after the scheduled playlist is exhausted, so the queue isn't left empty. Only mutable playlists can be used.</p>
         <label class="field"><span>Fire at</span><input type="datetime-local" id="s-fireat" value="${dtLocal}"></label>
         <label class="field"><span>Pre-fire lock (min)</span><input type="number" id="s-lock" min="0" value="${s.pre_fire_lock_minutes ?? 15}"></label>
         <label class="check"><input type="checkbox" id="s-recur" ${s.is_recurring ? 'checked' : ''}> Recurring</label>
@@ -151,6 +160,8 @@ function collectSchedule() {
         is_recurring: document.getElementById('s-recur').checked,
         rrule: document.getElementById('s-rrule').value.trim() || null,
     };
+    const fallbackVal = document.getElementById('s-fallback').value;
+    body.fallback_playlist_id = fallbackVal ? parseInt(fallbackVal, 10) : null;
     const active = document.getElementById('s-active');
     if (active) body.is_active = active.checked;
     return body;

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/kryten_webqueue/templates/base.html

@@ -35,7 +35,7 @@
     </main>
 
     <footer class="footer">
-        <p>&copy; Channel-Z — Powered by <a href="https://github.com/grobertson/kryten-webqueue" target="_blank" rel="noopener">kryten-webqueue</a></p>
+        <p>&copy; Channel-Z — Powered by <a href="https://github.com/grobertson/kryten-webqueue" target="_blank" rel="noopener">kryten-webqueue</a>{% if app_version %} <span class="footer-version">v{{ app_version }}</span>{% endif %}</p>
     </footer>
 
     <script src="/static/js/main.js"></script>

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/pyproject.toml

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

{kryten_webqueue-0.9.3 → kryten_webqueue-0.9.5}/tests/test_phase4_live_fixes.py

@@ -168,3 +168,83 @@ async def test_pre_fire_lock_can_be_disabled(db):
 
     await db.update_schedule(sid, lock_disabled=1)
     assert await db.is_pre_fire_lock_active() is False
+
+
+# --- #2 (v0.9.4) scheduled-event fallback playlist ---
+
+class _FakeApiGate:
+    """Minimal api_gate stub recording playlist_add calls."""
+
+    def __init__(self):
+        self.added = []
+        self._uid = 0
+        self.cleared = False
+
+    async def playlist_clear(self):
+        self.cleared = True
+
+    async def playlist_add(self, *, media_type, media_id, position="end"):
+        self._uid += 1
+        self.added.append({"media_type": media_type, "media_id": media_id, "uid": self._uid})
+        return {"success": True, "uid": self._uid}
+
+
+class _FakeWs:
+    async def broadcast(self, *_a, **_k):
+        pass
+
+
+async def test_fire_appends_fallback_after_event(db):
+    from kryten_webqueue.playlists.fire import fire_schedule
+
+    event_pid = await db.create_saved_playlist(
+        name="Event", description=None, is_immutable=True, created_by="admin"
+    )
+    await db.replace_playlist_items(event_pid, [
+        {"media_type": "cm", "media_id": "e1", "title": "E1", "duration_sec": 100},
+        {"media_type": "cm", "media_id": "e2", "title": "E2", "duration_sec": 100},
+    ])
+    fallback_pid = await db.create_saved_playlist(
+        name="Filler", description=None, is_immutable=False, created_by="admin"
+    )
+    await db.replace_playlist_items(fallback_pid, [
+        {"media_type": "cm", "media_id": "f1", "title": "F1", "duration_sec": 100},
+    ])
+    sid = await db.create_schedule(
+        playlist_id=event_pid, label="Event",
+        fire_at=datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%S"),
+        is_active=1, created_by="admin", fallback_playlist_id=fallback_pid,
+    )
+
+    api = _FakeApiGate()
+    shadow = QueueShadow(db)
+    await fire_schedule(schedule_id=sid, api_gate=api, db=db, shadow=shadow, ws_manager=_FakeWs())
+
+    # Event items first, fallback appended after.
+    assert [a["media_id"] for a in api.added] == ["e1", "e2", "f1"]
+
+    # The event lock's last item is the last EVENT item (e2, uid=2), NOT the
+    # fallback — so the lock lifts when e2 starts, not when the filler plays.
+    active = await db.get_active_schedule()
+    assert active["last_item_uid"] == 2
+
+
+async def test_fire_without_fallback_only_adds_event(db):
+    from kryten_webqueue.playlists.fire import fire_schedule
+
+    event_pid = await db.create_saved_playlist(
+        name="Event", description=None, is_immutable=True, created_by="admin"
+    )
+    await db.replace_playlist_items(event_pid, [
+        {"media_type": "cm", "media_id": "e1", "title": "E1", "duration_sec": 100},
+    ])
+    sid = await db.create_schedule(
+        playlist_id=event_pid, label="Event",
+        fire_at=datetime.now(UTC).strftime("%Y-%m-%dT%H:%M:%S"),
+        is_active=1, created_by="admin",
+    )
+
+    api = _FakeApiGate()
+    shadow = QueueShadow(db)
+    await fire_schedule(schedule_id=sid, api_gate=api, db=db, shadow=shadow, ws_manager=_FakeWs())
+    assert [a["media_id"] for a in api.added] == ["e1"]