rclone-api 1.0.42__py2.py3-none-any.whl → 1.0.43__py2.py3-none-any.whl

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.dist-info → rclone_api-1.0.43.dist-info}/METADATA

@@ -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.dist-info → rclone_api-1.0.43.dist-info}/RECORD

@@ -10,7 +10,7 @@ rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,157
 rclone_api/exec.py,sha256=HWmnU2Jwb-3EttSbAJSaLloYA7YI2mHTzRJ5VEri9aM,941
 rclone_api/file.py,sha256=D02iHJW1LhfOiM_R_yPHP8_ApnDiYrkuraVcrV8-qkw,1246
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
-rclone_api/group_files.py,sha256=xHE3_gvvMWgvLk33TyTNAa0GRFvIRo2qkwsEKA-yujU,4730
+rclone_api/group_files.py,sha256=FK9-DQV2rpl_EQSI6Y1NqcEA2WVkhBwLY5oP43bnp3k,4690
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
 rclone_api/rclone.py,sha256=zKLlHykEs43kt-FB3_YFvwPmRcHY2a3-fShMfGEjYH0,21004
 rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
@@ -19,9 +19,9 @@ rclone_api/util.py,sha256=sUjH5NmsawmNbPMY7V6hD8vFJXCwbl44XM1kuij3tA0,3918
 rclone_api/walk.py,sha256=kca0t1GAnF6FLclN01G8NG__Qe-ggodLtAbQSHyVPng,2968
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.42.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.42.dist-info/METADATA,sha256=f5ePfkFNusMVvM9SSIdDsLXuZOUFKYF_ak8yAKnuzc4,4489
-rclone_api-1.0.42.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.42.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.42.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.42.dist-info/RECORD,,
+rclone_api-1.0.43.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.43.dist-info/METADATA,sha256=De892IJwCIjjb710T9a4SvaBBYIjaf20D1JU_0cUwfM,4489
+rclone_api-1.0.43.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.43.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.43.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.43.dist-info/RECORD,,