d

cmdlet/search_store.py

@@ -1,7 +1,7 @@
 """Search-store cmdlet: Search for files in storage backends (Folder, Hydrus)."""
 from __future__ import annotations
 
-from typing import Any, Dict, Sequence, List, Optional, Tuple
+from typing import Any, Dict, Sequence, List, Optional
 from pathlib import Path
 from collections import OrderedDict
 import re
@@ -10,7 +10,7 @@ import sys
 
 from SYS.logger import log, debug
 
-from ._shared import Cmdlet, CmdletArg, get_field, should_show_help, normalize_hash, first_title_tag
+from ._shared import Cmdlet, CmdletArg, SharedArgs, get_field, should_show_help, normalize_hash, first_title_tag
 import pipeline as ctx
 
 
@@ -24,21 +24,16 @@ class Search_Store(Cmdlet):
         super().__init__(
             name="search-store",
             summary="Search storage backends (Folder, Hydrus) for files.",
-            usage="search-store [query] [-tag TAG] [-size >100MB|<50MB] [-type audio|video|image] [-duration >10:00] [-store BACKEND]",
+            usage="search-store [query] [-store BACKEND] [-limit N]",
             arg=[
                 CmdletArg("query", description="Search query string"),
-                CmdletArg("tag", description="Filter by tag (can be used multiple times)"),
-                CmdletArg("size", description="Filter by size: >100MB, <50MB, =10MB"),
-                CmdletArg("type", description="Filter by type: audio, video, image, document"),
-                CmdletArg("duration", description="Filter by duration: >10:00, <1:30:00"),
                 CmdletArg("limit", type="integer", description="Limit results (default: 100)"),
-                CmdletArg("store", description="Search specific storage backend (e.g., 'home', 'test', or 'default')"),
+                SharedArgs.STORE,
             ],
             detail=[
                 "Search across storage backends: Folder stores and Hydrus instances",
                 "Use -store to search a specific backend by name",
                 "URL search: url:* (any URL) or url:<value> (URL substring)",
-                "Filter results by: tag, size, type, duration",
                 "Results include hash for downstream commands (get-file, add-tag, etc.)",
                 "Examples:",
                 "search-store foo                          # Search all storage backends",
@@ -46,8 +41,6 @@ class Search_Store(Cmdlet):
                 "search-store -store test 'video'          # Search 'test' folder store",
                 "search-store 'url:*'                      # Files that have any URL",
                 "search-store 'url:youtube.com'            # Files whose URL contains substring",
-                "search-store song -type audio             # Search for audio files",
-                "search-store movie -tag action            # Search with tag filter",
             ],
             exec=self.run,
         )
@@ -136,12 +129,14 @@ class Search_Store(Cmdlet):
 
         args_list = [str(arg) for arg in (args or [])]
 
+        # Build dynamic flag variants from cmdlet arg definitions.
+        # This avoids hardcoding flag spellings in parsing loops.
+        flag_registry = self.build_flag_registry()
+        store_flags = {f.lower() for f in (flag_registry.get("store") or {"-store", "--store"})}
+        limit_flags = {f.lower() for f in (flag_registry.get("limit") or {"-limit", "--limit"})}
+
         # Parse arguments
         query = ""
-        _tag_filters: List[str] = []
-        _size_filter: Optional[Tuple[str, int]] = None
-        _duration_filter: Optional[Tuple[str, float]] = None
-        _type_filter: Optional[str] = None
         storage_backend: Optional[str] = None
         limit = 100
         searched_backends: List[str] = []
@@ -150,21 +145,15 @@ class Search_Store(Cmdlet):
         while i < len(args_list):
             arg = args_list[i]
             low = arg.lower()
-            if low in {"-store", "--store"} and i + 1 < len(args_list):
+            if low in store_flags and i + 1 < len(args_list):
                 storage_backend = args_list[i + 1]
                 i += 2
-            elif low in {"-tag", "--tag"} and i + 1 < len(args_list):
-                _tag_filters.append(args_list[i + 1])
-                i += 2
-            elif low in {"-limit", "--limit"} and i + 1 < len(args_list):
+            elif low in limit_flags and i + 1 < len(args_list):
                 try:
                     limit = int(args_list[i + 1])
                 except ValueError:
                     limit = 100
                 i += 2
-            elif low in {"-type", "--type"} and i + 1 < len(args_list):
-                _type_filter = args_list[i + 1].lower()
-                i += 2
             elif not arg.startswith("-"):
                 query = f"{query} {arg}".strip() if query else arg
                 i += 1
@@ -268,12 +257,16 @@ class Search_Store(Cmdlet):
 
                         # Resolve a path/URL string if possible
                         path_str: Optional[str] = None
+                        # IMPORTANT: avoid calling get_file() for remote backends.
+                        # For Hydrus, get_file() returns a browser URL (and may include access keys),
+                        # which should not be pulled during search/refresh.
                         try:
-                            maybe_path = resolved_backend.get_file(h)
-                            if isinstance(maybe_path, Path):
-                                path_str = str(maybe_path)
-                            elif isinstance(maybe_path, str) and maybe_path:
-                                path_str = maybe_path
+                            if type(resolved_backend).__name__ == "Folder":
+                                maybe_path = resolved_backend.get_file(h)
+                                if isinstance(maybe_path, Path):
+                                    path_str = str(maybe_path)
+                                elif isinstance(maybe_path, str) and maybe_path:
+                                    path_str = maybe_path
                         except Exception:
                             path_str = None