rclone-api 1.0.13__py2.py3-none-any.whl → 1.0.15__py2.py3-none-any.whl

rclone_api/__init__.py

@@ -1,9 +1,19 @@
+from .config import Config
 from .dir import Dir
 from .dir_listing import DirListing
 from .file import File
+from .filelist import FileList
 from .rclone import Rclone
 from .remote import Remote
 from .rpath import RPath
-from .types import Config
 
-__all__ = ["Rclone", "File", "Config", "Remote", "Dir", "RPath", "DirListing"]
+__all__ = [
+    "Rclone",
+    "File",
+    "Config",
+    "Remote",
+    "Dir",
+    "RPath",
+    "DirListing",
+    "FileList",
+]

rclone_api/config.py

@@ -1,19 +1,8 @@
-import subprocess
 from dataclasses import dataclass
-from pathlib import Path
-
-from rclone_api.types import Config
 
 
 @dataclass
-class RcloneExec:
-    """Rclone execution dataclass."""
-
-    rclone_config: Path | Config
-    rclone_exe: Path
-
-    def execute(self, cmd: list[str]) -> subprocess.CompletedProcess:
-        """Execute rclone command."""
-        from rclone_api.util import rclone_execute
+class Config:
+    """Rclone configuration dataclass."""
 
-        return rclone_execute(cmd, self.rclone_config, self.rclone_exe)
+    text: str

rclone_api/convert.py

@@ -0,0 +1,31 @@
+from rclone_api.dir import Dir
+from rclone_api.file import File
+from rclone_api.remote import Remote
+
+
+def convert_to_filestr_list(files: str | File | list[str] | list[File]) -> list[str]:
+    out: list[str] = []
+    if isinstance(files, str):
+        out.append(files)
+    elif isinstance(files, File):
+        out.append(str(files.path))
+    elif isinstance(files, list):
+        for f in files:
+            if isinstance(f, File):
+                f = str(f.path)
+            out.append(f)
+    else:
+        raise ValueError(f"Invalid type for file: {type(files)}")
+    return out
+
+
+def convert_to_str(file_or_dir: str | File | Dir | Remote) -> str:
+    if isinstance(file_or_dir, str):
+        return file_or_dir
+    if isinstance(file_or_dir, File):
+        return str(file_or_dir.path)
+    if isinstance(file_or_dir, Dir):
+        return str(file_or_dir.path)
+    if isinstance(file_or_dir, Remote):
+        return str(file_or_dir)
+    raise ValueError(f"Invalid type for file_or_dir: {type(file_or_dir)}")

rclone_api/dir.py

@@ -1,3 +1,4 @@
+import json
 from typing import Generator
 
 from rclone_api.dir_listing import DirListing
@@ -12,6 +13,10 @@ class Dir:
     def remote(self) -> Remote:
         return self.path.remote
 
+    @property
+    def name(self) -> str:
+        return self.path.name
+
     def __init__(self, path: RPath | Remote) -> None:
         """Initialize Dir with either an RPath or Remote.
 
@@ -33,6 +38,8 @@ class Dir:
             self.path.set_rclone(path.rclone)
         else:
             self.path = path
+        # self.path.set_rclone(self.path.remote.rclone)
+        assert self.path.rclone is not None
 
     def ls(self, max_depth: int = 0) -> DirListing:
         """List files and directories in the given path."""
@@ -47,5 +54,14 @@ class Dir:
         assert self.path.rclone is not None
         return walk(self, max_depth=max_depth)
 
+    def to_json(self) -> dict:
+        """Convert the Dir to a JSON serializable dictionary."""
+        return self.path.to_json()
+
     def __str__(self) -> str:
         return str(self.path)
+
+    def __repr__(self) -> str:
+        data = self.path.to_json()
+        data_str = json.dumps(data)
+        return data_str

rclone_api/dir_listing.py

@@ -1,5 +1,5 @@
-# from rclone_api.dir import Dir
-# from rclone_api.file import File
+import json
+
 from rclone_api.rpath import RPath
 
 
@@ -12,3 +12,29 @@ class DirListing:
 
         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]
+
+    def __str__(self) -> str:
+        n_files = len(self.files)
+        n_dirs = len(self.dirs)
+        msg = f"Files: {n_files}\n"
+        if n_files > 0:
+            for f in self.files:
+                msg += f"  {f}\n"
+        msg += f"Dirs: {n_dirs}\n"
+        if n_dirs > 0:
+            for d in self.dirs:
+                msg += f"  {d}\n"
+        return msg
+
+    def __repr__(self) -> str:
+        dirs: list = []
+        files: list = []
+        for d in self.dirs:
+            dirs.append(d.path.to_json())
+        for f in self.files:
+            files.append(f.path.to_json())
+        json_obj = {
+            "dirs": dirs,
+            "files": files,
+        }
+        return json.dumps(json_obj, indent=2)

rclone_api/{types.py → exec.py}

@@ -2,12 +2,7 @@ import subprocess
 from dataclasses import dataclass
 from pathlib import Path
 
-
-@dataclass
-class Config:
-    """Rclone configuration dataclass."""
-
-    text: str
+from rclone_api.config import Config
 
 
 @dataclass
@@ -17,8 +12,8 @@ class RcloneExec:
     rclone_config: Path | Config
     rclone_exe: Path
 
-    def execute(self, cmd: list[str]) -> subprocess.CompletedProcess:
+    def execute(self, cmd: list[str], check: bool) -> subprocess.CompletedProcess:
         """Execute rclone command."""
         from rclone_api.util import rclone_execute
 
-        return rclone_execute(cmd, self.rclone_config, self.rclone_exe)
+        return rclone_execute(cmd, self.rclone_config, self.rclone_exe, check=check)

rclone_api/file.py

@@ -1,3 +1,5 @@
+import json
+
 from rclone_api.rpath import RPath
 
 
@@ -10,6 +12,10 @@ class File:
     ) -> None:
         self.path = path
 
+    @property
+    def name(self) -> str:
+        return self.path.name
+
     def read_text(self) -> str:
         """Read the file contents as bytes.
 
@@ -25,8 +31,17 @@ class File:
         if self.path.is_dir:
             raise RuntimeError("Cannot read a directory as bytes")
 
-        result = self.path.rclone._run(["cat", self.path.path])
+        result = self.path.rclone._run(["cat", self.path.path], check=True)
         return result.stdout
 
+    def to_json(self) -> dict:
+        """Convert the File to a JSON serializable dictionary."""
+        return self.path.to_json()
+
     def __str__(self) -> str:
         return str(self.path)
+
+    def __repr__(self) -> str:
+        data = self.path.to_json()
+        data_str = json.dumps(data)
+        return data_str

rclone_api/filelist.py

@@ -0,0 +1,30 @@
+from dataclasses import dataclass
+
+from rclone_api.dir import Dir
+from rclone_api.dir_listing import DirListing
+from rclone_api.file import File
+from rclone_api.rpath import RPath
+
+
+@dataclass
+class FileList:
+    """Remote file dataclass."""
+
+    dirs: list[Dir]
+    files: list[File]
+
+    def _to_dir_list(self) -> list[RPath]:
+        pathlist: list[RPath] = []
+        for d in self.dirs:
+            pathlist.append(d.path)
+        for f in self.files:
+            pathlist.append(f.path)
+        return pathlist
+
+    def __str__(self) -> str:
+        pathlist: list[RPath] = self._to_dir_list()
+        return str(DirListing(pathlist))
+
+    def __repr__(self) -> str:
+        pathlist: list[RPath] = self._to_dir_list()
+        return repr(DirListing(pathlist))

rclone_api/rclone.py

@@ -1,97 +1,234 @@
-"""
-Unit test file.
-"""
-
-import subprocess
-from pathlib import Path
-from typing import Generator
-
-from rclone_api import Dir
-from rclone_api.dir_listing import DirListing
-from rclone_api.remote import Remote
-from rclone_api.rpath import RPath
-from rclone_api.types import Config, RcloneExec
-from rclone_api.util import get_rclone_exe
-from rclone_api.walk import walk
-
-
-class Rclone:
-    def __init__(
-        self, rclone_conf: Path | Config, rclone_exe: Path | None = None
-    ) -> None:
-        if isinstance(rclone_conf, Path):
-            if not rclone_conf.exists():
-                raise ValueError(f"Rclone config file not found: {rclone_conf}")
-        self._exec = RcloneExec(rclone_conf, get_rclone_exe(rclone_exe))
-
-    def _run(self, cmd: list[str]) -> subprocess.CompletedProcess:
-        return self._exec.execute(cmd)
-
-    def ls(self, path: Dir | Remote | str, max_depth: int | None = None) -> DirListing:
-        """List files in the given path.
-
-        Args:
-            path: Remote path or Remote object to list
-            max_depth: Maximum recursion depth (0 means no recursion)
-
-        Returns:
-            List of File objects found at the path
-        """
-        cmd = ["lsjson"]
-        if max_depth is not None:
-            cmd.append("--recursive")
-            if max_depth > -1:
-                cmd.append("--max-depth")
-                cmd.append(str(max_depth))
-        cmd.append(str(path))
-        remote = path.remote if isinstance(path, Dir) else path
-        assert isinstance(remote, Remote)
-
-        cp = self._run(cmd)
-        text = cp.stdout
-        paths: list[RPath] = RPath.from_json_str(text, remote)
-        for o in paths:
-            o.set_rclone(self)
-        return DirListing(paths)
-
-    def listremotes(self) -> list[Remote]:
-        cmd = ["listremotes"]
-        cp = self._run(cmd)
-        text: str = cp.stdout
-        tmp = text.splitlines()
-        tmp = [t.strip() for t in tmp]
-        # strip out ":" from the end
-        tmp = [t.replace(":", "") for t in tmp]
-        out = [Remote(name=t, rclone=self) for t in tmp]
-        return out
-
-    def walk(
-        self, path: Dir | Remote, max_depth: int = -1
-    ) -> Generator[DirListing, None, None]:
-        """Walk through the given path recursively.
-
-        Args:
-            path: Remote path or Remote object to walk through
-            max_depth: Maximum depth to traverse (-1 for unlimited)
-
-        Yields:
-            DirListing: Directory listing for each directory encountered
-        """
-        if isinstance(path, Dir):
-            # Create a Remote object for the path
-            remote = path.remote
-            rpath = RPath(
-                remote=remote,
-                path=path.path.path,
-                name=path.path.name,
-                size=0,
-                mime_type="inode/directory",
-                mod_time="",
-                is_dir=True,
-            )
-            rpath.set_rclone(self)
-            dir_obj = Dir(rpath)
-        else:
-            dir_obj = Dir(path)
-
-        yield from walk(dir_obj, max_depth=max_depth)
+"""
+Unit test file.
+"""
+
+import subprocess
+from concurrent.futures import ThreadPoolExecutor
+from fnmatch import fnmatch
+from pathlib import Path
+from typing import Generator
+
+from rclone_api import Dir
+from rclone_api.config import Config
+from rclone_api.convert import convert_to_filestr_list, convert_to_str
+from rclone_api.dir_listing import DirListing
+from rclone_api.exec import RcloneExec
+from rclone_api.file import File
+from rclone_api.filelist import FileList
+from rclone_api.remote import Remote
+from rclone_api.rpath import RPath
+from rclone_api.util import get_rclone_exe, to_path
+from rclone_api.walk import walk
+
+
+class Rclone:
+    def __init__(
+        self, rclone_conf: Path | Config, rclone_exe: Path | None = None
+    ) -> None:
+        if isinstance(rclone_conf, Path):
+            if not rclone_conf.exists():
+                raise ValueError(f"Rclone config file not found: {rclone_conf}")
+        self._exec = RcloneExec(rclone_conf, get_rclone_exe(rclone_exe))
+
+    def _run(self, cmd: list[str], check: bool = True) -> subprocess.CompletedProcess:
+        return self._exec.execute(cmd, check=check)
+
+    def ls(
+        self,
+        path: Dir | Remote | str,
+        max_depth: int | None = None,
+        glob: str | None = None,
+    ) -> DirListing:
+        """List files in the given path.
+
+        Args:
+            path: Remote path or Remote object to list
+            max_depth: Maximum recursion depth (0 means no recursion)
+
+        Returns:
+            List of File objects found at the path
+        """
+
+        if isinstance(path, str):
+            path = Dir(
+                to_path(path, self)
+            )  # assume it's a directory if ls is being called.
+
+        cmd = ["lsjson"]
+        if max_depth is not None:
+            cmd.append("--recursive")
+            if max_depth > -1:
+                cmd.append("--max-depth")
+                cmd.append(str(max_depth))
+        cmd.append(str(path))
+        remote = path.remote if isinstance(path, Dir) else path
+        assert isinstance(remote, Remote)
+
+        cp = self._run(cmd, check=True)
+        text = cp.stdout
+        parent_path: str | None = None
+        if isinstance(path, Dir):
+            parent_path = path.path.path
+        paths: list[RPath] = RPath.from_json_str(text, remote, parent_path=parent_path)
+        # print(parent_path)
+        for o in paths:
+            o.set_rclone(self)
+
+        # do we have a glob pattern?
+        if glob is not None:
+            paths = [p for p in paths if fnmatch(p.path, glob)]
+        return DirListing(paths)
+
+    def listremotes(self) -> list[Remote]:
+        cmd = ["listremotes"]
+        cp = self._run(cmd)
+        text: str = cp.stdout
+        tmp = text.splitlines()
+        tmp = [t.strip() for t in tmp]
+        # strip out ":" from the end
+        tmp = [t.replace(":", "") for t in tmp]
+        out = [Remote(name=t, rclone=self) for t in tmp]
+        return out
+
+    def walk(
+        self, path: Dir | Remote | str, max_depth: int = -1
+    ) -> Generator[DirListing, None, None]:
+        """Walk through the given path recursively.
+
+        Args:
+            path: Remote path or Remote object to walk through
+            max_depth: Maximum depth to traverse (-1 for unlimited)
+
+        Yields:
+            DirListing: Directory listing for each directory encountered
+        """
+        if isinstance(path, Dir):
+            # Create a Remote object for the path
+            remote = path.remote
+            rpath = RPath(
+                remote=remote,
+                path=path.path.path,
+                name=path.path.name,
+                size=0,
+                mime_type="inode/directory",
+                mod_time="",
+                is_dir=True,
+            )
+            rpath.set_rclone(self)
+            dir_obj = Dir(rpath)
+        elif isinstance(path, str):
+            dir_obj = Dir(to_path(path, self))
+        elif isinstance(path, Remote):
+            dir_obj = Dir(path)
+        else:
+            assert f"Invalid type for path: {type(path)}"
+
+        yield from walk(dir_obj, max_depth=max_depth)
+
+    def copyfile(self, src: File | str, dst: File | str) -> None:
+        """Copy a single file from source to destination.
+
+        Args:
+            src: Source file path (including remote if applicable)
+            dst: Destination file path (including remote if applicable)
+
+        Raises:
+            subprocess.CalledProcessError: If the copy operation fails
+        """
+        src = src if isinstance(src, str) else str(src.path)
+        dst = dst if isinstance(dst, str) else str(dst.path)
+        cmd_list: list[str] = ["copyto", src, dst]
+        self._run(cmd_list)
+
+    def copyfiles(self, filelist: dict[File, File] | dict[str, str]) -> None:
+        """Copy multiple files from source to destination.
+
+        Warning - slow.
+
+        Args:
+            payload: Dictionary of source and destination file paths
+        """
+        str_dict: dict[str, str] = {}
+        for src, dst in filelist.items():
+            src = src if isinstance(src, str) else str(src.path)
+            dst = dst if isinstance(dst, str) else str(dst.path)
+            str_dict[src] = dst
+
+        with ThreadPoolExecutor(max_workers=64) as executor:
+            for src, dst in str_dict.items():  # warning - slow
+                cmd_list: list[str] = ["copyto", src, dst]
+                # self._run(cmd_list)
+                executor.submit(self._run, cmd_list)
+
+    def copy(
+        self, src: Dir | str, dst: Dir | str, filelist: FileList | None = None
+    ) -> subprocess.CompletedProcess:
+        """Copy files from source to destination.
+
+        Args:
+            src: Source directory
+            dst: Destination directory
+        """
+        # src_dir = src.path.path
+        # dst_dir = dst.path.path
+        src_dir = convert_to_str(src)
+        dst_dir = convert_to_str(dst)
+        cmd_list: list[str] = ["copy", src_dir, dst_dir]
+        return self._run(cmd_list)
+
+    def purge(self, path: Dir | str) -> subprocess.CompletedProcess:
+        """Purge a directory"""
+        # path should always be a string
+        path = path if isinstance(path, str) else str(path.path)
+        cmd_list: list[str] = ["purge", str(path)]
+        return self._run(cmd_list)
+
+    def deletefiles(
+        self, files: str | File | list[str] | list[File]
+    ) -> subprocess.CompletedProcess:
+        """Delete a directory"""
+        payload: list[str] = convert_to_filestr_list(files)
+        cmd_list: list[str] = ["delete"] + payload
+        return self._run(cmd_list)
+
+    def exists(self, path: Dir | Remote | str | File) -> bool:
+        """Check if a file or directory exists."""
+        arg: str = convert_to_str(path)
+        assert isinstance(arg, str)
+        try:
+            self.ls(arg)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def is_synced(self, src: str | Dir, dst: str | Dir) -> bool:
+        """Check if two directories are in sync."""
+        src = convert_to_str(src)
+        dst = convert_to_str(dst)
+        cmd_list: list[str] = ["check", str(src), str(dst)]
+        try:
+            self._run(cmd_list)
+            return True
+        except subprocess.CalledProcessError:
+            return False
+
+    def copy_dir(
+        self, src: str | Dir, dst: str | Dir, args: list[str] | None = None
+    ) -> subprocess.CompletedProcess:
+        """Copy a directory from source to destination."""
+        # convert src to str, also dst
+        src = convert_to_str(src)
+        dst = convert_to_str(dst)
+        cmd_list: list[str] = ["copy", src, dst]
+        if args is not None:
+            cmd_list += args
+        return self._run(cmd_list)
+
+    def copy_remote(
+        self, src: Remote, dst: Remote, args: list[str] | None = None
+    ) -> subprocess.CompletedProcess:
+        """Copy a remote to another remote."""
+        cmd_list: list[str] = ["copy", str(src), str(dst)]
+        if args is not None:
+            cmd_list += args
+        return self._run(cmd_list)

rclone_api/rpath.py

@@ -19,9 +19,6 @@ class RPath:
     ) -> None:
         from rclone_api.rclone import Rclone
 
-        if "dst:" in path:
-            raise ValueError(f"Invalid path: {path}")
-
         self.remote = remote
         self.path = path
         self.name = name
@@ -39,11 +36,16 @@ class RPath:
         self.rclone = rclone
 
     @staticmethod
-    def from_dict(data: dict, remote: Remote) -> "RPath":
+    def from_dict(
+        data: dict, remote: Remote, parent_path: str | None = None
+    ) -> "RPath":
         """Create a File from a dictionary."""
+        path = data["Path"]
+        if parent_path is not None:
+            path = f"{parent_path}/{path}"
         return RPath(
             remote,
-            data["Path"],
+            path,
             data["Name"],
             data["Size"],
             data["MimeType"],
@@ -53,21 +55,25 @@ class RPath:
         )
 
     @staticmethod
-    def from_array(data: list[dict], remote: Remote) -> list["RPath"]:
+    def from_array(
+        data: list[dict], remote: Remote, parent_path: str | None = None
+    ) -> list["RPath"]:
         """Create a File from a dictionary."""
         out: list[RPath] = []
         for d in data:
-            file: RPath = RPath.from_dict(d, remote)
+            file: RPath = RPath.from_dict(d, remote, parent_path)
             out.append(file)
         return out
 
     @staticmethod
-    def from_json_str(json_str: str, remote: Remote) -> list["RPath"]:
+    def from_json_str(
+        json_str: str, remote: Remote, parent_path: str | None = None
+    ) -> list["RPath"]:
         """Create a File from a JSON string."""
         json_obj = json.loads(json_str)
         if isinstance(json_obj, dict):
-            return [RPath.from_dict(json_obj, remote)]
-        return RPath.from_array(json_obj, remote)
+            return [RPath.from_dict(json_obj, remote, parent_path)]
+        return RPath.from_array(json_obj, remote, parent_path)
 
     def to_json(self) -> dict:
         return {
@@ -82,3 +88,8 @@ class RPath:
 
     def __str__(self) -> str:
         return f"{self.remote.name}:{self.path}"
+
+    def __repr__(self):
+        data = self.to_json()
+        data["Remote"] = self.remote.name
+        return json.dumps(data)

rclone_api/util.py

@@ -5,10 +5,10 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
 
+from rclone_api.config import Config
 from rclone_api.dir import Dir
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
-from rclone_api.types import Config
 
 # from .rclone import Rclone
 
@@ -25,7 +25,7 @@ def to_path(item: Dir | Remote | str, rclone: Any) -> RPath:
         remote_name = parts[0]
         path = ":".join(parts[1:])
         remote = Remote(name=remote_name, rclone=rclone)
-        return RPath(
+        out = RPath(
             remote=remote,
             path=path,
             name="",
@@ -34,10 +34,12 @@ def to_path(item: Dir | Remote | str, rclone: Any) -> RPath:
             mod_time="",
             is_dir=True,
         )
+        out.set_rclone(rclone)
+        return out
     elif isinstance(item, Dir):
         return item.path
     elif isinstance(item, Remote):
-        return RPath(
+        out = RPath(
             remote=item,
             path=str(item),
             name=str(item),
@@ -46,6 +48,8 @@ def to_path(item: Dir | Remote | str, rclone: Any) -> RPath:
             mod_time="",
             is_dir=True,
         )
+        out.set_rclone(rclone)
+        return out
     else:
         raise ValueError(f"Invalid type for item: {type(item)}")
 
@@ -71,6 +75,7 @@ def rclone_execute(
     cmd: list[str],
     rclone_conf: Path | Config,
     rclone_exe: Path,
+    check: bool,
     verbose: bool | None = None,
 ) -> subprocess.CompletedProcess:
     tempdir: TemporaryDirectory | None = None
@@ -90,8 +95,16 @@ def rclone_execute(
             cmd_str = subprocess.list2cmdline(cmd)
             print(f"Running: {cmd_str}")
         cp = subprocess.run(
-            cmd, capture_output=True, encoding="utf-8", check=True, shell=False
+            cmd, capture_output=True, encoding="utf-8", check=check, shell=False
         )
+        if cp.returncode != 0:
+            cmd_str = subprocess.list2cmdline(cmd)
+            print(
+                f"Error running: {cmd_str}, returncode: {cp.returncode}\n{cp.stdout}\n{cp.stderr}"
+            )
+            raise subprocess.CalledProcessError(
+                cp.returncode, cmd, cp.stdout, cp.stderr
+            )
         return cp
     finally:
         if tempdir:

rclone_api/walk.py

@@ -1,87 +1,70 @@
-from concurrent.futures import ThreadPoolExecutor
-from queue import Empty, Queue
+from queue import Queue
+from threading import Thread
 from typing import Generator
 
 from rclone_api import Dir
 from rclone_api.dir_listing import DirListing
 from rclone_api.remote import Remote
 
+_MAX_OUT_QUEUE_SIZE = 50
 
-def walk(
-    dir: Dir | Remote, max_depth: int = -1, max_workers: int = 4
-) -> Generator[DirListing, None, None]:
+
+def _walk_runner(
+    queue: Queue[Dir], max_depth: int, out_queue: Queue[DirListing | None]
+) -> None:
+    try:
+        while not queue.empty():
+            current_dir = queue.get()
+            dirlisting = current_dir.ls()
+            out_queue.put(dirlisting)
+            dirs = dirlisting.dirs
+
+            if max_depth != 0 and len(dirs) > 0:
+                for child in dirs:
+                    queue.put(child)
+            if max_depth < 0:
+                continue
+            if max_depth > 0:
+                max_depth -= 1
+        out_queue.put(None)
+    except KeyboardInterrupt:
+        import _thread
+
+        out_queue.put(None)
+
+        _thread.interrupt_main()
+
+
+def walk(dir: Dir | Remote, max_depth: int = -1) -> Generator[DirListing, None, None]:
     """Walk through the given directory recursively.
 
     Args:
         dir: Directory or Remote to walk through
         max_depth: Maximum depth to traverse (-1 for unlimited)
-        max_workers: Maximum number of concurrent workers
 
     Yields:
         DirListing: Directory listing for each directory encountered
     """
-    # Convert Remote to Dir if needed
-    if isinstance(dir, Remote):
-        dir = Dir(dir)
-    pending: Queue[tuple[Dir | None, int]] = Queue()
-    results: Queue[DirListing | Exception] = Queue()
+    try:
+        # Convert Remote to Dir if needed
+        if isinstance(dir, Remote):
+            dir = Dir(dir)
 
-    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
+        in_queue: Queue[Dir] = Queue()
+        out_queue: Queue[DirListing] = Queue(maxsize=_MAX_OUT_QUEUE_SIZE)
+        in_queue.put(dir)
 
-                # Check for sentinel value
-                if current_dir is None:
-                    pending.task_done()
-                    break
+        # Start worker thread
+        worker = Thread(
+            target=_walk_runner, args=(in_queue, max_depth, out_queue), daemon=True
+        )
+        worker.start()
 
-                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()
+        while dirlisting := out_queue.get():
+            if dirlisting is None:
                 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))
+            yield dirlisting
 
-        # Drain any remaining results
-        while not results.empty():
-            result = results.get()
-            if isinstance(result, Exception):
-                raise result
-            yield result
+        worker.join()
+    except KeyboardInterrupt:
+        pass

{rclone_api-1.0.13.dist-info → rclone_api-1.0.15.dist-info}/METADATA

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

rclone_api-1.0.15.dist-info/RECORD

@@ -0,0 +1,20 @@
+rclone_api/__init__.py,sha256=BqlqMsxNo5YkSo0ov7CRM5WsyAh2yJQa9Fpodc-rQ7I,344
+rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
+rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
+rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
+rclone_api/dir.py,sha256=xUV4i9_E7QHrqHld2IPBlon1CGaAp8qQYMKfJTyVvoQ,2088
+rclone_api/dir_listing.py,sha256=8t5Jx9ZVOJPqGKTJbWaES6bjgogUT2bnpbPVWwK1Fcs,1124
+rclone_api/exec.py,sha256=djQrWtziTIroEb5YJQxDyTJDGK39xN0fWtv0HJGnjgk,498
+rclone_api/file.py,sha256=D02iHJW1LhfOiM_R_yPHP8_ApnDiYrkuraVcrV8-qkw,1246
+rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
+rclone_api/rclone.py,sha256=BQaT11O0eyCLxGrXDNJ7fXeVxgmg4j5UsDSjoTuRPfg,8267
+rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
+rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
+rclone_api/util.py,sha256=24rHFv6NqgXPaqhpy4spGyVcoN2GjrDwEWtoD7LRllk,3345
+rclone_api/walk.py,sha256=J78-bY2AhNpt2ICsI5LqmXRE7oC6wVDoKoicIoU6XMg,1953
+rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
+rclone_api-1.0.15.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.15.dist-info/METADATA,sha256=WbUA2T_9meHMVxa5XtK14ypTSRDG8KxJbH2t3J4VDYM,1375
+rclone_api-1.0.15.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.15.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.15.dist-info/RECORD,,

rclone_api-1.0.13.dist-info/RECORD

@@ -1,18 +0,0 @@
-rclone_api/__init__.py,sha256=YH7KQaPwUiJWJiRf0NRKD7XHhMXsxWdXDjt9WLSwdjA,265
-rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
-rclone_api/config.py,sha256=UujjDNcpwgipgdyFPMhC3zikvlsrurUvvZiwXm5NlPg,471
-rclone_api/dir.py,sha256=tu0-Yy1s3O1MVY7Nkb6NOh6t9dXJ9DQvqOZVlWIexrI,1629
-rclone_api/dir_listing.py,sha256=NWleKHCCRW7_eh9JfRwE6r3QbjmiHD5ZEGQcd2vm4uY,458
-rclone_api/file.py,sha256=nJwJT7v2KwY_8g7UB3Y7O6pFfHn3nri9dJ3GS-cN3EE,874
-rclone_api/rclone.py,sha256=upMqUxYKC3LCjHlhI66_IdOD1t5PKo7V64sSdw0vAlk,3074
-rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
-rclone_api/rpath.py,sha256=QHD5zDjDIkivs3kCRYtTL8mP-DspXIvBVYWHSf_Y6Rg,2263
-rclone_api/types.py,sha256=Yp15HrjwZonSQhE323R0WP7fA4NWqKjAfM7z3OwHpWI,518
-rclone_api/util.py,sha256=xYUj0B9W5HDauTHh7Z8cnEQsTEuXvRcVNLtk3ZanlGM,2894
-rclone_api/walk.py,sha256=3GKnu9P5aPNiftfoi52U7wo1wixZxwxdqqS0_IlMGCE,2816
-rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
-rclone_api-1.0.13.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.13.dist-info/METADATA,sha256=yEL4GNzAc-CwJt-rJVmDAl08L13RqytSSs1ZQR4KMA0,1375
-rclone_api-1.0.13.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.13.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.13.dist-info/RECORD,,