d

cmdlet/_shared.py

@@ -627,7 +627,14 @@ def get_hash_for_operation(override_hash: Optional[str], result: Any, field_name
 	return normalize_hash(hash_value)
 
 
-def fetch_hydrus_metadata(config: Any, hash_hex: str, **kwargs) -> tuple[Optional[Dict[str, Any]], Optional[int]]:
+def fetch_hydrus_metadata(
+	config: Any,
+	hash_hex: str,
+	*,
+	store_name: Optional[str] = None,
+	hydrus_client: Any = None,
+	**kwargs,
+) -> tuple[Optional[Dict[str, Any]], Optional[int]]:
 	"""Fetch metadata from Hydrus for a given hash, consolidating common fetch pattern.
 	
 	Eliminates repeated boilerplate: client initialization, error handling, metadata extraction.
@@ -635,6 +642,8 @@ def fetch_hydrus_metadata(config: Any, hash_hex: str, **kwargs) -> tuple[Optiona
 	Args:
 		config: Configuration object (passed to hydrus_wrapper.get_client)
 		hash_hex: File hash to fetch metadata for
+		store_name: Optional Hydrus store name. When provided, do not fall back to a global/default Hydrus client.
+		hydrus_client: Optional explicit Hydrus client. When provided, takes precedence.
 		**kwargs: Additional arguments to pass to client.fetch_file_metadata()
 			Common: include_service_keys_to_tags, include_notes, include_file_url, include_duration, etc.
 		
@@ -646,15 +655,33 @@ def fetch_hydrus_metadata(config: Any, hash_hex: str, **kwargs) -> tuple[Optiona
 	from API import HydrusNetwork
 	hydrus_wrapper = HydrusNetwork
 	
-	try:
-		client = hydrus_wrapper.get_client(config)
-	except Exception as exc:
-		log(f"Hydrus client unavailable: {exc}")
-		return None, 1
-	
+	client = hydrus_client
 	if client is None:
-		log("Hydrus client unavailable")
-		return None, 1
+		if store_name:
+			# Store specified: do not fall back to a global/default Hydrus client.
+			try:
+				from Store import Store
+				store = Store(config)
+				backend = store[str(store_name)]
+				candidate = getattr(backend, "_client", None)
+				if candidate is not None and hasattr(candidate, "fetch_file_metadata"):
+					client = candidate
+			except Exception as exc:
+				log(f"Hydrus client unavailable for store '{store_name}': {exc}")
+				client = None
+			if client is None:
+				log(f"Hydrus client unavailable for store '{store_name}'")
+				return None, 1
+		else:
+			try:
+				client = hydrus_wrapper.get_client(config)
+			except Exception as exc:
+				log(f"Hydrus client unavailable: {exc}")
+				return None, 1
+
+			if client is None:
+				log("Hydrus client unavailable")
+				return None, 1
 	
 	try:
 		payload = client.fetch_file_metadata(hashes=[hash_hex], **kwargs)