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

Animated filter: server-side tag only, remove client-side scanning

Browse Source 
Uses 'animated' as a search tag (server handles it). Removed
client-side extension filter and backfill cap increases. Fast
and doesn't hit rate limits.
This commit is contained in:
pax 2026-04-05 19:20:25 -05:00
parent d22547ad34
commit c93cd9b97c
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
booru_viewer/gui/app.py
View File

@ -624,16 +624,12 @@ class BooruApp(QMainWindow):
bl_tags = set(self._db.get_blacklisted_tags()) bl_tags = set(self._db.get_blacklisted_tags())
bl_posts = self._db.get_blacklisted_posts() bl_posts = self._db.get_blacklisted_posts()
shown_ids = getattr(self, '_shown_post_ids', set()).copy() shown_ids = getattr(self, '_shown_post_ids', set()).copy()
animated_only = self._animated_only.isChecked()
_ANIM_EXTS = {".gif", ".mp4", ".webm", ".mkv", ".mov", ".avi", ".zip"}
def _filter(posts): def _filter(posts):
if bl_tags: if bl_tags:
posts = [p for p in posts if not bl_tags.intersection(p.tag_list)] posts = [p for p in posts if not bl_tags.intersection(p.tag_list)]
if bl_posts: if bl_posts:
posts = [p for p in posts if p.file_url not in bl_posts] posts = [p for p in posts if p.file_url not in bl_posts]
if animated_only:
posts = [p for p in posts if Path(p.file_url.split("?")[0]).suffix.lower() in _ANIM_EXTS]
posts = [p for p in posts if p.id not in shown_ids] posts = [p for p in posts if p.id not in shown_ids]
return posts return posts
@ -642,16 +638,12 @@ class BooruApp(QMainWindow):
try: try:
collected = [] collected = []
current_page = page current_page = page
max_pages = 50 if animated_only else 5 max_pages = 5
for _ in range(max_pages): for _ in range(max_pages):
batch = await client.search(tags=search_tags, page=current_page, limit=limit) batch = await client.search(tags=search_tags, page=current_page, limit=limit)
if not batch:
break
filtered = _filter(batch) filtered = _filter(batch)
collected.extend(filtered) collected.extend(filtered)
if len(collected) >= limit: if len(collected) >= limit or len(batch) < limit:
break
if len(batch) < limit and not animated_only:
break break
current_page += 1 current_page += 1
self._signals.search_append.emit(collected[:limit]) self._signals.search_append.emit(collected[:limit])
@ -724,6 +716,10 @@ class BooruApp(QMainWindow):
if self._min_score > 0: if self._min_score > 0:
parts.append(f"score:>={self._min_score}") parts.append(f"score:>={self._min_score}")
# Animated filter
if self._animated_only.isChecked():
parts.append("animated")
return " ".join(parts) return " ".join(parts)
def _do_search(self) -> None: def _do_search(self) -> None:
@ -745,16 +741,12 @@ class BooruApp(QMainWindow):
bl_tags = set(self._db.get_blacklisted_tags()) bl_tags = set(self._db.get_blacklisted_tags())
bl_posts = self._db.get_blacklisted_posts() bl_posts = self._db.get_blacklisted_posts()
shown_ids = getattr(self, '_shown_post_ids', set()).copy() shown_ids = getattr(self, '_shown_post_ids', set()).copy()
animated_only = self._animated_only.isChecked()
_ANIM_EXTS = {".gif", ".mp4", ".webm", ".mkv", ".mov", ".avi", ".zip"}
def _filter(posts): def _filter(posts):
if bl_tags: if bl_tags:
posts = [p for p in posts if not bl_tags.intersection(p.tag_list)] posts = [p for p in posts if not bl_tags.intersection(p.tag_list)]
if bl_posts: if bl_posts:
posts = [p for p in posts if p.file_url not in bl_posts] posts = [p for p in posts if p.file_url not in bl_posts]
if animated_only:
posts = [p for p in posts if Path(p.file_url.split("?")[0]).suffix.lower() in _ANIM_EXTS]
# Skip posts already shown on previous pages # Skip posts already shown on previous pages
posts = [p for p in posts if p.id not in shown_ids] posts = [p for p in posts if p.id not in shown_ids]
return posts return posts
@ -764,18 +756,14 @@ class BooruApp(QMainWindow):
try: try:
collected = [] collected = []
current_page = page current_page = page
max_pages = 50 if animated_only else 5 max_pages = 5
for _ in range(max_pages): for _ in range(max_pages):
batch = await client.search(tags=search_tags, page=current_page, limit=limit) batch = await client.search(tags=search_tags, page=current_page, limit=limit)
if not batch:
break # API returned nothing — end of results
filtered = _filter(batch) filtered = _filter(batch)
collected.extend(filtered) collected.extend(filtered)
log.debug(f"Backfill: page={current_page} batch={len(batch)} filtered={len(filtered)} total={len(collected)}/{limit}") log.debug(f"Backfill: page={current_page} batch={len(batch)} filtered={len(filtered)} total={len(collected)}/{limit}")
if len(collected) >= limit: if len(collected) >= limit or len(batch) < limit:
break break
if len(batch) < limit and not animated_only:
break # short page = end (skip for animated — keep scanning)
current_page += 1 current_page += 1
self._signals.search_done.emit(collected[:limit]) self._signals.search_done.emit(collected[:limit])
except Exception as e: except Exception as e: