pax/booru-viewer
1
0
Fork 0
Code Issues Releases 18 Activity

Fix infinite scroll: stop at end, no page turn on arrow keys

Browse Source 
- Track exhausted state — stop fetching when API has no more results
- Disable nav_past_end/nav_before_start in infinite scroll mode
- Disable page turn from _navigate_preview in infinite scroll mode
- Show "(end)" in status bar when all results loaded
- Reset exhausted flag on new search
This commit is contained in:
pax 2026-04-05 14:17:16 -05:00
parent adef0fc86c
commit 6b2c42a239
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
booru_viewer/gui/app.py
View File

@ -547,7 +547,8 @@ class BooruApp(QMainWindow):
self._current_tags = tags self._current_tags = tags
self._current_page = 1 self._current_page = 1
self._shown_post_ids = set() self._shown_post_ids = set()
self._page_cache = {} # page_num -> list[Post] self._page_cache = {}
self._infinite_exhausted = False # page_num -> list[Post]
self._min_score = self._score_spin.value() self._min_score = self._score_spin.value()
self._do_search() self._do_search()
@ -569,16 +570,20 @@ class BooruApp(QMainWindow):
self._do_search() self._do_search()
def _on_nav_past_end(self) -> None: def _on_nav_past_end(self) -> None:
if self._infinite_scroll:
return # infinite scroll handles this via reached_bottom
self._nav_page_turn = "first" self._nav_page_turn = "first"
self._next_page() self._next_page()
def _on_nav_before_start(self) -> None: def _on_nav_before_start(self) -> None:
if self._infinite_scroll:
return
if self._current_page > 1: if self._current_page > 1:
self._nav_page_turn = "last" self._nav_page_turn = "last"
self._prev_page() self._prev_page()
def _on_reached_bottom(self) -> None: def _on_reached_bottom(self) -> None:
if not self._infinite_scroll or self._loading: if not self._infinite_scroll or self._loading or getattr(self, '_infinite_exhausted', False):
return return
self._loading = True self._loading = True
self._current_page += 1 self._current_page += 1
@ -811,6 +816,8 @@ class BooruApp(QMainWindow):
"""Append more posts to the grid (infinite scroll).""" """Append more posts to the grid (infinite scroll)."""
if not posts: if not posts:
self._loading = False self._loading = False
self._infinite_exhausted = True
self._status.showMessage(f"{len(self._posts)} results (end)")
return return
self._shown_post_ids.update(p.id for p in posts) self._shown_post_ids.update(p.id for p in posts)
start = len(self._posts) start = len(self._posts)
@ -1180,10 +1187,10 @@ class BooruApp(QMainWindow):
if 0 <= idx < len(self._posts): if 0 <= idx < len(self._posts):
self._grid._select(idx) self._grid._select(idx)
self._on_post_activated(idx) self._on_post_activated(idx)
elif idx >= len(self._posts) and direction > 0 and len(self._posts) > 0: elif idx >= len(self._posts) and direction > 0 and len(self._posts) > 0 and not self._infinite_scroll:
self._nav_page_turn = "first" self._nav_page_turn = "first"
self._next_page() self._next_page()
elif idx < 0 and direction < 0 and self._current_page > 1: elif idx < 0 and direction < 0 and self._current_page > 1 and not self._infinite_scroll:
self._nav_page_turn = "last" self._nav_page_turn = "last"
self._prev_page() self._prev_page()