kryten-webqueue 0.14.1__tar.gz → 0.15.0__tar.gz

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/CHANGELOG.md

@@ -6,6 +6,24 @@ 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.15.0] — 2026-06-14
+
+### Added
+
+- **Account progression panel on the Z-Coin dashboard.** The left column now surfaces the user's economy account in full: current rank/level, a progress bar toward the next milestone (remaining Z + percent), active perks (including spend discount), and their purchased vanity items. Powered by the new api-gate `GET /economy/account/{username}` endpoint (economy `account.summary`), proxied via `GET /user/account`.
+- **Vanity item editing dialogs.** Inline **Edit** buttons open dialogs to purchase/update the custom greeting (textarea, 200-char limit) and custom chat color (native color picker synced with a 6-digit hex field). Backed by `POST /user/vanity/greeting` and `POST /user/vanity/color`, which proxy the economy `vanity.set_greeting` / `vanity.set_color` commands. The username is taken from the authenticated session, never the request body.
+- **Transaction credit/debit filter.** The Recent Transactions column gains an All / Credits / Debits toggle and a **Load more** control, with friendlier titles derived from each transaction's `trigger_id` (e.g. `presence.base` → "Watching reward", `spend.vanity.chat_color` → "Custom color") instead of raw `earn` labels.
+
+### Changed
+
+- **Queue history pagination.** `GET /queue/history` now accepts `limit`/`offset` and returns a `total` count; the dashboard's middle column paginates through the full history with Prev/Next controls instead of showing only the most recent 20 entries.
+
+## [0.14.2] — 2026-06-13
+
+### Added
+
+- **Save all search/browse results to a playlist.** The Browse/search results page now shows an admin-only **Save results to playlist** button. It appends every catalog item matching the current search query or browse facets (across all pages, honouring the hidden-items toggle) to a playlist of your choosing. Where a season/episode marker is detectable in the title (`S01E02`, `1x02`, `Season 1 Episode 2`, …) items are laid out in proper series → season → episode order; everything else falls back to a stable alphabetical placement. Items already in the target playlist are skipped, so re-running is idempotent. Backend: `POST /admin/playlists/{id}/append-results` (admin-only) plus a de-duplicating bulk `Database.append_playlist_items` and a pure `playlists.ordering` helper.
+
 ## [0.14.1] — 2026-06-13
 
 ### Fixed

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/PKG-INFO

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

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/api_gate/client.py

@@ -93,6 +93,21 @@ class ApiGateClient:
     async def get_transactions(self, username: str, limit: int = 20, offset: int = 0) -> dict:
         return await self.get(f"/economy/transactions/{username}", limit=limit, offset=offset)
 
+    async def get_account_summary(self, username: str) -> dict:
+        return await self.get(f"/economy/account/{username}")
+
+    async def set_vanity_greeting(self, username: str, value: str) -> dict:
+        return await self.post("/economy/vanity/greeting", json={
+            "username": username,
+            "value": value,
+        })
+
+    async def set_vanity_color(self, username: str, value: str) -> dict:
+        return await self.post("/economy/vanity/color", json={
+            "username": username,
+            "value": value,
+        })
+
     async def queue_preview(self, username: str, duration_sec: int, tier: str = "queue") -> dict:
         return await self.post("/economy/queue-preview", json={
             "username": username,

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/catalog/db.py

@@ -893,12 +893,19 @@ class Database:
             [username, friendly_token, title, tier, z_cost],
         )
 
-    async def get_user_queue_history(self, username: str, limit: int = 50) -> list[dict]:
+    async def get_user_queue_history(self, username: str, limit: int = 50, offset: int = 0) -> list[dict]:
         return await self._fetch_all(
-            "SELECT * FROM queue_history WHERE username=? ORDER BY id DESC LIMIT ?",
-            [username, limit],
+            "SELECT * FROM queue_history WHERE username=? ORDER BY id DESC LIMIT ? OFFSET ?",
+            [username, limit, offset],
         )
 
+    async def get_user_queue_history_count(self, username: str) -> int:
+        row = await self._fetch_one(
+            "SELECT COUNT(*) AS c FROM queue_history WHERE username=?",
+            [username],
+        )
+        return int(row["c"]) if row else 0
+
     # --- Saved playlists ---
 
     async def get_saved_playlists(self) -> list[dict]:
@@ -980,6 +987,39 @@ class Database:
         await self._db.commit()
         return count
 
+    async def append_playlist_items(self, playlist_id: int, items: list[dict]) -> int:
+        """Append many items to the end of a playlist, skipping any whose
+        ``media_id`` is already present. Returns the number actually added."""
+        existing_rows = await self._fetch_all(
+            "SELECT media_id FROM saved_playlist_items WHERE playlist_id=?", [playlist_id]
+        )
+        seen = {r["media_id"] for r in existing_rows}
+        row = await self._fetch_one(
+            "SELECT COALESCE(MAX(position), -1) AS pos FROM saved_playlist_items WHERE playlist_id=?",
+            [playlist_id],
+        )
+        next_pos = (row["pos"] + 1) if row else 0
+        added = 0
+        for item in items:
+            media_id = item.get("media_id")
+            if not media_id or media_id in seen:
+                continue
+            seen.add(media_id)
+            await self._db.execute(
+                "INSERT INTO saved_playlist_items (playlist_id, position, media_type, media_id, title, duration_sec) "
+                "VALUES (?, ?, ?, ?, ?, ?)",
+                [playlist_id, next_pos, item.get("media_type", "cm"), media_id,
+                 item.get("title"), item.get("duration_sec")],
+            )
+            next_pos += 1
+            added += 1
+        if added:
+            await self._db.execute(
+                "UPDATE saved_playlists SET updated_at=datetime('now') WHERE id=?", [playlist_id]
+            )
+        await self._db.commit()
+        return added
+
     async def get_most_recent_playlist(self, created_by: str) -> dict | None:
         """The given admin's most recently *created* saved playlist, if any."""
         return await self._fetch_one(

kryten_webqueue-0.15.0/kryten_webqueue/playlists/ordering.py

@@ -0,0 +1,77 @@
+"""Season/episode aware ordering for playlists built from search results (0.14.2).
+
+When an admin saves a whole result set to a playlist we try to lay episodic
+content out in natural watch order: grouped by series, then by season, then by
+episode. Items with no detectable season/episode marker fall back to an
+alphabetical-by-title placement, and ties always preserve the original input
+order (a stable sort) so the behaviour is deterministic.
+"""
+
+import re
+
+# Ordered most-specific first. Each pattern must expose season as group 1 and
+# episode as group 2.
+_SE_PATTERNS = [
+    # S01E02, s1e2, S01 E02, S01.E02, S01-E02
+    re.compile(r"[Ss](\d{1,2})\s*[._\- ]?\s*[Ee](\d{1,3})"),
+    # Season 1 Episode 2 / Season 1, Episode 02
+    re.compile(r"[Ss]eason\s*(\d{1,2}).*?[Ee]pisode\s*(\d{1,3})"),
+    # 1x02, 01x003
+    re.compile(r"\b(\d{1,2})[Xx](\d{1,3})\b"),
+]
+
+
+def parse_season_episode(title: str | None) -> tuple[int, int, int, int] | None:
+    """Parse a season/episode marker from ``title``.
+
+    Returns ``(season, episode, match_start, match_end)`` or ``None`` when no
+    recognised marker is present.
+    """
+    if not title:
+        return None
+    for pattern in _SE_PATTERNS:
+        m = pattern.search(title)
+        if not m:
+            continue
+        try:
+            season = int(m.group(1))
+            episode = int(m.group(2))
+        except (TypeError, ValueError):
+            continue
+        return season, episode, m.start(), m.end()
+    return None
+
+
+def _series_base(title: str, match_start: int) -> str:
+    """Best-effort series name: the text before the season/episode marker.
+
+    Falls back to the whole title when the marker sits at the very start.
+    """
+    base = title[:match_start].strip(" \t-–—_.:|")
+    return (base or title).strip().lower()
+
+
+def episode_sort_key(item: dict, index: int) -> tuple:
+    """Sort key for a catalog item.
+
+    Episodic items group under their series name then sort by season/episode.
+    Non-episodic items sort by their (lowercased) title. ``index`` is appended
+    so equal keys retain the caller's original ordering.
+    """
+    title = (item.get("title") or "").strip()
+    parsed = parse_season_episode(title)
+    if parsed:
+        season, episode, start, _ = parsed
+        return (_series_base(title, start), season, episode, index)
+    return (title.lower(), 0, 0, index)
+
+
+def order_for_playlist(items: list[dict]) -> list[dict]:
+    """Return ``items`` ordered for a playlist (season/episode aware, stable)."""
+    return [
+        item
+        for _, item in sorted(
+            enumerate(items),
+            key=lambda pair: episode_sort_key(pair[1], pair[0]),
+        )
+    ]

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/routes/admin_playlists.py

@@ -166,6 +166,64 @@ async def append_item(request: Request, playlist_id: int, user: dict = Depends(r
     return {"success": True, "playlist_id": playlist_id, "name": playlist["name"], "count": count}
 
 
+@router.post("/{playlist_id}/append-results")
+async def append_results(request: Request, playlist_id: int, user: dict = Depends(require_admin)):
+    """Append every catalog item matching the current browse/search filters to a
+    playlist (0.14.2).
+
+    The browse/search facets are sent in the body so the server re-runs the same
+    (unpaginated) query the admin is looking at. Items are laid out in
+    season/episode order where a marker is detectable in the title, and any item
+    already present in the playlist is skipped.
+    """
+    from ..playlists.ordering import order_for_playlist
+
+    body = await request.json()
+    db = request.app.state.db
+    playlist = await db.get_saved_playlist(playlist_id)
+    if not playlist:
+        raise HTTPException(404, "Playlist not found")
+
+    mode = body.get("mode", "browse")
+    show_hidden = bool(body.get("show_hidden"))
+    sort = body.get("sort") or "default"
+
+    if mode == "search":
+        q = (body.get("q") or "").strip()
+        if not q:
+            raise HTTPException(400, "Query required for search results")
+        total = await db.search_count(q, show_hidden=show_hidden)
+        items = await db.search(q, page=1, per_page=max(total, 1),
+                                show_hidden=show_hidden, sort=sort)
+    else:
+        category = body.get("category") or None
+        tag = body.get("tag") or None
+        total = await db.browse_count(category=category, tag=tag, show_hidden=show_hidden)
+        items = await db.browse(category=category, tag=tag, page=1, per_page=max(total, 1),
+                                show_hidden=show_hidden, sort=sort)
+
+    ordered = order_for_playlist(items)
+    playlist_items = [
+        {
+            "media_type": "cm",
+            "media_id": it["manifest_url"],
+            "title": it.get("title"),
+            "duration_sec": it.get("duration_sec"),
+        }
+        for it in ordered
+        if it.get("manifest_url")
+    ]
+    added = await db.append_playlist_items(playlist_id, playlist_items)
+    count = len(await db.get_saved_playlist_items(playlist_id))
+    return {
+        "success": True,
+        "playlist_id": playlist_id,
+        "name": playlist["name"],
+        "added": added,
+        "count": count,
+    }
+
+
 @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.

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/routes/queue.py

@@ -223,11 +223,15 @@ async def cost_preview(request: Request, friendly_token: str, tier: str = "queue
 
 
 @router.get("/history")
-async def queue_history(request: Request, user: dict = Depends(get_current_user)):
-    """Get user's queue history."""
+async def queue_history(request: Request, limit: int = 20, offset: int = 0,
+                        user: dict = Depends(get_current_user)):
+    """Get user's queue history (paginated, most recent first)."""
+    limit = max(1, min(limit, 100))
+    offset = max(0, offset)
     db = request.app.state.db
-    history = await db.get_user_queue_history(user["username"])
-    return {"items": history}
+    items = await db.get_user_queue_history(user["username"], limit=limit, offset=offset)
+    total = await db.get_user_queue_history_count(user["username"])
+    return {"items": items, "total": total, "limit": limit, "offset": offset}
 
 
 @router.get("/next-schedule")

kryten_webqueue-0.15.0/kryten_webqueue/routes/user.py

@@ -0,0 +1,89 @@
+from fastapi import APIRouter, Request, Depends, HTTPException
+from pydantic import BaseModel
+
+from ..auth.session import get_current_user
+
+router = APIRouter(prefix="/user", tags=["user"])
+
+
+@router.get("/balance")
+async def get_balance(request: Request, user: dict = Depends(get_current_user)):
+    """Get user's economy balance."""
+    api_gate = request.app.state.api_gate
+    return await api_gate.get_balance(user["username"])
+
+
+@router.get("/account")
+async def get_account(request: Request, user: dict = Depends(get_current_user)):
+    """Get the user's full economy account summary (rank, progress, perks, vanity)."""
+    api_gate = request.app.state.api_gate
+    return await api_gate.get_account_summary(user["username"])
+
+
+class GreetingUpdate(BaseModel):
+    value: str
+
+
+class ColorUpdate(BaseModel):
+    value: str
+
+
+@router.post("/vanity/greeting")
+async def set_vanity_greeting(
+    body: GreetingUpdate, request: Request, user: dict = Depends(get_current_user)
+):
+    """Purchase/update the current user's custom greeting."""
+    api_gate = request.app.state.api_gate
+    try:
+        return await api_gate.set_vanity_greeting(user["username"], body.value)
+    except Exception as exc:  # noqa: BLE001
+        raise HTTPException(status_code=400, detail=_economy_error(exc)) from exc
+
+
+@router.post("/vanity/color")
+async def set_vanity_color(
+    body: ColorUpdate, request: Request, user: dict = Depends(get_current_user)
+):
+    """Purchase/update the current user's custom chat color (6-digit hex)."""
+    api_gate = request.app.state.api_gate
+    try:
+        return await api_gate.set_vanity_color(user["username"], body.value)
+    except Exception as exc:  # noqa: BLE001
+        raise HTTPException(status_code=400, detail=_economy_error(exc)) from exc
+
+
+def _economy_error(exc: Exception) -> str:
+    """Extract a human-readable message from an api-gate HTTP error."""
+    import httpx
+
+    if isinstance(exc, httpx.HTTPStatusError):
+        try:
+            detail = exc.response.json().get("detail")
+            if detail:
+                return str(detail)
+        except Exception:  # noqa: BLE001
+            pass
+    return "Purchase failed. Please try again."
+
+
+@router.get("/transactions")
+async def get_transactions(request: Request, limit: int = 20, offset: int = 0,
+                           user: dict = Depends(get_current_user)):
+    """Get user's transaction history."""
+    api_gate = request.app.state.api_gate
+    return await api_gate.get_transactions(user["username"], limit=limit, offset=offset)
+
+
+@router.get("/profile")
+async def get_profile(request: Request, user: dict = Depends(get_current_user)):
+    """Get current user profile info from api-gate."""
+    api_gate = request.app.state.api_gate
+    try:
+        user_data = await api_gate.get_user(user["username"])
+    except Exception:
+        user_data = {}
+    return {
+        "username": user["username"],
+        "rank": user["rank"],
+        "online": user_data.get("online", False) if user_data else False,
+    }

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/static/css/main.css

@@ -150,6 +150,9 @@ a:hover {
 .admin-hidden-notice a {
     font-weight: 600;
 }
+.admin-results-actions {
+    margin-top: 0.85rem;
+}
 .search-form {
     display: flex;
     gap: 0.5rem;
@@ -787,6 +790,170 @@ a.np-chip {
     color: var(--danger);
 }
 
+/* Account rank + progression (dashboard left column) */
+.account-rank {
+    margin-top: 1.25rem;
+    padding-top: 1.25rem;
+    border-top: 1px solid var(--border);
+}
+.rank-name {
+    font-size: 1.1rem;
+    font-weight: 700;
+}
+.rank-level {
+    font-size: 0.8rem;
+    color: var(--text-secondary);
+    margin-top: 0.15rem;
+}
+.rank-progress {
+    margin-top: 0.85rem;
+}
+.rank-progress-head, .rank-progress-foot {
+    display: flex;
+    justify-content: space-between;
+    font-size: 0.8rem;
+    color: var(--text-secondary);
+}
+.rank-progress-head {
+    margin-bottom: 0.35rem;
+}
+.rank-progress-foot {
+    margin-top: 0.35rem;
+}
+.progress-track {
+    height: 8px;
+    border-radius: 999px;
+    background: var(--bg-secondary, #1a1a24);
+    overflow: hidden;
+    border: 1px solid var(--border);
+}
+.progress-fill {
+    height: 100%;
+    background: linear-gradient(90deg, var(--accent), var(--accent-hover));
+    transition: width 0.4s ease;
+}
+.account-perks {
+    margin-top: 1.25rem;
+}
+.account-perks h3 {
+    font-size: 0.85rem;
+    color: var(--text-secondary);
+    margin-bottom: 0.4rem;
+}
+.perk-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 0.2rem;
+}
+.perk-list li {
+    font-size: 0.85rem;
+}
+.perk-list li::before {
+    content: "✓ ";
+    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-item {
+    margin-bottom: 0.85rem;
+}
+.vanity-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+}
+.vanity-label {
+    font-size: 0.85rem;
+    font-weight: 600;
+}
+.vanity-value {
+    font-size: 0.85rem;
+    color: var(--text-primary);
+    margin-top: 0.25rem;
+    word-break: break-word;
+    display: flex;
+    align-items: center;
+    gap: 0.4rem;
+}
+.vanity-unset {
+    color: var(--text-secondary);
+    font-style: italic;
+}
+.color-swatch {
+    display: inline-block;
+    width: 1rem;
+    height: 1rem;
+    border-radius: 3px;
+    border: 1px solid var(--border);
+    flex-shrink: 0;
+}
+
+/* Color picker dialog */
+.color-picker-row {
+    display: flex;
+    align-items: center;
+    gap: 0.75rem;
+    margin: 0.5rem 0 1rem;
+}
+.color-picker-row input[type="color"] {
+    width: 48px;
+    height: 40px;
+    padding: 0;
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    background: transparent;
+    cursor: pointer;
+}
+.color-hex {
+    flex: 1;
+    text-transform: uppercase;
+}
+
+/* Transaction filter toggle */
+.tx-toggle {
+    display: flex;
+    gap: 0.25rem;
+    margin: 0.5rem 0 0.75rem;
+}
+.tx-toggle-btn {
+    flex: 1;
+    padding: 0.35rem 0.5rem;
+    font-size: 0.8rem;
+    background: var(--bg-secondary, #1a1a24);
+    color: var(--text-secondary);
+    border: 1px solid var(--border);
+    border-radius: var(--radius);
+    cursor: pointer;
+}
+.tx-toggle-btn.active {
+    background: var(--accent);
+    border-color: var(--accent);
+    color: #fff;
+}
+
+/* Dashboard history / transaction pagers */
+.history-pager, .tx-pager {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+    margin-top: 1rem;
+}
+
 /* Admin */
 .admin-nav {
     display: flex;

{kryten_webqueue-0.14.1 → kryten_webqueue-0.15.0}/kryten_webqueue/templates/catalog/browse.html

@@ -39,6 +39,9 @@
             <a href="{{ request.url.include_query_params(show_hidden=1) }}">Show hidden items?</a>
         {% endif %}
     </div>
+    <div class="admin-results-actions">
+        <button class="btn btn-sm btn-admin" onclick="saveResultsToPlaylist()">Save results to playlist</button>
+    </div>
     {% endif %}
 </div>
 
@@ -233,6 +236,83 @@ async function submitAddToPlaylist(playlistId, token) {
     }
 }
 
+// --- Save all current results to a playlist (rank >= 3) ---
+
+async function saveResultsToPlaylist() {
+    let playlists = [];
+    try {
+        const resp = await fetch('/admin/playlists/', { credentials: 'same-origin' });
+        if (resp.ok) playlists = await resp.json();
+    } catch (e) { /* handled below */ }
+    if (!playlists.length) {
+        showToast('No playlists yet — create one first', 'error');
+        return;
+    }
+    showResultsPlaylistPicker(playlists);
+}
+
+function showResultsPlaylistPicker(playlists) {
+    closePlaylistPickerModal();
+    const overlay = document.createElement('div');
+    overlay.id = 'playlist-picker-modal';
+    overlay.className = 'modal-overlay';
+    const opts = playlists.map(p => `<option value="${p.id}">${escapeHtml(p.name)}</option>`).join('');
+    const scope = CURRENT_QUERY ? 'search' : 'filter';
+    overlay.innerHTML = `
+        <div class="modal-box" role="dialog" aria-modal="true">
+            <h3>Save all results to playlist</h3>
+            <p class="muted">Every item matching the current ${scope} will be appended, ordered by season/episode where detected. Items already in the playlist are skipped.</p>
+            <div class="field">
+                <label for="playlist-picker-select">Playlist</label>
+                <select id="playlist-picker-select">${opts}</select>
+            </div>
+            <div class="modal-actions">
+                <button class="btn btn-secondary" data-action="cancel">Cancel</button>
+                <button class="btn btn-primary" data-action="save">Save results</button>
+            </div>
+        </div>`;
+    overlay.addEventListener('click', (e) => {
+        if (e.target === overlay) closePlaylistPickerModal();
+        const action = e.target.getAttribute('data-action');
+        if (action === 'cancel') closePlaylistPickerModal();
+        if (action === 'save') {
+            const pid = document.getElementById('playlist-picker-select').value;
+            closePlaylistPickerModal();
+            submitSaveResults(pid);
+        }
+    });
+    document.body.appendChild(overlay);
+}
+
+async function submitSaveResults(playlistId) {
+    const url = new URL(window.location.href);
+    const isSearch = url.pathname.indexOf('/catalog/search') !== -1;
+    const body = {
+        mode: isSearch ? 'search' : 'browse',
+        q: url.searchParams.get('q') || '',
+        category: url.searchParams.get('category') || '',
+        tag: url.searchParams.get('tag') || '',
+        sort: url.searchParams.get('sort') || 'default',
+        show_hidden: url.searchParams.get('show_hidden') ? 1 : 0,
+    };
+    showToast('Saving results…');
+    try {
+        const resp = await fetch(`/admin/playlists/${playlistId}/append-results`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            credentials: 'same-origin',
+            body: JSON.stringify(body),
+        });
+        const data = await resp.json();
+        showToast(
+            resp.ok ? `Added ${data.added} item(s) — playlist now ${data.count}`
+                    : (data.detail || `Failed (${resp.status})`),
+            resp.ok ? 'success' : 'error');
+    } catch (e) {
+        showToast(`Network error: ${e.message}`, 'error');
+    }
+}
+
 async function addToRecentPlaylist(token) {
     try {
         const resp = await fetch('/admin/playlists/recent/append', {