fdf

cmdlet/archive_file.py

@@ -13,6 +13,7 @@ from typing import Any, Dict, List, Sequence, Set
 from urllib.parse import parse_qs, urlparse
 
 from SYS.logger import log
+from SYS.item_accessors import get_http_url, get_sha256_hex, get_store_name
 from SYS.utils import extract_hydrus_hash_from_url
 
 from SYS import pipeline as ctx
@@ -27,41 +28,16 @@ create_pipe_object_result = sh.create_pipe_object_result
 parse_cmdlet_args = sh.parse_cmdlet_args
 should_show_help = sh.should_show_help
 
-_SHA256_RE = re.compile(r"^[0-9a-fA-F]{64}$")
-
-
 def _extract_sha256_hex(item: Any) -> str:
-    try:
-        if isinstance(item, dict):
-            h = item.get("hash")
-        else:
-            h = getattr(item, "hash", None)
-        if isinstance(h, str) and _SHA256_RE.fullmatch(h.strip()):
-            return h.strip().lower()
-    except Exception:
-        pass
-    return ""
+    return get_sha256_hex(item, "hash") or ""
 
 
 def _extract_store_name(item: Any) -> str:
-    try:
-        if isinstance(item, dict):
-            s = item.get("store")
-        else:
-            s = getattr(item, "store", None)
-        return str(s or "").strip()
-    except Exception:
-        return ""
+    return get_store_name(item, "store") or ""
 
 
 def _extract_url(item: Any) -> str:
-    try:
-        u = sh.get_field(item, "url") or sh.get_field(item, "target")
-        if isinstance(u, str) and u.strip().lower().startswith(("http://", "https://")):
-            return u.strip()
-    except Exception:
-        pass
-    return ""
+    return get_http_url(item, "url", "target") or ""
 
 
 def _extract_hash_from_hydrus_file_url(url: str) -> str:
@@ -217,10 +193,9 @@ def _resolve_existing_or_fetch_path(item: Any,
     store_name = _extract_store_name(item)
     if file_hash and store_name:
         try:
-            from Store import Store
-
-            store = Store(config)
-            backend = store[store_name]
+            backend, _store_registry, _exc = sh.get_store_backend(config, store_name)
+            if backend is None:
+                return None, None
             src = backend.get_file(file_hash)
             if isinstance(src, Path):
                 if src.exists():
@@ -320,11 +295,10 @@ def _run(result: Any, args: Sequence[str], config: Dict[str, Any]) -> int:
     # This cmdlet always creates the archive in the configured output directory and emits it.
 
     # Collect piped items; archive-file is a batch command (single output).
-    items: List[Any] = []
-    if isinstance(result, list):
-        items = list(result)
-    elif result is not None:
-        items = [result]
+    items: List[Any] = sh.normalize_result_items(
+        result,
+        include_falsey_single=True,
+    )
 
     if not items:
         log("No piped items provided to archive-file", file=sys.stderr)