rclone-api 1.0.72__py2.py3-none-any.whl → 1.0.75__py2.py3-none-any.whl

rclone_api/diff.py

@@ -126,19 +126,18 @@ def _async_diff_stream_from_running_process(
             except UnicodeDecodeError:
                 print("UnicodeDecodeError")
                 continue
-        output.put(None)
     except KeyboardInterrupt:
         import _thread
 
         print("KeyboardInterrupt")
-        output.put(None)
         _thread.interrupt_main()
     except Exception as e:
         import _thread
 
         print(f"Error: {e}")
-        output.put(None)
         _thread.interrupt_main()
+    finally:
+        output.put(None)
 
 
 def diff_stream_from_running_process(

rclone_api/dir.py

@@ -66,7 +66,7 @@ class Dir:
         self_path = Path(self.path.path)
         other_path = Path(other.path.path)
         rel_path = self_path.relative_to(other_path)
-        return str(rel_path)
+        return str(rel_path.as_posix())
 
     def walk(
         self, breadth_first: bool, max_depth: int = -1

rclone_api/rclone.py

@@ -349,11 +349,15 @@ class Rclone:
         dst: str,
         files: list[str] | Path,
         check: bool | None = None,
+        max_backlog: int | None = None,
         verbose: bool | None = None,
         checkers: int | None = None,
         transfers: int | None = None,
         low_level_retries: int | None = None,
         retries: int | None = None,
+        retries_sleep: str | None = None,
+        metadata: bool | None = None,
+        timeout: str | None = None,
         max_partition_workers: int | None = None,
         other_args: list[str] | None = None,
     ) -> list[CompletedProcess]:
@@ -444,6 +448,14 @@ class Rclone:
                             "--retries",
                             str(retries),
                         ]
+                        if metadata:
+                            cmd_list.append("--metadata")
+                        if retries_sleep is not None:
+                            cmd_list += ["--retries-sleep", retries_sleep]
+                        if timeout is not None:
+                            cmd_list += ["--timeout", timeout]
+                        if max_backlog is not None:
+                            cmd_list += ["--max-backlog", str(max_backlog)]
                         if verbose:
                             if not any(["-v" in x for x in other_args]):
                                 cmd_list.append("-vvvv")

rclone_api/scan_missing_folders.py

@@ -13,41 +13,59 @@ from rclone_api.walk import walk_runner_depth_first
 _MAX_OUT_QUEUE_SIZE = 50
 
 
+def _reorder_inplace(data: list, order: Order) -> None:
+    if order == Order.NORMAL:
+        return
+    elif order == Order.REVERSE:
+        data.reverse()
+        return
+    elif order == Order.RANDOM:
+        random.shuffle(data)
+        return
+    else:
+        raise ValueError(f"Invalid order: {order}")
+
+
 # ONLY Works from src -> dst diffing.
 def _async_diff_dir_walk_task(
     src: Dir, dst: Dir, max_depth: int, out_queue: Queue[Dir | None], order: Order
 ) -> None:
-    curr_src, curr_dst = src, dst
+    can_scan_two_deep = max_depth > 1 or max_depth == -1
+    ls_depth = 2 if can_scan_two_deep else 1
     with ThreadPoolExecutor(max_workers=2) as executor:
         t1 = executor.submit(
-            src.ls, listing_option=ListingOption.DIRS_ONLY, order=order
+            src.ls,
+            listing_option=ListingOption.DIRS_ONLY,
+            order=order,
+            max_depth=ls_depth,
         )
         t2 = executor.submit(
-            dst.ls, listing_option=ListingOption.DIRS_ONLY, order=order
+            dst.ls,
+            listing_option=ListingOption.DIRS_ONLY,
+            order=order,
+            max_depth=ls_depth,
         )
         src_dir_listing: DirListing = t1.result()
         dst_dir_listing: DirListing = t2.result()
-    next_depth = max_depth - 1 if max_depth > 0 else max_depth
-    dst_dirs: list[str] = [d.name for d in dst_dir_listing.dirs]
-    src_dirs: list[str] = [d.name for d in src_dir_listing.dirs]
+    next_depth = max_depth - ls_depth if max_depth > 0 else max_depth
+    dst_dirs: list[str] = [d.relative_to(src) for d in dst_dir_listing.dirs]
+    src_dirs: list[str] = [d.relative_to(dst) for d in src_dir_listing.dirs]
     dst_files_set: set[str] = set(dst_dirs)
     matching_dirs: list[str] = []
-    if order == Order.REVERSE:
-        src_dirs.reverse()
-        dst_dirs.reverse()
-    elif order == Order.RANDOM:
-        random.shuffle(src_dirs)
-        random.shuffle(dst_dirs)
-    for file in src_dirs:
-        if file not in dst_files_set:
+    _reorder_inplace(src_dirs, order)
+    _reorder_inplace(dst_dirs, order)
+    for i, src_dir in enumerate(src_dirs):
+        src_dir_dir = src / src_dir
+        if src_dir not in dst_files_set:
             queue_dir_listing: Queue[DirListing | None] = Queue()
             if next_depth > 0 or next_depth == -1:
                 walk_runner_depth_first(
-                    dir=curr_src,
+                    dir=src_dir_dir,
                     out_queue=queue_dir_listing,
                     order=order,
                     max_depth=next_depth,
                 )
+                out_queue.put(src)
             while dirlisting := queue_dir_listing.get():
                 if dirlisting is None:
                     break
@@ -55,13 +73,13 @@ def _async_diff_dir_walk_task(
                 for d in dirlisting.dirs:
                     out_queue.put(d)
         else:
-            matching_dirs.append(file)
+            matching_dirs.append(src_dir)
 
     for matching_dir in matching_dirs:
         # print(f"matching dir: {matching_dir}")
         if next_depth > 0 or next_depth == -1:
-            src_next = curr_src / matching_dir
-            dst_next = curr_dst / matching_dir
+            src_next = src / matching_dir
+            dst_next = dst / matching_dir
             _async_diff_dir_walk_task(
                 src=src_next,
                 dst=dst_next,

{rclone_api-1.0.72.dist-info → rclone_api-1.0.75.dist-info}/METADATA

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

{rclone_api-1.0.72.dist-info → rclone_api-1.0.75.dist-info}/RECORD

@@ -4,26 +4,26 @@ rclone_api/completed_process.py,sha256=Pp-hXnLgej0IGO5ee9Fmx64dGzIofbQFEUyXdFCvO
 rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
 rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
 rclone_api/deprecated.py,sha256=qWKpnZdYcBK7YQZKuVoWWXDwi-uqiAtbjgPcci_efow,590
-rclone_api/diff.py,sha256=ggdDLUZxa13jMcPzKBcwAElmPCNWMOSR89D4yhpO74M,5264
-rclone_api/dir.py,sha256=hL0i4zrNUbpvFWI3TvKyOyanJ2okcb1lz4r2kxlvSi4,3529
+rclone_api/diff.py,sha256=tMoJMAGmLSE6Q_7QhPf6PnCzb840djxMZtDmhc2GlGQ,5227
+rclone_api/dir.py,sha256=i4h7LX5hB_WmVixxDRWL_l1nifvscrdWct_8Wx7wHZc,3540
 rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,1571
 rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
 rclone_api/file.py,sha256=YtR5Y6c0YfXTS-sReOy2UgiSnafcAeO6b2hnbojBQD4,1423
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=kOHh6ysFDkxjldSwvW6KqmiADUC1yFCdrZRY57TvbGY,5328
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
-rclone_api/rclone.py,sha256=kIamoje3fUaWboMdF_d_a4WVaSa8BfK6zDFY8U6pNbs,28820
+rclone_api/rclone.py,sha256=xBcHT61JJB3uL0V4B9HtMKyPwtARM-gAxK5RxAYfcF0,29439
 rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
-rclone_api/scan_missing_folders.py,sha256=ke2AVIdX-MiuJUi7poJBzP8GxjzzMhCsr1Mxbg0EIu4,4217
+rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
 rclone_api/types.py,sha256=DcbNw1R6j2f_1zHrhqEJcpCR-8kJfFJawMY0AmPsCnM,321
 rclone_api/util.py,sha256=_cvmHcJPRl2yXw4zgZiop3z-riA_8Ek6S5NDPw8cqSY,4198
 rclone_api/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.72.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.72.dist-info/METADATA,sha256=xzlW0jfYuqOPGSCI9k8MxNvp4BpI0Duojacxq_l-C-M,4489
-rclone_api-1.0.72.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.72.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.72.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.72.dist-info/RECORD,,
+rclone_api-1.0.75.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.75.dist-info/METADATA,sha256=pwMsEuOJW9ab39uvbac5yoKyBsbwsO5AvFnHxjCJp3k,4489
+rclone_api-1.0.75.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.75.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.75.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.75.dist-info/RECORD,,