fdf

cmdlet/delete_file.py

@@ -11,6 +11,7 @@ from Store import Store
 from . import _shared as sh
 from API import HydrusNetwork as hydrus_wrapper
 from SYS import pipeline as ctx
+from SYS.result_table_helpers import add_row_columns
 from SYS.result_table import Table, _format_size
 from SYS.rich_display import stdout_console
 
@@ -487,21 +488,18 @@ class Delete_File(sh.Cmdlet):
             reason_tokens.append(token)
             i += 1
 
-        override_hash = sh.parse_single_hash_query(
-            override_query
-        ) if override_query else None
-        if override_query and not override_hash:
-            log("Invalid -query value (expected hash:<sha256>)", file=sys.stderr)
+        override_hash, query_valid = sh.require_single_hash_query(
+            override_query,
+            "Invalid -query value (expected hash:<sha256>)",
+            log_file=sys.stderr,
+        )
+        if not query_valid:
             return 1
 
         reason = " ".join(token for token in reason_tokens
                           if str(token).strip()).strip()
 
-        items = []
-        if isinstance(result, list):
-            items = result
-        elif result:
-            items = [result]
+        items = sh.normalize_result_items(result)
 
         if not items:
             log("No items to delete", file=sys.stderr)
@@ -526,16 +524,16 @@ class Delete_File(sh.Cmdlet):
             table = Table("Deleted")
             table._interactive(True)._perseverance(True)
             for row in deleted_rows:
-                result_row = table.add_row()
-                result_row.add_column("Title", row.get("title", ""))
-                result_row.add_column("Store", row.get("store", ""))
-                result_row.add_column("Hash", row.get("hash", ""))
-                result_row.add_column(
-                    "Size",
-                    _format_size(row.get("size_bytes"),
-                                 integer_only=False)
+                add_row_columns(
+                    table,
+                    [
+                        ("Title", row.get("title", "")),
+                        ("Store", row.get("store", "")),
+                        ("Hash", row.get("hash", "")),
+                        ("Size", _format_size(row.get("size_bytes"), integer_only=False)),
+                        ("Ext", row.get("ext", "")),
+                    ],
                 )
-                result_row.add_column("Ext", row.get("ext", ""))
 
             # Display-only: print directly and do not affect selection/history.
             try: