rclone-api 1.0.57__tar.gz → 1.0.59__tar.gz

{rclone_api-1.0.57 → rclone_api-1.0.59}/PKG-INFO

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

{rclone_api-1.0.57 → rclone_api-1.0.59}/pyproject.toml

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

{rclone_api-1.0.57 → rclone_api-1.0.59}/src/rclone_api/dir.py

@@ -41,11 +41,11 @@ class Dir:
         # self.path.set_rclone(self.path.remote.rclone)
         assert self.path.rclone is not None
 
-    def ls(self, max_depth: int = 0) -> DirListing:
+    def ls(self, max_depth: int = 0, reverse: bool = False) -> DirListing:
         """List files and directories in the given path."""
         assert self.path.rclone is not None
         dir = Dir(self.path)
-        return self.path.rclone.ls(dir, max_depth=max_depth)
+        return self.path.rclone.ls(dir, max_depth=max_depth, reverse=reverse)
 
     def walk(
         self, breadth_first: bool, max_depth: int = -1

{rclone_api-1.0.57 → rclone_api-1.0.59}/src/rclone_api/rclone.py

@@ -72,7 +72,7 @@ class Rclone:
 
     def launch_server(
         self,
-        addr: str | None = None,
+        addr: str,
         user: str | None = None,
         password: str | None = None,
         other_args: list[str] | None = None,
@@ -122,6 +122,7 @@ class Rclone:
         path: Dir | Remote | str,
         max_depth: int | None = None,
         glob: str | None = None,
+        reverse: bool = False,
     ) -> DirListing:
         """List files in the given path.
 
@@ -162,6 +163,9 @@ class Rclone:
         # do we have a glob pattern?
         if glob is not None:
             paths = [p for p in paths if fnmatch(p.path, glob)]
+
+        if reverse:
+            paths.reverse()
         return DirListing(paths)
 
     def listremotes(self) -> list[Remote]:
@@ -175,9 +179,21 @@ class Rclone:
         out = [Remote(name=t, rclone=self) for t in tmp]
         return out
 
-    def diff(self, src: str, dst: str) -> Generator[DiffItem, None, None]:
+    def diff(
+        self,
+        src: str,
+        dst: str,
+        min_size: (
+            str | None
+        ) = None,  # e. g. "1MB" - see rclone documentation: https://rclone.org/commands/rclone_check/
+        max_size: (
+            str | None
+        ) = None,  # e. g. "1GB" - see rclone documentation: https://rclone.org/commands/rclone_check/
+        other_args: list[str] | None = None,
+    ) -> Generator[DiffItem, None, None]:
         """Be extra careful with the src and dst values. If you are off by one
         parent directory, you will get a huge amount of false diffs."""
+        other_args = other_args or []
         cmd = [
             "check",
             src,
@@ -189,6 +205,12 @@ class Rclone:
             "--combined",
             "-",
         ]
+        if min_size:
+            cmd += ["--min-size", min_size]
+        if max_size:
+            cmd += ["--max-size", max_size]
+        if other_args:
+            cmd += other_args
         proc = self._launch_process(cmd, capture=True)
         item: DiffItem
         for item in diff_stream_from_running_process(proc, src_slug=src, dst_slug=dst):
@@ -197,7 +219,11 @@ class Rclone:
             yield item
 
     def walk(
-        self, path: Dir | Remote | str, max_depth: int = -1, breadth_first: bool = True
+        self,
+        path: Dir | Remote | str,
+        max_depth: int = -1,
+        breadth_first: bool = True,
+        reverse: bool = False,
     ) -> Generator[DirListing, None, None]:
         """Walk through the given path recursively.
 
@@ -231,7 +257,9 @@ class Rclone:
             dir_obj = Dir(path)  # shut up pyright
             assert f"Invalid type for path: {type(path)}"
 
-        yield from walk(dir_obj, max_depth=max_depth, breadth_first=breadth_first)
+        yield from walk(
+            dir_obj, max_depth=max_depth, breadth_first=breadth_first, reverse=reverse
+        )
 
     def cleanup(
         self, path: str, other_args: list[str] | None = None
@@ -284,7 +312,7 @@ class Rclone:
         Args:
             payload: Dictionary of source and destination file paths
         """
-        max_partition_workers = max_partition_workers or 8
+        max_partition_workers = max_partition_workers or 1
         low_level_retries = low_level_retries or 10
         retries = retries or 3
         other_args = other_args or []

{rclone_api-1.0.57 → rclone_api-1.0.59}/src/rclone_api/walk.py

@@ -10,14 +10,17 @@ _MAX_OUT_QUEUE_SIZE = 50
 
 
 def _walk_runner_breadth_first(
-    dir: Dir, max_depth: int, out_queue: Queue[DirListing | None]
+    dir: Dir,
+    max_depth: int,
+    out_queue: Queue[DirListing | None],
+    reverse: bool = False,
 ) -> None:
     queue: Queue[Dir] = Queue()
     queue.put(dir)
     try:
         while not queue.empty():
             current_dir = queue.get()
-            dirlisting = current_dir.ls()
+            dirlisting = current_dir.ls(max_depth=0, reverse=reverse)
             out_queue.put(dirlisting)
             dirs = dirlisting.dirs
 
@@ -38,20 +41,22 @@ def _walk_runner_breadth_first(
 
 
 def _walk_runner_depth_first(
-    dir: Dir, max_depth: int, out_queue: Queue[DirListing | None]
+    dir: Dir, max_depth: int, out_queue: Queue[DirListing | None], reverse=False
 ) -> None:
     try:
         stack = [(dir, max_depth)]
         while stack:
             current_dir, depth = stack.pop()
             dirlisting = current_dir.ls()
+            if reverse:
+                dirlisting.dirs.reverse()
             if depth != 0:
-                for subdir in reversed(
-                    dirlisting.dirs
-                ):  # Process deeper directories first
+                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)
+                    _walk_runner_depth_first(
+                        subdir, next_depth, out_queue, reverse=reverse
+                    )
             out_queue.put(dirlisting)
         out_queue.put(None)
     except KeyboardInterrupt:
@@ -65,6 +70,7 @@ def walk(
     dir: Dir | Remote,
     breadth_first: bool,
     max_depth: int = -1,
+    reverse: bool = False,
 ) -> Generator[DirListing, None, None]:
     """Walk through the given directory recursively.
 
@@ -88,7 +94,7 @@ def walk(
         # Start worker thread
         worker = Thread(
             target=strategy,
-            args=(dir, max_depth, out_queue),
+            args=(dir, max_depth, out_queue, reverse),
             daemon=True,
         )
         worker.start()

{rclone_api-1.0.57 → rclone_api-1.0.59}/src/rclone_api.egg-info/PKG-INFO

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