dfdf

cmdlet/add_tag.py

@@ -205,7 +205,7 @@ def _refresh_tag_view(res: Any, target_hash: Optional[str], store_name: Optional
     if not target_hash or not store_name:
         return
 
-    refresh_args: List[str] = ["-hash", target_hash, "-store", store_name]
+    refresh_args: List[str] = ["-query", f"hash:{target_hash}", "-store", store_name]
 
     get_tag = None
     try:
@@ -237,10 +237,10 @@ class Add_Tag(Cmdlet):
         super().__init__(
             name="add-tag",
             summary="Add tag to a file in a store.",
-            usage="add-tag -store <store> [-hash <sha256>] [-duplicate <format>] [-list <list>[,<list>...]] [--all] <tag>[,<tag>...]",
+            usage="add-tag -store <store> [-query \"hash:<sha256>\"] [-duplicate <format>] [-list <list>[,<list>...]] [--all] <tag>[,<tag>...]",
             arg=[
                 CmdletArg("tag", type="string", required=False, description="One or more tag to add. Comma- or space-separated. Can also use {list_name} syntax. If omitted, uses tag from pipeline payload.", variadic=True),
-                SharedArgs.HASH,
+                SharedArgs.QUERY,
                 SharedArgs.STORE,
                 CmdletArg("-duplicate", type="string", description="Copy existing tag values to new namespaces. Formats: title:album,artist (explicit) or title,album,artist (inferred)"),
                 CmdletArg("-list", type="string", description="Load predefined tag lists from adjective.json. Comma-separated list names (e.g., -list philosophy,occult)."),
@@ -249,7 +249,7 @@ class Add_Tag(Cmdlet):
             detail=[
                 "- By default, only tag non-temporary files (from pipelines). Use --all to tag everything.",
                 "- Requires a store backend: use -store or pipe items that include store.",
-                "- If -hash is not provided, uses the piped item's hash (or derives from its path when possible).",
+                "- If -query is not provided, uses the piped item's hash (or derives from its path when possible).",
                 "- Multiple tag can be comma-separated or space-separated.",
                 "- Use -list to include predefined tag lists from adjective.json: -list philosophy,occult",
                 "- tag can also reference lists with curly braces: add-tag {philosophy} \"other:tag\"",
@@ -258,7 +258,6 @@ class Add_Tag(Cmdlet):
                 "  Inferred format: -duplicate title,album,artist (first is source, rest are targets)",
                 "- The source namespace must already exist in the file being tagged.",
                 "- Target namespaces that already have a value are skipped (not overwritten).",
-                "- You can also pass the target hash as a tag token: hash:<sha256>. This overrides -hash and is removed from the tag list.",
             ],
             exec=self.run,
         )
@@ -273,6 +272,11 @@ class Add_Tag(Cmdlet):
         # Parse arguments
         parsed = parse_cmdlet_args(args, self)
 
+        query_hash = sh.parse_single_hash_query(parsed.get("query"))
+        if parsed.get("query") and not query_hash:
+            log("[add_tag] Error: -query must be of the form hash:<sha256>", file=sys.stderr)
+            return 1
+
         # If add-tag is in the middle of a pipeline (has downstream stages), default to
         # including temp files. This enables common flows like:
         #   @N | download-media | add-tag ... | add-file ...
@@ -337,24 +341,12 @@ class Add_Tag(Cmdlet):
         tag_to_add = parse_tag_arguments(raw_tag)
         tag_to_add = expand_tag_groups(tag_to_add)
 
-        # Allow hash override via namespaced token (e.g., "hash:abcdef...")
-        extracted_hash = None
-        filtered_tag: List[str] = []
-        for tag in tag_to_add:
-            if isinstance(tag, str) and tag.lower().startswith("hash:"):
-                _, _, hash_val = tag.partition(":")
-                if hash_val:
-                    extracted_hash = normalize_hash(hash_val.strip())
-                continue
-            filtered_tag.append(tag)
-        tag_to_add = filtered_tag
-
         if not tag_to_add:
             log("No tag provided to add", file=sys.stderr)
             return 1
 
-        # Get other flags (hash override can come from -hash or hash: token)
-        hash_override = normalize_hash(parsed.get("hash")) or extracted_hash
+        # Get other flags
+        hash_override = normalize_hash(query_hash) if query_hash else None
         duplicate_arg = parsed.get("duplicate")
 
         # tag ARE provided - apply them to each store-backed result