fdf

cmdlet/delete_note.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from pathlib import Path
-from typing import Any, Dict, Optional, Sequence
+from typing import Any, Dict, Sequence
 import sys
 
 from SYS.logger import log
@@ -17,8 +16,6 @@ parse_cmdlet_args = sh.parse_cmdlet_args
 normalize_result_input = sh.normalize_result_input
 get_field = sh.get_field
 should_show_help = sh.should_show_help
-from Store import Store
-from SYS.utils import sha256_file
 
 
 class Delete_Note(Cmdlet):
@@ -50,14 +47,6 @@ class Delete_Note(Cmdlet):
             pass
         self.register()
 
-    def _resolve_hash(
-        self,
-        raw_hash: Optional[str],
-        raw_path: Optional[str],
-        override_hash: Optional[str],
-    ) -> Optional[str]:
-        return sh.resolve_hash_for_cmdlet(raw_hash, raw_path, override_hash)
-
     def run(self, result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
         if should_show_help(args):
             log(f"Cmdlet: {self.name}\nSummary: {self.summary}\nUsage: {self.usage}")
@@ -66,12 +55,12 @@ class Delete_Note(Cmdlet):
         parsed = parse_cmdlet_args(args, self)
 
         store_override = parsed.get("store")
-        query_hash = sh.parse_single_hash_query(parsed.get("query"))
-        if parsed.get("query") and not query_hash:
-            log(
-                "[delete_note] Error: -query must be of the form hash:<sha256>",
-                file=sys.stderr
-            )
+        query_hash, query_valid = sh.require_single_hash_query(
+            parsed.get("query"),
+            "[delete_note] Error: -query must be of the form hash:<sha256>",
+            log_file=sys.stderr,
+        )
+        if not query_valid:
             return 1
         note_name_override = str(parsed.get("name") or "").strip()
         # Allow piping note rows from get-note: the selected item carries note_name.
@@ -97,7 +86,7 @@ class Delete_Note(Cmdlet):
                 )
                 return 1
 
-        store_registry = Store(config)
+        store_registry = None
         deleted = 0
 
         for res in results:
@@ -117,9 +106,12 @@ class Delete_Note(Cmdlet):
                 )
                 return 1
 
-            store_name = str(store_override or res.get("store") or "").strip()
-            raw_hash = res.get("hash")
-            raw_path = res.get("path")
+            store_name, resolved_hash = sh.resolve_item_store_hash(
+                res,
+                override_store=str(store_override) if store_override else None,
+                override_hash=str(query_hash) if query_hash else None,
+                path_fields=("path",),
+            )
 
             if not store_name:
                 log(
@@ -128,18 +120,16 @@ class Delete_Note(Cmdlet):
                 )
                 return 1
 
-            resolved_hash = self._resolve_hash(
-                raw_hash=str(raw_hash) if raw_hash else None,
-                raw_path=str(raw_path) if raw_path else None,
-                override_hash=str(query_hash) if query_hash else None,
-            )
             if not resolved_hash:
                 ctx.emit(res)
                 continue
 
-            try:
-                backend = store_registry[store_name]
-            except Exception as exc:
+            backend, store_registry, exc = sh.get_store_backend(
+                config,
+                store_name,
+                store_registry=store_registry,
+            )
+            if backend is None:
                 log(
                     f"[delete_note] Error: Unknown store '{store_name}': {exc}",
                     file=sys.stderr