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

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

@@ -4,12 +4,18 @@ 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.1] - 2026-06-08
+## [0.7.3] - 2026-06-08
+
+### Fixed
+
+- **Description line breaks now render.** MediaCMS stores descriptions as newline-delimited plain text (`Synopsis:` / `Tagline:` / `Cast & Crew:` sections separated by `\n`), but the catalog item-detail page collapsed those newlines into a single run-on paragraph. Both the item-detail description and the Now Playing card now use `white-space: pre-line` to preserve the line/paragraph breaks; the Now Playing card also normalizes legacy `\r\n` line endings.
+
+## [0.7.2] - 2026-06-08
 
 ### Changed
 
-- **Now Playing box redesign.** The title now spans the full card width, the cover renders as a 2:3 poster, the elapsed/total time and progress bar are stacked with **Remaining** shown as its own line under the bar, and a details section beneath the poster shows the item description plus category and tag chips. The now-playing payload is enriched with `description`, `categories`, and `tags` from the catalog.
-- **"Hide Previous" now defaults to ON** on the Queue page, so the view opens focused on what's still to come.
+- **Now Playing card redesigned for readability.** The card is now a vertical stack: the title spans the full width across the top (with a divider), then a row pairs a 2:3 poster with the time display, the progress bar, and the **Remaining** time directly under the bar. Below that, the item **description** and **category/tag chips** are shown when available. The now-playing state is enriched server-side with the catalog description and category/tag names for the playing item.
+- **"Hide Previous" now defaults to on** so the Queue page opens focused on what's still to come.
 
 ## [0.7.0] - 2026-06-08
 

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

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

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

@@ -374,31 +374,6 @@ class Database:
     async def get_item_admin(self, friendly_token: str) -> dict | None:
         return await self._fetch_one("SELECT * FROM catalog WHERE friendly_token = ?", [friendly_token])
 
-    async def get_item_facets(self, friendly_token: str) -> dict:
-        """Return category and tag names for a single catalog item."""
-        cats = await self._fetch_all(
-            """
-            SELECT cat.name FROM catalog_categories cc
-            JOIN categories cat ON cc.category_id = cat.id
-            WHERE cc.friendly_token = ?
-            ORDER BY cat.name
-            """,
-            [friendly_token],
-        )
-        tags = await self._fetch_all(
-            """
-            SELECT t.name FROM catalog_tags ct
-            JOIN tags t ON ct.tag_id = t.id
-            WHERE ct.friendly_token = ?
-            ORDER BY t.name
-            """,
-            [friendly_token],
-        )
-        return {
-            "categories": [c["name"] for c in cats],
-            "tags": [t["name"] for t in tags],
-        }
-
     async def get_catalog_brief(self, tokens: list[str], manifest_urls: list[str]) -> dict[str, dict]:
         """Return a lookup of catalog metadata keyed by BOTH friendly_token and
         manifest_url, for enriching queue-shadow items that may only carry one.
@@ -408,7 +383,7 @@ class Database:
             return {}
         placeholders = ",".join("?" * len(keys))
         rows = await self._fetch_all(
-            "SELECT friendly_token, manifest_url, title, description, duration_sec, "
+            "SELECT friendly_token, manifest_url, title, duration_sec, "
             "cover_art_path, thumbnail_url FROM catalog "
             f"WHERE friendly_token IN ({placeholders}) OR manifest_url IN ({placeholders})",
             keys + keys,
@@ -422,6 +397,35 @@ class Database:
                 lookup[data["manifest_url"]] = data
         return lookup
 
+    async def get_item_facets(self, friendly_token: str) -> dict:
+        """Return description + category/tag names for a single catalog item.
+
+        Used to enrich the now-playing card. Returns empty values when the
+        token is unknown.
+        """
+        if not friendly_token:
+            return {"description": None, "categories": [], "tags": []}
+        row = await self._fetch_one(
+            "SELECT description FROM catalog WHERE friendly_token = ?", [friendly_token]
+        )
+        cats = await self._fetch_all(
+            "SELECT cat.name FROM categories cat "
+            "JOIN catalog_categories cc ON cc.category_id = cat.id "
+            "WHERE cc.friendly_token = ? ORDER BY cat.name",
+            [friendly_token],
+        )
+        tags = await self._fetch_all(
+            "SELECT t.name FROM tags t "
+            "JOIN catalog_tags ct ON ct.tag_id = t.id "
+            "WHERE ct.friendly_token = ? ORDER BY t.name",
+            [friendly_token],
+        )
+        return {
+            "description": (row or {}).get("description"),
+            "categories": [c["name"] for c in cats],
+            "tags": [t["name"] for t in tags],
+        }
+
     async def is_restricted(self, friendly_token: str) -> bool:
         sql = """
             SELECT 1 FROM saved_playlist_items spi

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

@@ -201,8 +201,6 @@ class QueueShadow:
             if meta:
                 np.setdefault("cover_art_path", meta.get("cover_art_path"))
                 np.setdefault("thumbnail_url", meta.get("thumbnail_url"))
-                if not np.get("description"):
-                    np["description"] = meta.get("description")
                 if not np.get("friendly_token"):
                     np["friendly_token"] = meta.get("friendly_token")
             # Ensure now-playing carries a playlist uid so the frontend can
@@ -219,15 +217,15 @@ class QueueShadow:
                         ):
                             np["uid"] = it.get("uid")
                             break
-            # Attach category/tag facets for the now-playing detail panel.
-            ft = np.get("friendly_token")
-            if ft:
+            # Attach description + category/tag names for the now-playing card.
+            if np.get("friendly_token"):
                 try:
-                    facets = await db.get_item_facets(ft)
+                    facets = await db.get_item_facets(np["friendly_token"])
+                    np.setdefault("description", facets.get("description"))
                     np["categories"] = facets.get("categories") or []
                     np["tags"] = facets.get("tags") or []
                 except Exception:
-                    logger.debug("Failed to load now-playing facets", exc_info=True)
+                    logger.debug("Failed to enrich now-playing facets", exc_info=True)
             state["now_playing"] = np
 
         return state

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

@@ -325,27 +325,26 @@ a:hover {
     border: 1px solid var(--accent);
     box-shadow: 0 0 0 1px rgba(108, 92, 231, 0.25), 0 6px 18px rgba(108, 92, 231, 0.18);
 }
-/* Title spans the full card width. */
+/* Title spans the full width of the card. */
 .np-title {
     margin: 0;
     font-size: 1.4rem;
     line-height: 1.25;
     overflow-wrap: anywhere;
-    border-bottom: 1px solid var(--border);
     padding-bottom: 0.75rem;
+    border-bottom: 1px solid var(--border);
 }
-/* Poster (2:3) on the left, playback info on the right. */
+/* Image + time display sit side by side. */
 .np-body {
     display: flex;
     gap: 1.25rem;
-    align-items: stretch;
+    align-items: flex-start;
 }
-.np-playback {
+.np-info {
     flex: 1;
     min-width: 0;
     display: flex;
     flex-direction: column;
-    justify-content: flex-start;
     gap: 0.5rem;
 }
 .np-progress {
@@ -360,43 +359,9 @@ a:hover {
     transition: width 1s linear;
 }
 .np-time {
-    font-size: 0.95rem;
+    font-size: 1rem;
     color: var(--text-primary);
-}
-/* Details below the poster/time row: category + tag chips, then description. */
-.np-details {
-    border-top: 1px solid var(--border);
-    padding-top: 0.75rem;
-    display: flex;
-    flex-direction: column;
-    gap: 0.6rem;
-}
-.np-facets {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0.4rem;
-}
-.np-chip {
-    font-size: 0.7rem;
-    padding: 0.15rem 0.5rem;
-    border-radius: 999px;
-    white-space: nowrap;
-}
-.np-chip-cat {
-    background: var(--accent);
-    color: #fff;
-}
-.np-chip-tag {
-    background: var(--bg-elevated, #2a2a38);
-    color: var(--text-secondary);
-    border: 1px solid var(--border);
-}
-.np-description {
-    font-size: 0.85rem;
-    line-height: 1.5;
-    color: var(--text-secondary);
-    margin: 0;
-    overflow-wrap: anywhere;
+    font-variant-numeric: tabular-nums;
 }
 
 .queue-list {
@@ -524,18 +489,51 @@ a:hover {
     color: var(--text-secondary);
 }
 .np-meta {
+    font-size: 0.85rem;
+    color: var(--text-secondary);
+}
+.np-remaining {
     font-size: 0.9rem;
     color: var(--text-secondary);
-    margin: 0.25rem 0;
+    font-variant-numeric: tabular-nums;
 }
-.np-times {
+/* Description + category/tag chips sit below the image / time row. */
+.np-description {
     font-size: 0.9rem;
-    white-space: nowrap;
+    line-height: 1.5;
+    color: var(--text-secondary);
+    padding-top: 0.75rem;
+    border-top: 1px solid var(--border);
+    white-space: pre-line;
+    overflow-wrap: anywhere;
 }
-.np-remaining {
-    font-size: 0.85rem;
+/* 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;
+}
+.np-chips {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 0.4rem;
+}
+.np-chip {
+    font-size: 0.72rem;
+    padding: 0.2rem 0.55rem;
+    border-radius: 999px;
+    line-height: 1.3;
+}
+.np-chip-cat {
+    background: rgba(108, 92, 231, 0.22);
+    color: var(--text-primary);
+    border: 1px solid var(--accent);
+}
+.np-chip-tag {
+    background: var(--bg-elevated, #2a2a38);
     color: var(--text-secondary);
-    margin-top: 0.1rem;
+    border: 1px solid var(--border);
 }
 
 /* WebSocket status */

{kryten_webqueue-0.7.1 → kryten_webqueue-0.7.3}/kryten_webqueue/templates/queue/index.html

@@ -15,7 +15,7 @@
         <div class="queue-section-header">
             <h2>Up Next</h2>
             <label class="toggle-switch" title="Hide items before the currently playing one">
-                <input type="checkbox" id="hide-previous-toggle" checked onchange="toggleHidePrevious(this.checked)">
+                <input type="checkbox" id="hide-previous-toggle" onchange="toggleHidePrevious(this.checked)" checked>
                 <span class="toggle-slider"></span>
                 <span>Hide Previous</span>
             </label>
@@ -104,31 +104,25 @@ function renderQueue(state) {
         const pct = total > 0 ? (elapsed / total * 100) : 0;
         const cats = Array.isArray(np.categories) ? np.categories : [];
         const tags = Array.isArray(np.tags) ? np.tags : [];
-        const facetHtml = [
+        const chips = [
             ...cats.map(c => `<span class="np-chip np-chip-cat">${escapeHtml(c)}</span>`),
             ...tags.map(t => `<span class="np-chip np-chip-tag">${escapeHtml(t)}</span>`),
         ].join('');
-        const desc = (np.description || '').trim();
         npEl.innerHTML = `
             <h3 class="np-title">${escapeHtml(np.title || 'Unknown')}</h3>
-            ${np.paid_by ? `<div class="np-meta"><span class="np-user">Queued by ${escapeHtml(np.paid_by)}</span></div>` : ''}
             <div class="np-body">
                 <div class="np-cover">${coverHtml(np)}</div>
-                <div class="np-playback">
-                    <div class="np-times">
-                        <span class="np-time">${formatTime(elapsed)} / ${formatTime(total)}</span>
-                    </div>
+                <div class="np-info">
+                    ${np.paid_by ? `<div class="np-meta"><span class="np-user">Queued by ${escapeHtml(np.paid_by)}</span></div>` : ''}
+                    <div class="np-time">${formatTime(elapsed)} / ${formatTime(total)}</div>
                     <div class="np-progress">
                         <div class="progress-bar" style="width: ${pct}%"></div>
                     </div>
                     <div class="np-remaining">${formatTime(remaining)} remaining</div>
                 </div>
             </div>
-            ${(desc || facetHtml) ? `
-            <div class="np-details">
-                ${facetHtml ? `<div class="np-facets">${facetHtml}</div>` : ''}
-                ${desc ? `<p class="np-description">${escapeHtml(desc)}</p>` : ''}
-            </div>` : ''}
+            ${np.description ? `<div class="np-description">${escapeHtml(String(np.description).replace(/\r\n?/g, '\n'))}</div>` : ''}
+            ${chips ? `<div class="np-chips">${chips}</div>` : ''}
         `;
     } else {
         npEl.innerHTML = '<p class="empty-state">Nothing playing</p>';

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

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