d

cmdlet/delete_file.py

@@ -7,6 +7,7 @@ from pathlib import Path
 
 from SYS.logger import debug, log
 from Store.Folder import Folder
+from Store import Store
 from ._shared import Cmdlet, CmdletArg, normalize_hash, looks_like_hash, get_field, should_show_help
 from API import HydrusNetwork as hydrus_wrapper
 import pipeline as ctx
@@ -119,30 +120,48 @@ class Delete_File(Cmdlet):
             should_try_hydrus = False
             
         if should_try_hydrus and hash_hex:
-            try:
-                client = hydrus_wrapper.get_client(config)
-            except Exception as exc:
-                if not local_deleted:
-                    log(f"Hydrus client unavailable: {exc}", file=sys.stderr)
-                    return False
+            client = None
+            if store:
+                # Store specified: do not fall back to a global/default Hydrus client.
+                try:
+                    registry = Store(config)
+                    backend = registry[str(store)]
+                    candidate = getattr(backend, "_client", None)
+                    if candidate is not None and hasattr(candidate, "_post"):
+                        client = candidate
+                except Exception as exc:
+                    if not local_deleted:
+                        log(f"Hydrus client unavailable for store '{store}': {exc}", file=sys.stderr)
+                        return False
+                if client is None:
+                    if not local_deleted:
+                        log(f"Hydrus client unavailable for store '{store}'", file=sys.stderr)
+                        return False
             else:
+                # No store context; use default Hydrus client.
+                try:
+                    client = hydrus_wrapper.get_client(config)
+                except Exception as exc:
+                    if not local_deleted:
+                        log(f"Hydrus client unavailable: {exc}", file=sys.stderr)
+                        return False
                 if client is None:
                     if not local_deleted:
                         log("Hydrus client unavailable", file=sys.stderr)
                         return False
-                else:
-                    payload: Dict[str, Any] = {"hashes": [hash_hex]}
-                    if reason:
-                        payload["reason"] = reason
-                    try:
-                        client._post("/add_files/delete_files", data=payload)  # type: ignore[attr-defined]
-                        hydrus_deleted = True
-                        preview = hash_hex[:12] + ('…' if len(hash_hex) > 12 else '')
-                        debug(f"Deleted from Hydrus: {preview}…", file=sys.stderr)
-                    except Exception as exc:
-                        # If it's not in Hydrus (e.g. 404 or similar), that's fine
-                        if not local_deleted:
-                            return False
+
+            payload: Dict[str, Any] = {"hashes": [hash_hex]}
+            if reason:
+                payload["reason"] = reason
+            try:
+                client._post("/add_files/delete_files", data=payload)  # type: ignore[attr-defined]
+                hydrus_deleted = True
+                preview = hash_hex[:12] + ('…' if len(hash_hex) > 12 else '')
+                debug(f"Deleted from Hydrus: {preview}…", file=sys.stderr)
+            except Exception:
+                # If it's not in Hydrus (e.g. 404 or similar), that's fine
+                if not local_deleted:
+                    return False
 
         if hydrus_deleted and hash_hex:
             preview = hash_hex[:12] + ('…' if len(hash_hex) > 12 else '')