rclone-api 1.0.42__tar.gz → 1.0.43__tar.gz

{rclone_api-1.0.42 → rclone_api-1.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.42
+Version: 1.0.43
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.42 → rclone_api-1.0.43}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "python-dotenv>=1.0.0",
 ]
 # Change this with the version number bump.
-version = "1.0.42"
+version = "1.0.43"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.0.42 → rclone_api-1.0.43}/src/rclone_api/group_files.py

@@ -80,14 +80,10 @@ class TreeNode:
 
 def _merge(node: TreeNode, parent_path: str, out: dict[str, list[str]]) -> None:
     parent_path = parent_path + "/" + node.name
-    this_count = node.count
-    child_count = 0
-    children_has_files = False
     if not node.child_nodes and not node.files:
         return  # done
-
     if node.files:
-        children_has_files = True
+        # we saw files, to don't try to go any deeper.
         filelist = out.setdefault(parent_path, [])
         # for file in node.files:
         #    filelist.append(file)
@@ -98,28 +94,28 @@ def _merge(node: TreeNode, parent_path: str, out: dict[str, list[str]]) -> None:
         out[parent_path] = filelist
         return
 
-    for child in node.child_nodes.values():
-        child_count += child.count
-    child_count += len(node.files)
-    for file in node.files:
-        child_count += 1
+    n_child_nodes = len(node.child_nodes)
 
-    if child_count != this_count or children_has_files:
-        # print(
-        #    f"Cannot merge {node.name} because different counts or has children with files"
-        # )
-        filelist = out.setdefault(parent_path, [])
-        for child in node.child_nodes.values():
-            subpaths = child.get_child_subpaths()
-            filelist.extend(subpaths)
-        out[parent_path] = filelist
-    else:
+    if n_child_nodes < 4:
+        # child = list(node.child_nodes.values())[0]
+        # _merge(child, parent_path, out)
+        # return
         for child in node.child_nodes.values():
             _merge(child, parent_path, out)
+        return
 
+    filelist = out.setdefault(parent_path, [])
+    # for file in node.files:
+    #    filelist.append(file)
+    # out[parent_path] = filelist
+    paths = node.get_child_subpaths()
+    for path in paths:
+        filelist.append(path)
+    out[parent_path] = filelist
+    return
 
-def group_files(files: list[str]) -> dict[str, list[str]]:
-    """split between filename and parent directory path"""
+
+def _make_tree(files: list[str]) -> dict[str, TreeNode]:
     tree: dict[str, TreeNode] = {}
     for file in files:
         parts = parse_file(file)
@@ -131,6 +127,12 @@ def group_files(files: list[str]) -> dict[str, list[str]]:
             if is_last:
                 node.files.append(parts.name)
                 node.add_count()
+    return tree
+
+
+def group_files(files: list[str]) -> dict[str, list[str]]:
+    """split between filename and parent directory path"""
+    tree: dict[str, TreeNode] = _make_tree(files)
     outpaths: dict[str, list[str]] = {}
     for _, node in tree.items():
         _merge(node, "", outpaths)

{rclone_api-1.0.42 → rclone_api-1.0.43}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.42
+Version: 1.0.43
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.42 → rclone_api-1.0.43}/tests/test_group_files.py

@@ -76,6 +76,26 @@ class GroupFilestest(unittest.TestCase):
         self.assertIn(expected_files[1], groups["dst:Bucket/subdir2"])
         print("done")
 
+    def test_two_fine_grained(self) -> None:
+        files = [
+            "dst:TorrentBooks/libgenrs_nonfiction/204000/a2b20b2c89240ce81dec16091e18113e",
+            "dst:TorrentBooks/libgenrs_nonfiction/208000/155fe185bc03048b003a8e145ed097c8",
+            "dst:TorrentBooks/libgenrs_nonfiction/208001/155fe185bc03048b003a8e145ed097c8",
+            "dst:TorrentBooks/libgenrs_nonfiction/208002/155fe185bc03048b003a8e145ed097c8",
+            "dst:TorrentBooks/libgenrs_nonfiction/2080054/155fe185bc03048b003a8e145ed097c4",
+        ]
+        # expect that this all goes under the same parent
+        groups: dict[str, list[str]] = group_files(files)
+        self.assertEqual(len(groups), 1)
+        # dst:/Bucket/subdir should be the key
+        self.assertIn("dst:TorrentBooks/libgenrs_nonfiction", groups)
+        self.assertEqual(len(groups["dst:TorrentBooks/libgenrs_nonfiction"]), 5)
+        expected_files = [
+            "204000/a2b20b2c89240ce81dec16091e18113e",
+            "208000/155fe185bc03048b003a8e145ed097c8",
+        ]
+        self.assertIn(expected_files[0], groups["dst:TorrentBooks/libgenrs_nonfiction"])
+
 
 if __name__ == "__main__":
     unittest.main()