dfdkflj

cmdlets/delete_note.py

@@ -5,18 +5,18 @@ import json
 
 import pipeline as ctx
 from helper import hydrus as hydrus_wrapper
-from ._shared import Cmdlet, CmdletArg, normalize_hash
+from ._shared import Cmdlet, CmdletArg, normalize_hash, get_hash_for_operation, fetch_hydrus_metadata, should_show_help, get_field
 from helper.logger import log
 
 CMDLET = Cmdlet(
     name="delete-note",
     summary="Delete a named note from a Hydrus file.",
     usage="i | del-note [-hash <sha256>] <name>",
-    aliases=["del-note"],
-    args=[
+    alias=["del-note"],
+    arg=[
 
     ],
-    details=[
+    detail=[
         "- Removes the note with the given name from the Hydrus file.",
     ],
 )
@@ -24,12 +24,9 @@ CMDLET = Cmdlet(
 
 def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     # Help
-    try:
-        if any(str(a).lower() in {"-?", "/?", "--help", "-h", "help", "--cmdlet"} for a in args):
-            log(json.dumps(CMDLET, ensure_ascii=False, indent=2))
-            return 0
-    except Exception:
-        pass
+    if should_show_help(args):
+        log(json.dumps(CMDLET, ensure_ascii=False, indent=2))
+        return 0
     if not args:
         log("Requires the note name/key to delete")
         return 1
@@ -57,7 +54,7 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     if isinstance(result, list) and len(result) > 0:
         result = result[0]
     
-    hash_hex = normalize_hash(override_hash) if override_hash else normalize_hash(getattr(result, "hash_hex", None))
+    hash_hex = get_hash_for_operation(override_hash, result)
     if not hash_hex:
         log("Selected result does not include a Hydrus hash")
         return 1
@@ -93,7 +90,7 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
                 if isinstance(subject, dict):
                     subj_hashes = [norm(v) for v in [subject.get("hydrus_hash"), subject.get("hash"), subject.get("hash_hex"), subject.get("file_hash")] if v]
                 else:
-                    subj_hashes = [norm(getattr(subject, f, None)) for f in ("hydrus_hash", "hash", "hash_hex", "file_hash") if getattr(subject, f, None)]
+                    subj_hashes = [norm(get_field(subject, f)) for f in ("hydrus_hash", "hash", "hash_hex", "file_hash") if get_field(subject, f)]
                 if target_hash and target_hash in subj_hashes:
                     get_note_cmd.get_notes(subject, ["-hash", hash_hex], config)
                     return 0