rclone-api 1.0.69__py2.py3-none-any.whl → 1.0.70__py2.py3-none-any.whl

rclone_api/diff_walk.py

@@ -1,5 +1,6 @@
+import time
 from concurrent.futures import ThreadPoolExecutor
-from queue import Queue
+from queue import Empty, Queue
 from threading import Thread
 from typing import Generator
 
@@ -13,96 +14,71 @@ _MAX_OUT_QUEUE_SIZE = 50
 
 # ONLY Works from src -> dst diffing.
 def _async_diff_dir_walk_task(
-    src: Dir, dst: Dir, max_depth: int, out_queue: Queue[Dir | None], reverse=False
+    src: Dir, dst: Dir, max_depth: int, out_queue: Queue[Dir | None], reverse
 ) -> None:
-
-    try:
-        stack = [(src, dst)]
-        while stack:
-            curr_src, curr_dst = stack.pop()
-            curr_src = curr_src
-            curr_dst = curr_dst
-
-            with ThreadPoolExecutor(max_workers=2) as executor:
-                # src_dir_listing = src.ls(listing_option=ListingOption.DIRS_ONLY)
-                # dst_dir_listing = dst.ls(listing_option=ListingOption.DIRS_ONLY)
-                t1 = executor.submit(
-                    src.ls, listing_option=ListingOption.DIRS_ONLY, reverse=reverse
-                )
-                t2 = executor.submit(
-                    dst.ls, listing_option=ListingOption.DIRS_ONLY, reverse=reverse
-                )
-                src_dir_listing: DirListing = t1.result()
-                dst_dir_listing: DirListing = t2.result()
-
-            # dirlisting = current_dir.ls()
-            # if reverse:
-            #     dirlisting.dirs.reverse()
-            # if depth != 0:
-            #     for subdir in dirlisting.dirs:  # Process deeper directories first
-            #         # stack.append((child, depth - 1 if depth > 0 else depth))
-            #         next_depth = depth - 1 if depth > 0 else depth
-            #         _walk_runner_depth_first(
-            #             subdir, next_depth, out_queue, reverse=reverse
-            #         )
-            # out_queue.put(dirlisting)
-
-            # for subdir in dst_dir_listing.dirs:
-            #     subdir.to_string(include_remote=False)
-            #     walk_runner_depth_first()
-
-            # find elements missing on dst
-            # missing_on_dst: set[Dir] = set(src_dir_listing.dirs) - set(
-            #     dst_dir_listing.dirs
-            # )
-            # exists_on_dst: set[Dir] = set(src_dir_listing.dirs) - missing_on_dst
-
-            dst_files: list[str] = [d.name for d in dst_dir_listing.dirs]
-            src_files: list[str] = [d.name for d in src_dir_listing.dirs]
-
-            dst_files_set: set[str] = set(dst_files)
-            # src_files_set: set[str] = set(src_files)
-
-            # print(f"src_files: {src_files}")
-            # print(f"dst_files: {dst_files}")
-
-            matching_dirs: list[str] = []
-
-            for file in src_files:
-                if file not in dst_files_set:
-                    # print(f"missing dir on src: {file}")
-                    queue_dir_listing: Queue[DirListing | None] = Queue()
-                    walk_runner_depth_first(
-                        dir=curr_src,
-                        max_depth=max_depth,
-                        out_queue=queue_dir_listing,
-                        reverse=reverse,
-                    )
-                    while dirlisting := queue_dir_listing.get():
-                        if dirlisting is None:
-                            break
-                        # print(f"dirlisting: {dirlisting}")
-                        for d in dirlisting.dirs:
-                            out_queue.put(d)
-                else:
-                    matching_dirs.append(file)
-
-            for matching_dir in matching_dirs:
-                # print(f"matching dir: {matching_dir}")
-                _async_diff_dir_walk_task(
-                    src=curr_src / matching_dir,
-                    dst=curr_dst / matching_dir,
-                    max_depth=max_depth,
-                    out_queue=out_queue,
+    curr_src, curr_dst = src, dst
+    with ThreadPoolExecutor(max_workers=2) as executor:
+        # src_dir_listing = src.ls(listing_option=ListingOption.DIRS_ONLY)
+        # dst_dir_listing = dst.ls(listing_option=ListingOption.DIRS_ONLY)
+        t1 = executor.submit(
+            src.ls, listing_option=ListingOption.DIRS_ONLY, reverse=reverse
+        )
+        t2 = executor.submit(
+            dst.ls, listing_option=ListingOption.DIRS_ONLY, reverse=reverse
+        )
+        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_files: list[str] = [d.name for d in dst_dir_listing.dirs]
+    src_files: list[str] = [d.name for d in src_dir_listing.dirs]
+    dst_files_set: set[str] = set(dst_files)
+    matching_dirs: list[str] = []
+    for file in src_files:
+        if file not in dst_files_set:
+            # print(f"missing dir on src: {file}")
+            queue_dir_listing: Queue[DirListing | None] = Queue()
+            if next_depth > 0 or next_depth == -1:
+                walk_runner_depth_first(
+                    dir=curr_src,
+                    out_queue=queue_dir_listing,
                     reverse=reverse,
+                    max_depth=next_depth,
                 )
-
-        out_queue.put(None)
-    except KeyboardInterrupt:
+            while dirlisting := queue_dir_listing.get():
+                if dirlisting is None:
+                    break
+                # print(f"dirlisting: {dirlisting}")
+                for d in dirlisting.dirs:
+                    out_queue.put(d)
+        else:
+            matching_dirs.append(file)
+
+    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
+            _async_diff_dir_walk_task(
+                src=src_next,
+                dst=dst_next,
+                max_depth=next_depth,
+                out_queue=out_queue,
+                reverse=reverse,
+            )
+
+
+def async_diff_dir_walk_task(
+    src: Dir, dst: Dir, max_depth: int, out_queue: Queue[Dir | None], reverse=False
+) -> None:
+    try:
+        _async_diff_dir_walk_task(src, dst, max_depth, out_queue, reverse)
+    except Exception:
         import _thread
 
-        out_queue.put(None)
         _thread.interrupt_main()
+        raise
+    finally:
+        out_queue.put(None)
 
 
 def diff_walk(
@@ -125,7 +101,7 @@ def diff_walk(
         out_queue: Queue[Dir | None] = Queue(maxsize=_MAX_OUT_QUEUE_SIZE)
 
         def task() -> None:
-            _async_diff_dir_walk_task(src, dst, max_depth, out_queue, reverse=reverse)
+            async_diff_dir_walk_task(src, dst, max_depth, out_queue, reverse=reverse)
 
         worker = Thread(
             target=task,
@@ -133,10 +109,14 @@ def diff_walk(
         )
         worker.start()
 
-        while dirlisting := out_queue.get():
-            if dirlisting is None:
-                break
-            yield dirlisting
+        while True:
+            try:
+                dirlisting = out_queue.get_nowait()
+                if dirlisting is None:
+                    break
+                yield dirlisting
+            except Empty:
+                time.sleep(0.1)
 
         worker.join()
     except KeyboardInterrupt:

rclone_api/dir.py

@@ -102,7 +102,7 @@ class Dir:
         path = Path(self.path.path) / other
         rpath = RPath(
             self.path.remote,
-            str(path),
+            str(path.as_posix()),
             name=other,
             size=0,
             mime_type="inode/directory",

{rclone_api-1.0.69.dist-info → rclone_api-1.0.70.dist-info}/METADATA

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

{rclone_api-1.0.69.dist-info → rclone_api-1.0.70.dist-info}/RECORD

@@ -5,8 +5,8 @@ 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/diff_walk.py,sha256=V8U6qwCzG7_Z6-xFpB4zP6kCq_jN30OMYo7tT92OTd0,5061
-rclone_api/dir.py,sha256=8EwaGonkCeHhe-rsVl98PkEKvyf-3pFUJnXqkN6Fx24,3509
+rclone_api/diff_walk.py,sha256=fnCjzenKBBocu6sEd9CDEcwNqCUYwz3rZsxUuKNaYEg,4049
+rclone_api/dir.py,sha256=BuXPd-bAvZund8k7mXjvx_UylsPFwbWq2zaUdflTX04,3520
 rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,1571
 rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
 rclone_api/file.py,sha256=YtR5Y6c0YfXTS-sReOy2UgiSnafcAeO6b2hnbojBQD4,1423
@@ -21,9 +21,9 @@ rclone_api/util.py,sha256=_cvmHcJPRl2yXw4zgZiop3z-riA_8Ek6S5NDPw8cqSY,4198
 rclone_api/walk.py,sha256=ndWV7WBVQLbpZu3HuJrAe1cXcmQVjT9_YPsbat158bQ,3231
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.69.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.69.dist-info/METADATA,sha256=bl94_jCcD0a0buUsLVFIQ-MPQ5O2fy-hFrvK1EvU7Ls,4489
-rclone_api-1.0.69.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.69.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.69.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.69.dist-info/RECORD,,
+rclone_api-1.0.70.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.70.dist-info/METADATA,sha256=73129SIcLoTZ3R35zB0vuZZ65SC0RBttGk1LtPARAx8,4489
+rclone_api-1.0.70.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.70.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.70.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.70.dist-info/RECORD,,