rclone-api 1.0.6__tar.gz → 1.0.8__tar.gz

{rclone_api-1.0.6/src/rclone_api.egg-info → rclone_api-1.0.8}/PKG-INFO

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

{rclone_api-1.0.6 → rclone_api-1.0.8}/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
 
 ]
 # Change this with the version number bump.
-version = "1.0.6"
+version = "1.0.8"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.0.6 → rclone_api-1.0.8}/src/rclone_api/dir.py

@@ -8,10 +8,10 @@ class Dir:
     def __init__(self, path: RPath) -> None:
         self.path = path
 
-    def ls(self) -> DirListing:
+    def ls(self, max_depth: int = 0) -> DirListing:
         """List files and directories in the given path."""
         assert self.path.rclone is not None
-        return self.path.rclone.ls(self.path.path)
+        return self.path.rclone.ls(self.path.path, max_depth=max_depth)
 
     def __str__(self) -> str:
         return str(self.path)

rclone_api-1.0.8/src/rclone_api/dir_listing.py

@@ -0,0 +1,14 @@
+# from rclone_api.dir import Dir
+# from rclone_api.file import File
+from rclone_api.rpath import RPath
+
+
+class DirListing:
+    """Remote file dataclass."""
+
+    def __init__(self, dirs_and_files: list[RPath]) -> None:
+        from rclone_api.dir import Dir
+        from rclone_api.file import File
+
+        self.dirs: list[Dir] = [Dir(d) for d in dirs_and_files if d.is_dir]
+        self.files: list[File] = [File(f) for f in dirs_and_files if not f.is_dir]

{rclone_api-1.0.6 → rclone_api-1.0.8}/src/rclone_api/rclone.py

@@ -5,9 +5,7 @@ Unit test file.
 import subprocess
 from pathlib import Path
 
-from rclone_api.dir import Dir
 from rclone_api.dir_listing import DirListing
-from rclone_api.file import File
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
 from rclone_api.types import Config, RcloneExec
@@ -46,9 +44,7 @@ class Rclone:
         paths: list[RPath] = RPath.from_json_str(text)
         for o in paths:
             o.set_rclone(self)
-        dirs: list[Dir] = [Dir(o) for o in paths if o.is_dir]
-        files: list[File] = [File(o) for o in paths if not o.is_dir]
-        return DirListing(dirs=dirs, files=files)
+        return DirListing(paths)
 
     def listremotes(self) -> list[Remote]:
         cmd = ["listremotes"]

rclone_api-1.0.8/src/rclone_api/walk.py

@@ -0,0 +1,82 @@
+from concurrent.futures import ThreadPoolExecutor
+from queue import Empty, Queue
+from typing import Generator
+
+from rclone_api import Dir
+from rclone_api.dir_listing import DirListing
+
+
+def walk(
+    dir: Dir, max_depth: int = -1, max_workers: int = 4
+) -> Generator[DirListing, None, None]:
+    """Walk through the given directory recursively.
+
+    Args:
+        dir: Directory to walk through
+        max_depth: Maximum depth to traverse (-1 for unlimited)
+
+    Yields:
+        DirListing: Directory listing for each directory encountered
+    """
+    pending: Queue[tuple[Dir | None, int]] = Queue()
+    results: Queue[DirListing | Exception] = Queue()
+
+    def worker():
+        while True:
+            try:
+                # Add timeout to allow checking for sentinel value
+                try:
+                    current_dir, depth = pending.get(timeout=0.1)
+                except Empty:
+                    continue
+
+                # Check for sentinel value
+                if current_dir is None:
+                    pending.task_done()
+                    break
+
+                listing = current_dir.ls()
+                results.put(listing)
+
+                if max_depth == -1 or depth < max_depth:
+                    for d in listing.dirs:
+                        pending.put((d, depth + 1))
+
+                pending.task_done()
+            except Exception as e:
+                results.put(e)
+                pending.task_done()
+                break
+        return None
+
+    # Start workers
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        workers = [executor.submit(worker) for _ in range(max_workers)]
+
+        # Start walking
+        pending.put((dir, 0))
+
+        # Process results while workers are running
+        completed = 0
+        while completed < max_workers:
+            try:
+                result = results.get(timeout=0.1)
+                if isinstance(result, Exception):
+                    # Propagate exception
+                    raise result
+                yield result
+            except Empty:
+                # Check if any workers have completed
+                completed = sum(1 for w in workers if w.done())
+                continue
+
+        # Signal workers to stop
+        for _ in range(max_workers):
+            pending.put((None, 0))
+
+        # Drain any remaining results
+        while not results.empty():
+            result = results.get()
+            if isinstance(result, Exception):
+                raise result
+            yield result

{rclone_api-1.0.6 → rclone_api-1.0.8/src/rclone_api.egg-info}/PKG-INFO

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

{rclone_api-1.0.6 → rclone_api-1.0.8}/src/rclone_api.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/rclone_api/remote.py
 src/rclone_api/rpath.py
 src/rclone_api/types.py
 src/rclone_api/util.py
+src/rclone_api/walk.py
 src/rclone_api.egg-info/PKG-INFO
 src/rclone_api.egg-info/SOURCES.txt
 src/rclone_api.egg-info/dependency_links.txt

rclone_api-1.0.6/src/rclone_api/dir_listing.py

@@ -1,12 +0,0 @@
-from dataclasses import dataclass
-
-from rclone_api.dir import Dir
-from rclone_api.file import File
-
-
-@dataclass
-class DirListing:
-    """Remote file dataclass."""
-
-    dirs: list[Dir]
-    files: list[File]