2.8.061

.github/README.md

@@ -97,7 +97,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v2.8.060; 79 subcommands)
+    library (v2.8.061; 79 subcommands)
 
     Create database subcommands:
     ╭───────────────┬──────────────────────────────────────────╮
@@ -1156,17 +1156,17 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
     $ library merge-mv -h
     usage: library merge-mv SOURCE ... DEST [--simulate] [--ext EXT]
 
-    By default it won't matter if source folders end with slash or not
+    By default it won't matter if source folders end with a path separator or not
 
         library merge-mv folder1  folder2/  # folder1 will be merged with folder2/
         library merge-mv folder1/ folder2/  # folder1 will be merged with folder2/
 
-    Move folders BSD-style where slash on each source argument determines if it is to be merged with or placed within the destination
+    --bsd mode: an ending path separator determines if each source is to be placed within or merged with the destination
 
         library merge-mv --bsd folder1/ folder2/  # folder1 will be merged with folder2/
         library merge-mv --bsd folder1  folder2/  # folder1 will be moved to folder2/folder1/
 
-    Or always include the parent folders when merging:
+    --parent mode: always include the parent folder name when merging
 
         library merge-mv --parent folder1  folder2/  # folder1 will be moved to folder2/folder1/
         library merge-mv --parent folder1/ folder2/  # folder1 will be moved to folder2/folder1/

xklb/__init__.py

@@ -1 +1 @@
-__version__ = "2.8.060"
+__version__ = "2.8.061"

xklb/folders/merge_folders.py

@@ -8,7 +8,12 @@
 
 def parse_args() -> argparse.Namespace:
     parser = argparse_utils.ArgumentParser(prog="library merge-folders", usage=usage.merge_folders)
-    arggroups.clobber(parser)
+    parser.add_argument(
+        "--replace",
+        "--clobber",
+        action=argparse.BooleanOptionalAction,
+        help="Overwrite files on path conflict (default: ask to confirm)",
+    )
     arggroups.debug(parser)
 
     parser.add_argument("sources", nargs="+", action=argparse_utils.ArgparseArgsOrStdin)

xklb/folders/rel_mv.py

@@ -10,7 +10,12 @@
 
 def parse_args() -> argparse.Namespace:
     parser = argparse_utils.ArgumentParser(usage=usage.rel_mv)
-    arggroups.clobber(parser)
+    parser.add_argument(
+        "--replace",
+        "--clobber",
+        action=argparse.BooleanOptionalAction,
+        help="Overwrite files on path conflict (default: ask to confirm)",
+    )
     arggroups.debug(parser)
 
     parser.add_argument(

xklb/usage.py

@@ -861,17 +861,17 @@ def play(action) -> str:
 
 merge_mv = """library merge-mv SOURCE ... DEST [--simulate] [--ext EXT]
 
-    By default it won't matter if source folders end with slash or not
+    By default it won't matter if source folders end with a path separator or not
 
         library merge-mv folder1  folder2/  # folder1 will be merged with folder2/
         library merge-mv folder1/ folder2/  # folder1 will be merged with folder2/
 
-    Move folders BSD-style where slash on each source argument determines if it is to be merged with or placed within the destination
+    --bsd mode: an ending path separator determines if each source is to be placed within or merged with the destination
 
         library merge-mv --bsd folder1/ folder2/  # folder1 will be merged with folder2/
         library merge-mv --bsd folder1  folder2/  # folder1 will be moved to folder2/folder1/
 
-    Or always include the parent folders when merging:
+    --parent mode: always include the parent folder name when merging
 
         library merge-mv --parent folder1  folder2/  # folder1 will be moved to folder2/folder1/
         library merge-mv --parent folder1/ folder2/  # folder1 will be moved to folder2/folder1/

xklb/utils/devices.py

@@ -123,7 +123,7 @@ def clobber(args, source, destination) -> tuple[str | None, str]:
                 case arggroups.FileOverFolder.MERGE:
                     while os.path.exists(destination):  # until we find an open slot
                         destination = os.path.join(destination, os.path.basename(destination))  # down
-                    if not os.path.isdir(os.path.dirname(destination)):  # go back one if it is a file
+                    if not os.path.isdir(os.path.dirname(destination)):  # go back one if file-like
                         destination = os.path.dirname(destination)  # up
 
         else:
@@ -219,8 +219,6 @@ def clobber(args, source, destination) -> tuple[str | None, str]:
                         os.makedirs(parent_dir, exist_ok=True)  # there can't be more than one blocking file
                         while os.path.exists(parent_file):  # until we find an open file slot
                             parent_file = os.path.join(parent_file, os.path.basename(parent_file))  # down
-                        if not os.path.isdir(os.path.dirname(parent_file)):  # go back one if it is a file
-                            parent_file = os.path.dirname(parent_file)  # up
                         rename(args, existing_rename, parent_file)  # temporary rename to final dest
 
             if source: