df

cmdlet/delete_file.py

@@ -297,51 +297,81 @@ class Delete_File(sh.Cmdlet):
             should_try_hydrus = False
             
         if should_try_hydrus and hash_hex:
-            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
-
-            payload: Dict[str, Any] = {"hashes": [hash_hex]}
-            if reason:
-                payload["reason"] = reason
+            # Prefer deleting via the resolved store backend when it is a HydrusNetwork store.
+            # This ensures store-specific post-delete hooks run (e.g., clearing Hydrus deletion records).
+            did_backend_delete = False
             try:
-                client._post("/add_files/delete_files", data=payload)  # type: ignore[attr-defined]
+                if backend is not None:
+                    deleter = getattr(backend, "delete_file", None)
+                    if callable(deleter):
+                        did_backend_delete = bool(deleter(hash_hex, reason=reason))
+            except Exception:
+                did_backend_delete = False
+
+            if did_backend_delete:
                 hydrus_deleted = True
                 title_str = str(title_val).strip() if title_val else ""
                 if title_str:
                     debug(f"{hydrus_prefix} Deleted title:{title_str} hash:{hash_hex}", file=sys.stderr)
                 else:
                     debug(f"{hydrus_prefix} Deleted hash:{hash_hex}", file=sys.stderr)
-            except Exception:
-                # If it's not in Hydrus (e.g. 404 or similar), that's fine
-                if not local_deleted:
-                    return []
+            else:
+                # Fallback to direct client calls.
+                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
+
+                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]
+                    # Best-effort clear deletion record if supported by this client.
+                    try:
+                        clearer = getattr(client, "clear_file_deletion_record", None)
+                        if callable(clearer):
+                            clearer([hash_hex])
+                        else:
+                            client._post("/add_files/clear_file_deletion_record", data={"hashes": [hash_hex]})  # type: ignore[attr-defined]
+                    except Exception:
+                        pass
+
+                    hydrus_deleted = True
+                    title_str = str(title_val).strip() if title_val else ""
+                    if title_str:
+                        debug(f"{hydrus_prefix} Deleted title:{title_str} hash:{hash_hex}", file=sys.stderr)
+                    else:
+                        debug(f"{hydrus_prefix} Deleted hash:{hash_hex}", file=sys.stderr)
+                except Exception:
+                    # If it's not in Hydrus (e.g. 404 or similar), that's fine
+                    if not local_deleted:
+                        return []
 
         if hydrus_deleted and hash_hex:
             size_hint = None