kryten-webqueue 0.7.5__tar.gz → 0.8.1__tar.gz

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 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).
+## [0.8.1] - 2026-06-08
+
+### Added
+
+- **True RRULE-based recurring schedules.** Recurring schedules now auto-re-arm: after an automatic timed fire, the scheduler computes the next occurrence from the schedule's `rrule` (anchored on its fire time), advances `fire_at`, clears `fired_at`, and registers the next job — no manual re-arming needed. On startup, recurring schedules whose fire time elapsed while the service was down are advanced to their next future occurrence. Manual "Fire Now" intentionally does **not** advance the recurrence; the originally scheduled occurrence stays armed. Unparseable or exhausted rules are logged and left inert. Adds an explicit `python-dateutil` dependency for RRULE parsing.
+
+## [0.8.0] - 2026-06-08
+
+### Added
+
+- **Admin Playlists UI.** The placeholder is replaced with a full management page: list/create/delete saved playlists, a two-column item editor (catalog search-to-add, drag-and-drop plus up/down reorder, per-item remove), bulk text import (`cm:`/`type:id`/bare-token, with unresolved-line reporting), rename + immutable toggle, and "Import to Live" to load a playlist into the CyTube queue. A new stateless `POST /admin/playlists/parse-text` endpoint exposes the existing text parser so parsed items merge into the editor and persist via the existing `PUT /{id}/items`.
+- **Admin Schedules UI.** List of scheduled fires with playlist names, local fire times, lock window and status; create/edit/delete with `fire_at` (datetime-local → UTC), `pre_fire_lock_minutes`, `is_recurring`/`rrule`, and active toggle; "Fire Now"; and an active-schedule banner with "Clear Active".
+- **Admin Queue Management UI.** Live `queue_shadow` table (auto-refreshing) with pay/scheduled metadata, ETA, paid-by and Z cost; remove (auto-refund), jump, an admin add-item modal (catalog search + placement mode), and the catalog sync log with a "Sync Now" trigger.
+- **Upcoming-schedule announcement on the Queue page.** A public `GET /queue/next-schedule` feeds a banner with the next scheduled playlist, its fire time, and a live countdown (noting when pay-to-play is closed).
+- Shared admin CSS for section headers, forms, modals, badges, the playlist editor list, drag-reorder, and catalog-add results.
+
+### Changed
+
+- **Specific pre-fire-lock messaging.** Submitting during a lock window now returns `Pay-to-play is closed: "[event]" starts in N min.` instead of a generic locked error (surfaced in the existing toast).
+
 ## [0.7.5] - 2026-06-08
 
 ### Added

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.7.5
+Version: 0.8.1
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT
@@ -13,6 +13,7 @@ Requires-Dist: jinja2>=3.1
 Requires-Dist: pillow>=10.0
 Requires-Dist: pydantic>=2.0
 Requires-Dist: pyjwt>=2.8
+Requires-Dist: python-dateutil>=2.8
 Requires-Dist: uvicorn[standard]>=0.30
 Requires-Dist: websockets>=12.0
 Provides-Extra: dev

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/kryten_webqueue/catalog/db.py

@@ -881,6 +881,21 @@ class Database:
         """)
         return row is not None
 
+    async def get_active_pre_fire_lock(self) -> dict | None:
+        """Return the schedule whose pre-fire lock window is currently active.
+
+        Used to give users a specific "pay-to-play closes before [event]"
+        message instead of a generic locked error.
+        """
+        return await self._fetch_one("""
+            SELECT * FROM playlist_schedules
+            WHERE is_active = 1
+              AND datetime(fire_at, '-' || pre_fire_lock_minutes || ' minutes') <= datetime('now')
+              AND fire_at > datetime('now')
+            ORDER BY fire_at
+            LIMIT 1
+        """)
+
     async def get_next_schedule(self) -> dict | None:
         return await self._fetch_one(
             "SELECT * FROM playlist_schedules WHERE is_active=1 AND fire_at > datetime('now') ORDER BY fire_at LIMIT 1"

kryten_webqueue-0.8.1/kryten_webqueue/playlists/scheduler.py

@@ -0,0 +1,131 @@
+import logging
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.date import DateTrigger
+from datetime import datetime, UTC
+
+from dateutil.rrule import rrulestr
+
+from .fire import fire_schedule
+
+logger = logging.getLogger(__name__)
+
+
+def _next_occurrence(rrule_str: str, dtstart: datetime, after: datetime) -> datetime | None:
+    """Return the next RRULE occurrence strictly after ``after``.
+
+    ``dtstart`` anchors the recurrence pattern (typically the schedule's current
+    fire time). Returns None when the rule is exhausted or unparseable.
+    """
+    try:
+        rule = rrulestr(rrule_str, dtstart=dtstart)
+        return rule.after(after, inc=False)
+    except Exception as e:
+        logger.warning(f"Could not compute next occurrence for rrule {rrule_str!r}: {e}")
+        return None
+
+
+class PlaylistScheduler:
+    """APScheduler-based scheduler for playlist fire events."""
+
+    def __init__(self, *, db, api_gate, shadow, ws_manager):
+        self._db = db
+        self._api_gate = api_gate
+        self._shadow = shadow
+        self._ws_manager = ws_manager
+        self._scheduler = AsyncIOScheduler()
+
+    async def start(self):
+        """Start scheduler and load all pending schedules."""
+        self._scheduler.start()
+        await self._load_schedules()
+        logger.info("PlaylistScheduler started")
+
+    async def stop(self):
+        self._scheduler.shutdown(wait=False)
+        logger.info("PlaylistScheduler stopped")
+
+    @staticmethod
+    def _parse_fire_at(value: str) -> datetime:
+        """Parse a stored fire_at ISO string into a UTC-aware datetime."""
+        dt = datetime.fromisoformat(value)
+        if dt.tzinfo is None:
+            dt = dt.replace(tzinfo=UTC)
+        return dt
+
+    async def _load_schedules(self):
+        """Load active schedules from DB and register jobs.
+
+        Recurring schedules whose fire time has already passed (e.g. while the
+        service was down) are advanced to their next future occurrence.
+        """
+        schedules = await self._db.get_schedules()
+        now = datetime.now(UTC)
+        for sched in schedules:
+            if not sched.get("is_active"):
+                continue
+            fire_at = self._parse_fire_at(sched["fire_at"])
+            if fire_at > now:
+                self._add_job(sched["id"], fire_at)
+            elif sched.get("is_recurring") and sched.get("rrule"):
+                nxt = _next_occurrence(sched["rrule"], fire_at, now)
+                if nxt:
+                    nxt_utc = nxt.astimezone(UTC)
+                    await self._db.update_schedule(
+                        sched["id"], fire_at=nxt_utc.isoformat(), fired_at=None
+                    )
+                    self._add_job(sched["id"], nxt_utc)
+                    logger.info(
+                        f"Advanced missed recurring schedule {sched['id']} to {nxt_utc}"
+                    )
+
+    def _add_job(self, schedule_id: int, fire_at: datetime):
+        job_id = f"schedule_{schedule_id}"
+        self._scheduler.add_job(
+            self._fire,
+            trigger=DateTrigger(run_date=fire_at),
+            id=job_id,
+            replace_existing=True,
+            kwargs={"schedule_id": schedule_id},
+        )
+        logger.info(f"Scheduled job {job_id} for {fire_at}")
+
+    async def _fire(self, schedule_id: int):
+        await fire_schedule(
+            schedule_id=schedule_id,
+            api_gate=self._api_gate,
+            db=self._db,
+            shadow=self._shadow,
+            ws_manager=self._ws_manager,
+        )
+        # After an automatic timed fire, advance recurring schedules to their
+        # next occurrence and re-arm. (Manual "Fire Now" does NOT advance the
+        # recurrence — the originally scheduled occurrence stays armed.)
+        await self._reschedule_if_recurring(schedule_id)
+
+    async def _reschedule_if_recurring(self, schedule_id: int):
+        sched = await self._db.get_schedule(schedule_id)
+        if not sched or not sched.get("is_active"):
+            return
+        if not sched.get("is_recurring") or not sched.get("rrule"):
+            return
+        fired_from = self._parse_fire_at(sched["fire_at"])
+        nxt = _next_occurrence(sched["rrule"], fired_from, fired_from)
+        if not nxt:
+            logger.info(f"Recurring schedule {schedule_id} has no further occurrences")
+            return
+        nxt_utc = nxt.astimezone(UTC)
+        await self._db.update_schedule(
+            schedule_id, fire_at=nxt_utc.isoformat(), fired_at=None
+        )
+        self._add_job(schedule_id, nxt_utc)
+        logger.info(f"Recurring schedule {schedule_id} re-armed for {nxt_utc}")
+
+    async def add_schedule(self, schedule_id: int, fire_at: datetime):
+        self._add_job(schedule_id, fire_at)
+
+    async def remove_schedule(self, schedule_id: int):
+        job_id = f"schedule_{schedule_id}"
+        try:
+            self._scheduler.remove_job(job_id)
+        except Exception:
+            pass

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/kryten_webqueue/routes/admin_playlists.py

@@ -96,3 +96,18 @@ async def import_to_live(request: Request, playlist_id: int, user: dict = Depend
     )
     result = await importer.import_playlist(playlist_id)
     return result
+
+
+@router.post("/parse-text")
+async def parse_text(request: Request, user: dict = Depends(require_admin)):
+    """Parse the plain-text playlist import format into resolved items.
+
+    Stateless: returns {items, errors} for the editor to merge into its working
+    list. Persistence happens via PUT /{id}/items when the admin saves.
+    """
+    from ..playlists.importer import import_playlist_text
+
+    body = await request.json()
+    text = body.get("text", "")
+    db = request.app.state.db
+    return await import_playlist_text(db, text)

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/kryten_webqueue/routes/queue.py

@@ -1,4 +1,5 @@
 from fastapi import APIRouter, Request, Depends, HTTPException
+from datetime import datetime, UTC
 
 from ..auth.session import get_current_user
 from ..queue.ordering import insert_pay_queue, insert_pay_playnext
@@ -6,6 +7,25 @@ from ..queue.ordering import insert_pay_queue, insert_pay_playnext
 router = APIRouter(prefix="/queue", tags=["queue"])
 
 
+async def _pre_fire_lock_detail(db) -> str:
+    """Build a specific 'pay-to-play closes before [event]' message.
+
+    Falls back to a generic message if the locking schedule can't be read.
+    """
+    lock = await db.get_active_pre_fire_lock()
+    if not lock:
+        return "Queue is locked: a scheduled playlist is firing soon."
+    label = lock.get("label") or "a scheduled event"
+    try:
+        fire_at = datetime.fromisoformat(lock["fire_at"])
+        if fire_at.tzinfo is None:
+            fire_at = fire_at.replace(tzinfo=UTC)
+        minutes = max(0, round((fire_at - datetime.now(UTC)).total_seconds() / 60))
+        return f'Pay-to-play is closed: "{label}" starts in {minutes} min. Try again after the event.'
+    except Exception:
+        return f'Pay-to-play is closed ahead of "{label}". Try again after the event.'
+
+
 @router.get("/state")
 async def get_queue_state(request: Request, user: dict = Depends(get_current_user)):
     """Get current queue state."""
@@ -30,7 +50,7 @@ async def add_to_queue(request: Request, user: dict = Depends(get_current_user))
 
     # Check pre-fire lock
     if await db.is_pre_fire_lock_active():
-        raise HTTPException(423, "Queue is locked: scheduled playlist firing soon")
+        raise HTTPException(423, await _pre_fire_lock_detail(db))
 
     # Look up catalog item
     item = await db.get_item(friendly_token)
@@ -86,7 +106,7 @@ async def play_next(request: Request, user: dict = Depends(get_current_user)):
 
     # Check pre-fire lock
     if await db.is_pre_fire_lock_active():
-        raise HTTPException(423, "Queue is locked: scheduled playlist firing soon")
+        raise HTTPException(423, await _pre_fire_lock_detail(db))
 
     # Look up catalog item
     item = await db.get_item(friendly_token)
@@ -187,3 +207,21 @@ async def queue_history(request: Request, user: dict = Depends(get_current_user)
     db = request.app.state.db
     history = await db.get_user_queue_history(user["username"])
     return {"items": history}
+
+
+@router.get("/next-schedule")
+async def next_schedule(request: Request, user: dict = Depends(get_current_user)):
+    """Public-facing info about the next scheduled playlist (for the queue page
+    announcement banner). Returns {} when nothing is scheduled.
+    """
+    db = request.app.state.db
+    sched = await db.get_next_schedule()
+    if not sched:
+        return {}
+    lock_active = await db.is_pre_fire_lock_active()
+    return {
+        "label": sched.get("label"),
+        "fire_at": sched.get("fire_at"),
+        "pre_fire_lock_minutes": sched.get("pre_fire_lock_minutes"),
+        "lock_active": lock_active,
+    }

{kryten_webqueue-0.7.5 → kryten_webqueue-0.8.1}/kryten_webqueue/static/css/main.css

@@ -61,7 +61,7 @@ a:hover {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: 0.75rem 2rem;
+    padding: 0.35rem 2rem;
     background: var(--bg-secondary);
     border-bottom: 1px solid var(--border);
     position: sticky;
@@ -351,10 +351,10 @@ a:hover {
 /* Title spans the full width of the card. */
 .np-title {
     margin: 0;
-    font-size: 1.4rem;
-    line-height: 1.25;
+    font-size: 1rem;
+    line-height: 1.1;
     overflow-wrap: anywhere;
-    padding-bottom: 0.75rem;
+    padding-bottom: 0.5rem;
     border-bottom: 1px solid var(--border);
 }
 /* Image + time display sit side by side. */
@@ -522,10 +522,10 @@ a:hover {
 }
 /* Description + category/tag chips sit below the image / time row. */
 .np-description {
-    font-size: 0.9rem;
-    line-height: 1.5;
+    font-size: 0.7rem;
+    line-height: 1.1;
     color: var(--text-secondary);
-    padding-top: 0.75rem;
+    padding-top: 0.5rem;
     border-top: 1px solid var(--border);
     white-space: pre-line;
     overflow-wrap: anywhere;
@@ -982,3 +982,134 @@ a.np-chip {
     font-size: 0.85rem;
 }
 
+/* ===== Admin management UIs (playlists / schedules / queue) ===== */
+.section-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 1rem;
+    flex-wrap: wrap;
+    margin-bottom: 1rem;
+}
+.section-head h2 { margin-bottom: 0; }
+.btn-group {
+    display: flex;
+    gap: 0.5rem;
+    flex-wrap: wrap;
+}
+.btn-xs {
+    padding: 0.15rem 0.45rem;
+    font-size: 0.72rem;
+    border: 1px solid var(--border);
+    border-radius: 4px;
+    background: var(--bg-card);
+    color: var(--text-primary);
+    cursor: pointer;
+}
+.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;
+}
+.muted { color: var(--text-secondary); font-size: 0.85rem; }
+
+/* Badges */
+.badge {
+    display: inline-block;
+    font-size: 0.7rem;
+    padding: 0.1rem 0.45rem;
+    border-radius: 999px;
+    background: var(--bg-card);
+    border: 1px solid var(--border);
+    color: var(--text-secondary);
+}
+.badge-warn { background: rgba(253, 203, 110, 0.15); border-color: var(--warning); color: var(--warning); }
+.badge-accent { background: rgba(108, 92, 231, 0.2); border-color: var(--accent); color: var(--text-primary); }
+
+/* Modal form fields */
+.field {
+    display: flex;
+    flex-direction: column;
+    gap: 0.3rem;
+    margin-bottom: 0.85rem;
+}
+.field > span { font-size: 0.8rem; color: var(--text-secondary); }
+.field input, .field select, .field textarea {
+    padding: 0.5rem 0.65rem;
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    font: inherit;
+    width: 100%;
+}
+.check {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    font-size: 0.85rem;
+    margin-bottom: 0.85rem;
+    cursor: pointer;
+}
+
+/* Playlist editor */
+.editor-grid {
+    display: grid;
+    grid-template-columns: minmax(0, 1.3fr) minmax(0, 1fr);
+    gap: 2rem;
+}
+@media (max-width: 800px) { .editor-grid { grid-template-columns: 1fr; } }
+.editor-list {
+    list-style: none;
+    display: flex;
+    flex-direction: column;
+    gap: 0.35rem;
+    margin: 0;
+    padding: 0;
+}
+.editor-row {
+    display: grid;
+    grid-template-columns: 1.2rem 1.6rem minmax(0, 1fr) auto auto auto;
+    align-items: center;
+    gap: 0.6rem;
+    padding: 0.45rem 0.6rem;
+    background: var(--bg-card);
+    border-radius: var(--radius);
+    border: 1px solid transparent;
+}
+.editor-row:hover { border-color: var(--border); }
+.drag-handle { cursor: grab; color: var(--text-secondary); user-select: none; }
+.editor-row .pos { color: var(--text-secondary); font-size: 0.8rem; }
+.ed-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.ed-type, .ed-dur { font-size: 0.78rem; color: var(--text-secondary); }
+.ed-move { display: flex; gap: 0.25rem; }
+
+/* Catalog add results */
+.cat-results { display: flex; flex-direction: column; gap: 0.3rem; margin-top: 0.6rem; max-height: 340px; overflow-y: auto; }
+.cat-result {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.6rem;
+    padding: 0.4rem 0.6rem;
+    background: var(--bg-card);
+    border-radius: var(--radius);
+}
+.import-text {
+    width: 100%;
+    padding: 0.5rem;
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+    font-family: monospace;
+    font-size: 0.85rem;
+    margin-bottom: 0.5rem;
+    resize: vertical;
+}
+.import-errors { font-size: 0.8rem; color: var(--text-secondary); margin-top: 0.5rem; }
+.import-errors code { color: var(--warning); }
+