d

cmdlet/check_file_status.py

@@ -8,14 +8,16 @@ from SYS.logger import log
 
 from API import HydrusNetwork as hydrus_wrapper
 from ._shared import Cmdlet, CmdletArg, SharedArgs, normalize_hash, should_show_help
+from Store import Store
 
 
 CMDLET = Cmdlet(
     name="check-file-status",
     summary="Check if a file is active, deleted, or corrupted in Hydrus.",
-    usage="check-file-status [-hash <sha256>]",
+    usage="check-file-status [-hash <sha256>] [-store <name>]",
     arg=[
         SharedArgs.HASH,
+        SharedArgs.STORE,
     ],
     detail=[
         "- Shows whether file is active in Hydrus or marked as deleted",
@@ -34,6 +36,7 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
 
     # Parse arguments
     override_hash: str | None = None
+    override_store: str | None = None
     i = 0
     while i < len(args):
         token = args[i]
@@ -42,24 +45,57 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
             override_hash = str(args[i + 1]).strip()
             i += 2
             continue
+        if low in {"-store", "--store", "store"} and i + 1 < len(args):
+            override_store = str(args[i + 1]).strip()
+            i += 2
+            continue
         i += 1
 
-    hash_hex = normalize_hash(override_hash) if override_hash else normalize_hash(getattr(result, "hash_hex", None))
+    store_name: str | None = override_store
+    if not store_name:
+        if isinstance(result, dict):
+            store_name = str(result.get("store") or "").strip() or None
+        else:
+            store_name = str(getattr(result, "store", "") or "").strip() or None
+
+    if override_hash:
+        hash_hex = normalize_hash(override_hash)
+    else:
+        if isinstance(result, dict):
+            hash_hex = normalize_hash(result.get("hash") or result.get("hash_hex"))
+        else:
+            hash_hex = normalize_hash(getattr(result, "hash", None) or getattr(result, "hash_hex", None))
     
     if not hash_hex:
         log("No hash provided and no result selected", file=sys.stderr)
         return 1
 
     try:
-        client = hydrus_wrapper.get_client(config)
+        client = None
+        if store_name:
+            # Store specified: do not fall back to a global/default Hydrus client.
+            try:
+                store = Store(config)
+                backend = store[str(store_name)]
+                candidate = getattr(backend, "_client", None)
+                if candidate is not None and hasattr(candidate, "fetch_file_metadata"):
+                    client = candidate
+            except Exception:
+                client = None
+
+            if client is None:
+                log(f"Hydrus client unavailable for store '{store_name}'", file=sys.stderr)
+                return 1
+        else:
+            client = hydrus_wrapper.get_client(config)
+
+        if client is None:
+            log("Hydrus client unavailable", file=sys.stderr)
+            return 1
     except Exception as exc:
         log(f"Hydrus client unavailable: {exc}", file=sys.stderr)
         return 1
 
-    if client is None:
-        log("Hydrus client unavailable", file=sys.stderr)
-        return 1
-
     try:
         result_data = client.fetch_file_metadata(hashes=[hash_hex])
         if not result_data.get("metadata"):