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

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

@@ -4,6 +4,23 @@ 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.7.5] - 2026-06-08
+
+### Added
+
+- **Hidden categories/tags with an admin reveal toggle.** Items in the categories `Z Channel Promos`, `Z Event Movies`, `Weekday Z Promos` and the tags `grindhousebumper`, `commercialsforbumpers`, `bumpers`, `channelz`, `grindhousetrailer`, `publicaccess`, `religioustv` are now excluded from the catalog browse/search results and from the category/tag facet dropdowns. Admins (rank ≥ 3) see a notice — "Certain items are hidden from results. Show hidden items?" — that toggles them back into view via `?show_hidden=1` (ignored for non-admins).
+- **Modern, readability-focused typography.** The UI now loads Inter (body/controls) and Sora (headings) from Google Fonts, with antialiasing and `optimizeLegibility` enabled.
+
+### Removed
+
+- **"Play Next" buttons** are no longer shown on the catalog browse cards or the item detail page (the underlying play-next queue mechanism is unchanged).
+
+## [0.7.4] - 2026-06-08
+
+### Changed
+
+- **Catalog item detail page redesigned** to a two-column layout: the poster and action buttons (Queue / Play Next / Queue as Admin) stack in a sticky left column, while the right column shows the title, a divider, the formatted description, and **Category** / **Tags** facet rows. Category and tag chips link back into a filtered catalog browse. Categories/tags are sourced from the catalog join tables (populated by sync since 0.7.0).
+
 ## [0.7.3] - 2026-06-08
 
 ### Fixed

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

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

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

@@ -12,6 +12,47 @@ def _slugify(text: str) -> str:
     return s.strip("-") or "untitled"
 
 
+# Categories and tags whose items are hidden from the public catalog (dropdowns
+# and search results). Admins can opt to reveal them. Matched by exact name.
+HIDDEN_CATEGORY_NAMES = [
+    "Z Channel Promos",
+    "Z Event Movies",
+    "Weekday Z Promos",
+]
+HIDDEN_TAG_NAMES = [
+    "grindhousebumper",
+    "commercialsforbumpers",
+    "bumpers",
+    "channelz",
+    "grindhousetrailer",
+    "publicaccess",
+    "religioustv",
+]
+
+
+def _hidden_exclusion(alias: str = "c") -> tuple[str, list]:
+    """SQL fragment (+ params) excluding items in hidden categories/tags.
+
+    The fragment is prefixed with ``AND`` so it can be appended to an existing
+    WHERE clause that references the catalog row under ``alias``.
+    """
+    cat_ph = ",".join("?" * len(HIDDEN_CATEGORY_NAMES))
+    tag_ph = ",".join("?" * len(HIDDEN_TAG_NAMES))
+    sql = f"""
+            AND {alias}.friendly_token NOT IN (
+                SELECT cc.friendly_token FROM catalog_categories cc
+                JOIN categories cat ON cc.category_id = cat.id
+                WHERE cat.name IN ({cat_ph})
+            )
+            AND {alias}.friendly_token NOT IN (
+                SELECT ct.friendly_token FROM catalog_tags ct
+                JOIN tags t ON ct.tag_id = t.id
+                WHERE t.name IN ({tag_ph})
+            )
+    """
+    return sql, [*HIDDEN_CATEGORY_NAMES, *HIDDEN_TAG_NAMES]
+
+
 MIGRATIONS = [
     # v1: Migration tracking table
     """
@@ -245,7 +286,7 @@ class Database:
 
     # --- Catalog ---
 
-    async def browse(self, *, category: str | None = None, tag: str | None = None, page: int = 1, per_page: int = 24) -> list[dict]:
+    async def browse(self, *, category: str | None = None, tag: str | None = None, page: int = 1, per_page: int = 24, show_hidden: bool = False) -> list[dict]:
         query = """
             SELECT c.friendly_token, c.title, c.duration_sec, c.cover_art_path, c.thumbnail_url, c.manifest_url
             FROM catalog c
@@ -256,6 +297,10 @@ class Database:
             )
         """
         params: list = []
+        if not show_hidden:
+            excl_sql, excl_params = _hidden_exclusion("c")
+            query += excl_sql
+            params.extend(excl_params)
         if category:
             query += """
                 AND c.friendly_token IN (
@@ -296,7 +341,7 @@ class Database:
         params.extend([per_page, (page - 1) * per_page])
         return await self._fetch_all(query, params)
 
-    async def browse_count(self, *, category: str | None = None, tag: str | None = None) -> int:
+    async def browse_count(self, *, category: str | None = None, tag: str | None = None, show_hidden: bool = False) -> int:
         query = """
             SELECT COUNT(*) as cnt FROM catalog c
             WHERE c.friendly_token NOT IN (
@@ -306,6 +351,10 @@ class Database:
             )
         """
         params: list = []
+        if not show_hidden:
+            excl_sql, excl_params = _hidden_exclusion("c")
+            query += excl_sql
+            params.extend(excl_params)
         if category:
             query += """
                 AND c.friendly_token IN (
@@ -327,7 +376,7 @@ class Database:
         row = await self._fetch_one(query, params)
         return row["cnt"] if row else 0
 
-    async def search(self, query_text: str, *, page: int = 1, per_page: int = 24) -> list[dict]:
+    async def search(self, query_text: str, *, page: int = 1, per_page: int = 24, show_hidden: bool = False) -> list[dict]:
         sql = """
             SELECT c.friendly_token, c.title, c.duration_sec, c.cover_art_path, c.thumbnail_url, c.manifest_url,
                    rank AS relevance
@@ -339,12 +388,20 @@ class Database:
                   JOIN saved_playlists sp ON spi.playlist_id = sp.id
                   WHERE sp.is_immutable = 1 AND spi.media_type = 'cm'
               )
+        """
+        params: list = [query_text]
+        if not show_hidden:
+            excl_sql, excl_params = _hidden_exclusion("c")
+            sql += excl_sql
+            params.extend(excl_params)
+        sql += """
             ORDER BY rank
             LIMIT ? OFFSET ?
         """
-        return await self._fetch_all(sql, [query_text, per_page, (page - 1) * per_page])
+        params.extend([per_page, (page - 1) * per_page])
+        return await self._fetch_all(sql, params)
 
-    async def search_count(self, query_text: str) -> int:
+    async def search_count(self, query_text: str, *, show_hidden: bool = False) -> int:
         sql = """
             SELECT COUNT(*) as cnt
             FROM catalog_fts fts
@@ -356,7 +413,12 @@ class Database:
                   WHERE sp.is_immutable = 1 AND spi.media_type = 'cm'
               )
         """
-        row = await self._fetch_one(sql, [query_text])
+        params: list = [query_text]
+        if not show_hidden:
+            excl_sql, excl_params = _hidden_exclusion("c")
+            sql += excl_sql
+            params.extend(excl_params)
+        row = await self._fetch_one(sql, params)
         return row["cnt"] if row else 0
 
     async def get_item(self, friendly_token: str) -> dict | None:
@@ -409,7 +471,7 @@ class Database:
             "SELECT description FROM catalog WHERE friendly_token = ?", [friendly_token]
         )
         cats = await self._fetch_all(
-            "SELECT cat.name FROM categories cat "
+            "SELECT cat.name, cat.slug FROM categories cat "
             "JOIN catalog_categories cc ON cc.category_id = cat.id "
             "WHERE cc.friendly_token = ? ORDER BY cat.name",
             [friendly_token],
@@ -422,7 +484,7 @@ class Database:
         )
         return {
             "description": (row or {}).get("description"),
-            "categories": [c["name"] for c in cats],
+            "categories": [{"name": c["name"], "slug": c["slug"]} for c in cats],
             "tags": [t["name"] for t in tags],
         }
 
@@ -438,31 +500,43 @@ class Database:
         row = await self._fetch_one(sql, [friendly_token])
         return row is not None
 
-    async def get_categories(self) -> list[dict]:
+    async def get_categories(self, *, show_hidden: bool = False) -> list[dict]:
         """Distinct categories that have at least one catalog item, for facets."""
-        return await self._fetch_all(
-            """
+        sql = """
             SELECT c.id, c.name, c.slug, COUNT(cc.friendly_token) AS cnt
             FROM categories c
             JOIN catalog_categories cc ON cc.category_id = c.id
+        """
+        params: list = []
+        if not show_hidden:
+            ph = ",".join("?" * len(HIDDEN_CATEGORY_NAMES))
+            sql += f" WHERE c.name NOT IN ({ph})"
+            params.extend(HIDDEN_CATEGORY_NAMES)
+        sql += """
             GROUP BY c.id, c.name, c.slug
             ORDER BY c.name
-            """
-        )
+        """
+        return await self._fetch_all(sql, params)
 
-    async def get_tags(self, *, limit: int = 100) -> list[dict]:
+    async def get_tags(self, *, limit: int = 100, show_hidden: bool = False) -> list[dict]:
         """Most-used tags that have at least one catalog item, for facets."""
-        return await self._fetch_all(
-            """
+        sql = """
             SELECT t.id, t.name, COUNT(ct.friendly_token) AS cnt
             FROM tags t
             JOIN catalog_tags ct ON ct.tag_id = t.id
+        """
+        params: list = []
+        if not show_hidden:
+            ph = ",".join("?" * len(HIDDEN_TAG_NAMES))
+            sql += f" WHERE t.name NOT IN ({ph})"
+            params.extend(HIDDEN_TAG_NAMES)
+        sql += """
             GROUP BY t.id, t.name
             ORDER BY cnt DESC, t.name ASC
             LIMIT ?
-            """,
-            [limit],
-        )
+        """
+        params.append(limit)
+        return await self._fetch_all(sql, params)
 
     async def upsert_category(self, name: str) -> int:
         """Insert a category by name (deriving a unique slug) and return its id."""

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/queue/shadow.py

@@ -222,7 +222,7 @@ class QueueShadow:
                 try:
                     facets = await db.get_item_facets(np["friendly_token"])
                     np.setdefault("description", facets.get("description"))
-                    np["categories"] = facets.get("categories") or []
+                    np["categories"] = [c["name"] for c in (facets.get("categories") or [])]
                     np["tags"] = facets.get("tags") or []
                 except Exception:
                     logger.debug("Failed to enrich now-playing facets", exc_info=True)

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/routes/catalog.py

@@ -7,23 +7,25 @@ router = APIRouter(prefix="/catalog", tags=["catalog"])
 
 @router.get("/browse")
 async def browse(request: Request, category: str | None = None, tag: str | None = None,
-                 page: int = 1, user: dict = Depends(get_current_user)):
+                 page: int = 1, show_hidden: int = 0, user: dict = Depends(get_current_user)):
     """Browse catalog with optional category/tag filter."""
     db = request.app.state.db
-    items = await db.browse(category=category, tag=tag, page=page)
-    categories = await db.get_categories()
-    tags = await db.get_tags()
+    show_hidden = bool(show_hidden) and (user.get("rank") or 0) >= 3
+    items = await db.browse(category=category, tag=tag, page=page, show_hidden=show_hidden)
+    categories = await db.get_categories(show_hidden=show_hidden)
+    tags = await db.get_tags(show_hidden=show_hidden)
     return {"items": items, "categories": categories, "tags": tags, "page": page}
 
 
 @router.get("/search")
-async def search(request: Request, q: str = "", page: int = 1,
+async def search(request: Request, q: str = "", page: int = 1, show_hidden: int = 0,
                  user: dict = Depends(get_current_user)):
     """Full-text search of catalog."""
     if not q.strip():
         raise HTTPException(400, "Query required")
     db = request.app.state.db
-    items = await db.search(q, page=page)
+    show_hidden = bool(show_hidden) and (user.get("rank") or 0) >= 3
+    items = await db.search(q, page=page, show_hidden=show_hidden)
     return {"items": items, "query": q, "page": page}
 
 

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/routes/pages.py

@@ -41,16 +41,19 @@ async def login_page(request: Request):
 
 @router.get("/catalog/browse", response_class=HTMLResponse)
 async def catalog_browse_page(request: Request, category: str | None = None,
-                              tag: str | None = None, page: int = 1):
+                              tag: str | None = None, page: int = 1,
+                              show_hidden: int = 0):
     user = _get_user_or_none(request)
     if not user:
         return RedirectResponse("/auth/login")
     db = request.app.state.db
-    items = await db.browse(category=category, tag=tag, page=page)
-    total = await db.browse_count(category=category, tag=tag)
+    is_admin = (user.get("rank") or 0) >= 3
+    show_hidden = bool(show_hidden) and is_admin
+    items = await db.browse(category=category, tag=tag, page=page, show_hidden=show_hidden)
+    total = await db.browse_count(category=category, tag=tag, show_hidden=show_hidden)
     total_pages = max(1, (total + 23) // 24)
-    categories = await db.get_categories()
-    tags = await db.get_tags()
+    categories = await db.get_categories(show_hidden=show_hidden)
+    tags = await db.get_tags(show_hidden=show_hidden)
     return templates.TemplateResponse(request, "catalog/browse.html", {
         "user": user,
         "items": items,
@@ -61,22 +64,27 @@ async def catalog_browse_page(request: Request, category: str | None = None,
         "active_category": category,
         "active_tag": tag,
         "query": None,
+        "is_admin": is_admin,
+        "show_hidden": show_hidden,
     })
 
 
 @router.get("/catalog/search", response_class=HTMLResponse)
-async def catalog_search_page(request: Request, q: str = "", page: int = 1):
+async def catalog_search_page(request: Request, q: str = "", page: int = 1,
+                             show_hidden: int = 0):
     user = _get_user_or_none(request)
     if not user:
         return RedirectResponse("/auth/login")
     if not q.strip():
         return RedirectResponse("/catalog/browse")
     db = request.app.state.db
-    items = await db.search(q, page=page)
-    total = await db.search_count(q)
+    is_admin = (user.get("rank") or 0) >= 3
+    show_hidden = bool(show_hidden) and is_admin
+    items = await db.search(q, page=page, show_hidden=show_hidden)
+    total = await db.search_count(q, show_hidden=show_hidden)
     total_pages = max(1, (total + 23) // 24)
-    categories = await db.get_categories()
-    tags = await db.get_tags()
+    categories = await db.get_categories(show_hidden=show_hidden)
+    tags = await db.get_tags(show_hidden=show_hidden)
     return templates.TemplateResponse(request, "catalog/browse.html", {
         "user": user,
         "items": items,
@@ -87,6 +95,8 @@ async def catalog_search_page(request: Request, q: str = "", page: int = 1):
         "active_category": None,
         "active_tag": None,
         "query": q,
+        "is_admin": is_admin,
+        "show_hidden": show_hidden,
     })
 
 
@@ -109,9 +119,12 @@ async def catalog_item_page(request: Request, friendly_token: str):
         return templates.TemplateResponse(
             request, "catalog/item_not_found.html", {"user": user}, status_code=404
         )
+    facets = await db.get_item_facets(friendly_token)
     return templates.TemplateResponse(request, "catalog/item_detail.html", {
         "user": user,
         "item": item,
+        "categories": facets.get("categories") or [],
+        "tags": facets.get("tags") or [],
     })
 
 

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

@@ -16,6 +16,8 @@
     --radius: 8px;
     --shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
     --nav-height: 4rem;
+    --font-body: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    --font-heading: 'Sora', 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
 }
 
 * {
@@ -30,11 +32,20 @@ html {
 }
 
 body {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    font-family: var(--font-body);
     background: var(--bg-primary);
     color: var(--text-primary);
     line-height: 1.6;
     min-height: 100vh;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-rendering: optimizeLegibility;
+}
+
+h1, h2, h3, h4, h5, h6,
+.nav-brand a {
+    font-family: var(--font-heading);
+    letter-spacing: -0.01em;
 }
 
 a {
@@ -127,6 +138,18 @@ a:hover {
     align-items: center;
     flex-wrap: wrap;
 }
+.admin-hidden-notice {
+    margin-top: 0.85rem;
+    font-size: 0.85rem;
+    color: var(--text-secondary);
+    display: flex;
+    gap: 0.5rem;
+    align-items: center;
+    flex-wrap: wrap;
+}
+.admin-hidden-notice a {
+    font-weight: 600;
+}
 .search-form {
     display: flex;
     gap: 0.5rem;
@@ -507,12 +530,82 @@ a:hover {
     white-space: pre-line;
     overflow-wrap: anywhere;
 }
+/* Item detail: poster + buttons on the left, title/description/facets on right. */
+.item-detail-layout {
+    display: grid;
+    grid-template-columns: 300px minmax(0, 1fr);
+    gap: 2rem;
+    align-items: start;
+}
+@media (max-width: 700px) {
+    .item-detail-layout {
+        grid-template-columns: 1fr;
+    }
+}
+.item-detail-poster {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    position: sticky;
+    top: calc(var(--nav-height) + 1rem);
+}
+.item-detail-poster img,
+.item-detail-poster .card-poster-placeholder {
+    width: 100%;
+    aspect-ratio: 2 / 3;
+    object-fit: cover;
+    border-radius: var(--radius);
+    display: block;
+}
+.item-detail-actions {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+.item-detail-actions .btn {
+    width: 100%;
+}
+.item-detail-info {
+    min-width: 0;
+}
+.item-detail-title {
+    margin: 0;
+    line-height: 1.2;
+    overflow-wrap: anywhere;
+}
+.item-detail-meta {
+    margin-top: 0.35rem;
+    font-size: 0.85rem;
+    color: var(--text-secondary);
+}
 /* MediaCMS descriptions are newline-delimited plain text; preserve the line
    breaks (Synopsis / Tagline / Cast & Crew sections) instead of collapsing them. */
 .item-detail-description {
     white-space: pre-line;
     overflow-wrap: anywhere;
     line-height: 1.6;
+    margin-top: 0.75rem;
+    padding-top: 0.75rem;
+    border-top: 1px solid var(--border);
+}
+.item-detail-facet {
+    margin-top: 1rem;
+}
+.item-detail-facet-label {
+    display: block;
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--text-secondary);
+    margin-bottom: 0.4rem;
+}
+.item-detail-chips {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.4rem;
+}
+a.np-chip {
+    text-decoration: none;
 }
 .np-chips {
     display: flex;

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/templates/base.html

@@ -4,6 +4,9 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% block title %}Queue{% endblock %} — Channel-Z</title>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Sora:wght@600;700&display=swap">
     <link rel="stylesheet" href="/static/css/main.css">
     {% block head %}{% endblock %}
 </head>

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/templates/catalog/browse.html

@@ -25,6 +25,16 @@
             </select>
         </div>
     </div>
+    {% if is_admin %}
+    <div class="admin-hidden-notice">
+        <span>Certain items are hidden from results.</span>
+        {% if show_hidden %}
+            <a href="{{ request.url.remove_query_params('show_hidden') }}">Hide them again</a>
+        {% else %}
+            <a href="{{ request.url.include_query_params(show_hidden=1) }}">Show hidden items?</a>
+        {% endif %}
+    </div>
+    {% endif %}
 </div>
 
 <div class="catalog-grid">
@@ -55,7 +65,6 @@
         </div>
         <div class="card-actions">
             <button class="btn btn-sm btn-queue" onclick="queueItem('{{ item.friendly_token }}')">Queue</button>
-            <button class="btn btn-sm btn-playnext" onclick="playNext('{{ item.friendly_token }}')">Play Next</button>
             {% if user.rank >= 3 %}
             <button class="btn btn-sm btn-admin" onclick="queueAsAdmin('{{ item.friendly_token }}')">Queue as Admin</button>
             {% endif %}

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/kryten_webqueue/templates/catalog/item_detail.html

@@ -19,6 +19,13 @@
             {% else %}
                 <div class="card-poster-placeholder"><span>{{ item.title[:1] }}</span></div>
             {% endif %}
+
+            <div class="card-actions item-detail-actions">
+                <button class="btn btn-queue" onclick="queueItem('{{ item.friendly_token }}')">Queue</button>
+                {% if user.rank >= 3 %}
+                <button class="btn btn-admin" onclick="queueAsAdmin('{{ item.friendly_token }}')">Queue as Admin</button>
+                {% endif %}
+            </div>
         </div>
 
         <div class="item-detail-info">
@@ -35,13 +42,27 @@
                 <p class="item-detail-description empty-state">No description available.</p>
             {% endif %}
 
-            <div class="card-actions item-detail-actions">
-                <button class="btn btn-queue" onclick="queueItem('{{ item.friendly_token }}')">Queue</button>
-                <button class="btn btn-playnext" onclick="playNext('{{ item.friendly_token }}')">Play Next</button>
-                {% if user.rank >= 3 %}
-                <button class="btn btn-admin" onclick="queueAsAdmin('{{ item.friendly_token }}')">Queue as Admin</button>
-                {% endif %}
+            {% if categories %}
+            <div class="item-detail-facet">
+                <span class="item-detail-facet-label">Category</span>
+                <div class="item-detail-chips">
+                    {% for cat in categories %}
+                        <a class="np-chip np-chip-cat" href="/catalog/browse?category={{ cat.slug }}">{{ cat.name }}</a>
+                    {% endfor %}
+                </div>
             </div>
+            {% endif %}
+
+            {% if tags %}
+            <div class="item-detail-facet">
+                <span class="item-detail-facet-label">Tags</span>
+                <div class="item-detail-chips">
+                    {% for tag in tags %}
+                        <a class="np-chip np-chip-tag" href="/catalog/browse?tag={{ tag | urlencode }}">{{ tag }}</a>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
         </div>
     </div>
 </div>

{kryten_webqueue-0.7.3 → kryten_webqueue-0.7.5}/pyproject.toml

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