kryten-webqueue 0.40.2__tar.gz → 0.40.4__tar.gz

{kryten_webqueue-0.40.2 → kryten_webqueue-0.40.4}/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## [Unreleased]
 
+## [0.40.4] - 2026-08-21
+
+### Added
+
+- **Keyboard pagination on browse/search pages.** The Left and Right arrow keys
+  now navigate to the previous/next page of results. Keys are ignored while
+  typing in a field or when a modal is open, and fall through to the browser's
+  default behaviour on the first/last page. Backed by a new global
+  `keybindings.js` registry (`Keybindings.register`/`unregister`) so future
+  shortcuts can be added without re-implementing the "don't steal keys while
+  typing" guard.
+
+## [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

{kryten_webqueue-0.40.2 → kryten_webqueue-0.40.4}/PKG-INFO

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

kryten_webqueue-0.40.4/kryten_webqueue/static/js/keybindings.js

@@ -0,0 +1,59 @@
+/* kryten-webqueue — Keyboard shortcuts
+ *
+ * A tiny global registry so pages can bind keys without each re-implementing
+ * "ignore keystrokes while the user is typing / a modal is open" logic.
+ *
+ * Usage:
+ *   Keybindings.register('ArrowRight', () => { ... });   // return false to fall through
+ *   Keybindings.unregister('ArrowRight');
+ *
+ * Key strings are modifier-prefixed and use the raw KeyboardEvent.key value,
+ * e.g. 'ArrowLeft', 'ctrl+k', 'shift+/'.
+ */
+(function () {
+    const bindings = new Map();
+
+    function isEditableTarget(el) {
+        if (!el) return false;
+        const tag = el.tagName;
+        if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return true;
+        return !!el.isContentEditable;
+    }
+
+    function keyFromEvent(e) {
+        const parts = [];
+        if (e.ctrlKey) parts.push('ctrl');
+        if (e.altKey) parts.push('alt');
+        if (e.shiftKey) parts.push('shift');
+        if (e.metaKey) parts.push('meta');
+        parts.push(e.key);
+        return parts.join('+');
+    }
+
+    function onKeyDown(e) {
+        // Never steal keys while typing in a field.
+        if (isEditableTarget(document.activeElement)) return;
+        // Leave an open modal to its own keyboard handling.
+        if (document.querySelector('.modal-overlay')) return;
+
+        const handler = bindings.get(keyFromEvent(e));
+        if (!handler) return;
+
+        // Handlers return false to decline (e.g. no target to act on), in which
+        // case we leave the browser's default behaviour intact.
+        if (handler(e) !== false) {
+            e.preventDefault();
+        }
+    }
+
+    document.addEventListener('keydown', onKeyDown);
+
+    window.Keybindings = {
+        register(key, handler) {
+            bindings.set(key, handler);
+        },
+        unregister(key) {
+            bindings.delete(key);
+        },
+    };
+})();

{kryten_webqueue-0.40.2 → kryten_webqueue-0.40.4}/kryten_webqueue/templates/base.html

@@ -61,6 +61,7 @@
     </footer>
 
     <script src="/static/js/main.js"></script>
+    <script src="/static/js/keybindings.js"></script>
     {% block scripts %}{% endblock %}
 </body>
 </html>

{kryten_webqueue-0.40.2 → kryten_webqueue-0.40.4}/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 id="pagination-prev" 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 id="pagination-next" 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;
@@ -471,6 +475,22 @@ async function clearPlayed(token) {
 }
 // queueItem / playNext / queueAsAdmin / showToast / escapeHtml are provided by /static/js/main.js
 initWatchlistButtons();
+
+// Left/Right arrows page through browse/search results. Handlers decline
+// (return false) when there's no prev/next link so the browser keeps its
+// default arrow behaviour on the first/last page.
+if (window.Keybindings) {
+    Keybindings.register('ArrowLeft', () => {
+        const prev = document.getElementById('pagination-prev');
+        if (!prev) return false;
+        window.location.href = prev.href;
+    });
+    Keybindings.register('ArrowRight', () => {
+        const next = document.getElementById('pagination-next');
+        if (!next) return false;
+        window.location.href = next.href;
+    });
+}
 </script>
 
 {% include "catalog/edit_item_modal.html" %}

{kryten_webqueue-0.40.2 → kryten_webqueue-0.40.4}/pyproject.toml

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