merge-mv: add overwrite shortcut

library/files/christen.py

@@ -12,7 +12,7 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument("--dot-space", action="store_true")
     parser.add_argument("--case-insensitive", action="store_true")
     parser.add_argument("--lowercase-folders", action="store_true")
-    parser.add_argument("--overwrite", "--force", action="store_true")
+    parser.add_argument("--force", "-f", action="store_true")
     parser.add_argument("--run", "-r", action="store_true")
     arggroups.debug(parser)
 
@@ -47,7 +47,7 @@ def rename_path(args, base, b) -> None:
                 fixed = base / fixed
                 fixed.parent.mkdir(parents=True, exist_ok=True)
 
-                if fixed.exists() and not args.overwrite:
+                if fixed.exists() and not args.force:
                     raise FileExistsError
 
                 p.rename(fixed)

library/folders/merge_mv.py

@@ -11,6 +11,9 @@ def parse_args(defaults_override=None):
     parser = argparse_utils.ArgumentParser(usage=usage.merge_mv)
     parser.add_argument("--copy", "--cp", "-c", action="store_true", help=argparse.SUPPRESS)
     arggroups.mmv_folders(parser)
+    parser.add_argument(
+        "--clobber", "--overwrite", action="store_true", help="Shortcut for --file-over-file delete-dest"
+    )
     arggroups.clobber(parser)
     arggroups.debug(parser)
 
@@ -25,6 +28,12 @@ def parse_args(defaults_override=None):
     if not any([args.dest_bsd, args.dest_file, args.dest_folder]):
         args.destination_folder = True
 
+    if args.clobber:
+        if args.file_over_file[-1] == "rename-dest":
+            args.file_over_file[-1] = "delete-dest"
+        else:
+            args.file_over_file = arggroups.file_over_file("delete-dest")
+
     return args