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

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

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

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

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

{rclone_api-1.0.4 → rclone_api-1.0.6}/src/rclone_api/__init__.py

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

rclone_api-1.0.6/src/rclone_api/dir.py

@@ -0,0 +1,17 @@
+from rclone_api.dir_listing import DirListing
+from rclone_api.rpath import RPath
+
+
+class Dir:
+    """Remote file dataclass."""
+
+    def __init__(self, path: RPath) -> None:
+        self.path = path
+
+    def ls(self) -> DirListing:
+        """List files and directories in the given path."""
+        assert self.path.rclone is not None
+        return self.path.rclone.ls(self.path.path)
+
+    def __str__(self) -> str:
+        return str(self.path)

rclone_api-1.0.6/src/rclone_api/dir_listing.py

@@ -0,0 +1,12 @@
+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]

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

@@ -5,6 +5,9 @@ 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
@@ -23,7 +26,7 @@ class Rclone:
     def _run(self, cmd: list[str]) -> subprocess.CompletedProcess:
         return self._exec.execute(cmd)
 
-    def ls(self, path: str | Remote, max_depth: int = 0) -> list[RPath]:
+    def ls(self, path: str | Remote, max_depth: int = 0) -> DirListing:
         """List files in the given path.
 
         Args:
@@ -40,10 +43,12 @@ class Rclone:
 
         cp = self._run(cmd)
         text = cp.stdout
-        out: list[RPath] = RPath.from_json_str(text)
-        for o in out:
+        paths: list[RPath] = RPath.from_json_str(text)
+        for o in paths:
             o.set_rclone(self)
-        return out
+        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)
 
     def listremotes(self) -> list[Remote]:
         cmd = ["listremotes"]

{rclone_api-1.0.4 → rclone_api-1.0.6}/src/rclone_api/rpath.py

@@ -1,5 +1,4 @@
 import json
-from pathlib import Path
 from typing import Any
 
 
@@ -73,41 +72,6 @@ class RPath:
             # "IsBucket": self.is_bucket,
         }
 
-    def read_text(self) -> str:
-        """Read the file contents as bytes.
-
-        Returns:
-            bytes: The file contents
-
-        Raises:
-            RuntimeError: If no rclone instance is associated with this file
-            RuntimeError: If the path represents a directory
-        """
-        if self.rclone is None:
-            raise RuntimeError("No rclone instance associated with this file")
-        if self.is_dir:
-            raise RuntimeError("Cannot read a directory as bytes")
-
-        result = self.rclone._run(["cat", self.path])
-        return result.stdout
-
-    def read(self, dest: Path) -> None:
-        """Copy the remote file to a local destination path.
-
-        Args:
-            dest: Local destination path where the file will be copied
-
-        Raises:
-            RuntimeError: If no rclone instance is associated with this file
-            RuntimeError: If the path represents a directory
-        """
-        if self.rclone is None:
-            raise RuntimeError("No rclone instance associated with this file")
-        if self.is_dir:
-            raise RuntimeError("Cannot read a directory as a file")
-
-        self.rclone._run(["copyto", self.path, str(dest)])
-
     def __str__(self) -> str:
         out = self.to_json()
         return json.dumps(out)

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

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

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

@@ -19,6 +19,7 @@ src/rclone_api/__init__.py
 src/rclone_api/cli.py
 src/rclone_api/config.py
 src/rclone_api/dir.py
+src/rclone_api/dir_listing.py
 src/rclone_api/file.py
 src/rclone_api/rclone.py
 src/rclone_api/remote.py

rclone_api-1.0.4/src/rclone_api/dir.py

@@ -1,27 +0,0 @@
-from rclone_api.file import File
-from rclone_api.rpath import RPath
-
-
-class Dir:
-    """Remote file dataclass."""
-
-    def __init__(self, path: RPath) -> None:
-        self.path = path
-
-    def ls(self) -> tuple[list["Dir"], list[File]]:
-        """List files and directories in the given path."""
-        cmd = ["lsjson", "--files-only", "--dirs-only", "--json", str(self.path)]
-        assert self.path.rclone is not None
-        cp = self.path.rclone._run(cmd)
-        text = cp.stdout
-        tmp: list[RPath] = RPath.from_json_str(text)
-        for t in tmp:
-            t.set_rclone(self.path.rclone)
-        # dirs = [o for o in out if o.is_dir]
-        # files = [o for o in out if not o.is_dir]
-        dirs = [Dir(p) for p in tmp if p.is_dir]
-        files = [File(p) for p in tmp if not p.is_dir]
-        return dirs, files
-
-    def __str__(self) -> str:
-        return str(self.path)