3.0.163

Author: chapmanjacobd

.github/README.md

@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v3.0.162; 103 subcommands)
+    library (v3.0.163; 103 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮

library/__main__.py

@@ -5,7 +5,7 @@
 from library.utils import argparse_utils, iterables
 from library.utils.log_utils import log
 
-__version__ = "3.0.162"
+__version__ = "3.0.163"
 
 progs = {
     "Create database subcommands": {

tests/folders/test_merge_mv.py

@@ -319,13 +319,13 @@ def relmv_run(temp_file_tree, src, use_parent, relative_to):
 @pytest.mark.parametrize("src", ["FILE", "FOLDER"])
 @pytest.mark.parametrize("use_parent", [True, False])
 @pytest.mark.parametrize(
-    "relative_to", [":", "/", os.sep, "TEMP_DIR", "SRC_FILE", "SRC_FOLDER", "SRC_PARENT", "TARGET"]
+    "relative_to", ["::", "/", os.sep, "TEMP_DIR", "SRC_FILE", "SRC_FOLDER", "SRC_PARENT", "TARGET"]
 )
 def test_relmv(temp_file_tree, src, use_parent, relative_to):
     src1, src1_inodes, target = relmv_run(temp_file_tree, src, use_parent, relative_to)
 
     expected_results = path_utils.build_nested_dir_dict(consts.TEMP_DIR, {Path(src1).name: src1_inodes})
-    if relative_to in (":", "TEMP_DIR"):
+    if relative_to in ("::", "TEMP_DIR"):
         expected_results = {Path(src1).name: src1_inodes}
     if relative_to in ("SRC_FOLDER",):
         expected_results = src1_inodes

tests/folders/test_rel_mv.py

@@ -49,7 +49,7 @@ def test_two_simple_folders_commonpath(temp_file_tree):
     src2_inodes = read_relative_file_tree_dict(src2)
 
     target = temp_file_tree({})
-    lb(["rel-mv", "--relative-to=:", src1, src2, target])
+    lb(["rel-mv", "--relative-to=::", src1, src2, target])
 
     assert read_relative_file_tree_dict(target) == {Path(src1).name: src1_inodes} | {Path(src2).name: src2_inodes}
 
@@ -60,7 +60,7 @@ def test_dupe_delete_same(temp_file_tree):
 
     src1_inodes = read_relative_file_tree_dict(src1)
     target_inodes = read_relative_file_tree_dict(target)
-    lb(["rel-mv", "--relative-to=:", "--file-over-file=delete-src-hash skip", src1, target])
+    lb(["rel-mv", "--relative-to=::", "--file-over-file=delete-src-hash skip", src1, target])
 
     assert read_relative_file_tree_dict(target) == target_inodes
     assert read_relative_file_tree_dict(src1) == {"file4.txt": src1_inodes["file4.txt"]}
@@ -72,7 +72,7 @@ def test_dupe_skip(temp_file_tree):
 
     src1_inodes = read_relative_file_tree_dict(src1)
     target_inodes = read_relative_file_tree_dict(target)
-    lb(["rel-mv", "--relative-to=:", "--file-over-file=skip", src1, target])
+    lb(["rel-mv", "--relative-to=::", "--file-over-file=skip", src1, target])
 
     assert read_relative_file_tree_dict(target) == target_inodes
     assert read_relative_file_tree_dict(src1) == src1_inodes
@@ -84,7 +84,7 @@ def test_dupe_replace(temp_file_tree):
 
     src1_inodes = read_relative_file_tree_dict(src1)
     target_inodes = read_relative_file_tree_dict(target)
-    lb(["rel-mv", "--relative-to=:", "--file-over-file=delete-dest", src1, target])
+    lb(["rel-mv", "--relative-to=::", "--file-over-file=delete-dest", src1, target])
 
     assert read_relative_file_tree_dict(target) == target_inodes | {Path(src1).name: src1_inodes}
     assert not Path(src1).exists()
@@ -96,7 +96,7 @@ def test_folder_conflict_replace(temp_file_tree):
 
     src1_inodes = read_relative_file_tree_dict(src1)
     target_inodes = read_relative_file_tree_dict(target)
-    lb(["rel-mv", "--relative-to=:", src1, target])
+    lb(["rel-mv", "--relative-to=::", src1, target])
 
     assert read_relative_file_tree_dict(target) == target_inodes | {Path(src1).name: src1_inodes}
     assert not Path(src1).exists()
@@ -108,7 +108,7 @@ def test_file_conflict_replace(temp_file_tree):
 
     src1_inodes = read_relative_file_tree_dict(src1)
     target_inodes = read_relative_file_tree_dict(target)
-    lb(["rel-mv", "--relative-to=:", src1, target])
+    lb(["rel-mv", "--relative-to=::", src1, target])
 
     assert read_relative_file_tree_dict(target) == target_inodes | {Path(src1).name: src1_inodes}
     assert not Path(src1).exists()