kryten-webqueue 0.40.1__tar.gz → 0.40.3__tar.gz

{kryten_webqueue-0.40.1 → kryten_webqueue-0.40.3}/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## [Unreleased]
 
+## [0.40.3] - 2026-08-21
+
+### Fixed
+
+- **Browse/search pagination no longer bounces back to page 1 when a non-default
+  duration or sort is active.** Pagination links omitted the `duration` filter
+  (and carried a stale `hide_short=0` param), so paging landed on a URL without
+  `duration`; the client-side preference-restore then re-applied the saved filter
+  via `applyFacets()`, which rebuilds the URL without `page` — sending the user
+  to page 1. Links now carry `duration`, and `restorePreferences()` skips any URL
+  that already has a `page` param so explicit pagination is never hijacked.
+
+## [0.40.2] - 2026-08-21
+
+### Changed
+
+- **Admin re-enrich returns `400` instead of `500` on an invalid job request.**
+  Both the `/edit` and `/re-enrich` routes now catch `ValueError` from
+  `catalog_enrich` param validation and surface it as `400 Bad Request` rather
+  than letting it become an unhandled 500 (defense against future
+  steps-schema drift).
+
 ## [0.40.1] - 2026-08-21
 
 ### Fixed

{kryten_webqueue-0.40.1 → kryten_webqueue-0.40.3}/PKG-INFO

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

{kryten_webqueue-0.40.1 → kryten_webqueue-0.40.3}/kryten_webqueue/routes/admin_catalog.py

@@ -156,15 +156,18 @@ async def enrich_item(
     if not item:
         raise HTTPException(404, "Catalog item not found")
     job_manager = request.app.state.job_manager
-    result = await job_manager.run(
-        "catalog_enrich",
-        params={
-            "tokens": friendly_token,
-            "force": "true",
-            "steps": "classify,identify,meta,art,tags",
-        },
-        triggered_by=user.get("username"),
-    )
+    try:
+        result = await job_manager.run(
+            "catalog_enrich",
+            params={
+                "tokens": friendly_token,
+                "force": "true",
+                "steps": "classify,identify,meta,art,tags",
+            },
+            triggered_by=user.get("username"),
+        )
+    except ValueError as exc:
+        raise HTTPException(400, f"Invalid enrichment request: {exc}") from exc
     return result
 
 
@@ -301,15 +304,18 @@ async def edit_item(
     # --- Optional re-enrichment trigger ---
     if body.get("re_enrich", False):
         job_manager = request.app.state.job_manager
-        result = await job_manager.run(
-            "catalog_enrich",
-            params={
-                "tokens": friendly_token,
-                "force": "true",
-                "steps": "classify,identify,meta,art,tags",
-            },
-            triggered_by=username,
-        )
+        try:
+            result = await job_manager.run(
+                "catalog_enrich",
+                params={
+                    "tokens": friendly_token,
+                    "force": "true",
+                    "steps": "classify,identify,meta,art,tags",
+                },
+                triggered_by=username,
+            )
+        except ValueError as exc:
+            raise HTTPException(400, f"Invalid enrichment request: {exc}") from exc
         enrich_job_id = result.get("run_id")
 
     return {

{kryten_webqueue-0.40.1 → kryten_webqueue-0.40.3}/kryten_webqueue/templates/catalog/browse.html

@@ -125,7 +125,7 @@
 </div>
 
 {% set sort_q = ('&sort=' ~ sort) if (sort and sort != 'default') else '' %}
-{% set hide_short_q = '' if hide_short else '&hide_short=0' %}
+{% set duration_q = ('&duration=' ~ duration) if (duration and duration != '10+') else '' %}
 {% set person_q = ('&person=' ~ active_person | urlencode) if active_person else '' %}
 {% set studio_q = ('&studio=' ~ active_studio | urlencode) if active_studio else '' %}
 {% if not items %}
@@ -168,7 +168,7 @@
 
 <div class="pagination">
     {% if page > 1 %}
-        <a href="?page={{ page - 1 }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ hide_short_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm">&larr; Prev</a>
+        <a href="?page={{ page - 1 }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ duration_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm">&larr; Prev</a>
     {% endif %}
 
     {% set start_page = [1, page - 2] | max %}
@@ -177,14 +177,14 @@
         {% if p == page %}
             <span class="page-num page-current">{{ p }}</span>
         {% else %}
-            <a href="?page={{ p }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ hide_short_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm btn-page">{{ p }}</a>
+            <a href="?page={{ p }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ duration_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm btn-page">{{ p }}</a>
         {% endif %}
     {% endfor %}
 
     <span class="page-info">of {{ total_pages }}</span>
 
     {% if page < total_pages %}
-        <a href="?page={{ page + 1 }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ hide_short_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm">Next &rarr;</a>
+        <a href="?page={{ page + 1 }}{% if query %}&q={{ query }}{% endif %}{% if active_category %}&category={{ active_category }}{% endif %}{% if active_tag %}&tag={{ active_tag | urlencode }}{% endif %}{{ sort_q }}{{ duration_q }}{{ person_q }}{{ studio_q }}" class="btn btn-sm">Next &rarr;</a>
     {% endif %}
 </div>
 {% endblock %}
@@ -229,7 +229,11 @@ function applyFacets() {
     const sortSel = document.getElementById('sort-select');
     const durationSel = document.getElementById('duration-select');
     const url = new URL(window.location.href);
-    
+
+    // Never hijack an explicit paginated navigation: applyFacets() drops the
+    // page, so restoring a saved pref here would bounce the user back to page 1.
+    if (url.searchParams.has('page')) return;
+
     // Restore sort preference
     if (sortSel && !url.searchParams.has('sort')) {
         let saved = null;

{kryten_webqueue-0.40.1 → kryten_webqueue-0.40.3}/pyproject.toml

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