rclone-api 1.3.5__tar.gz → 1.3.7__tar.gz

{rclone_api-1.3.5 → rclone_api-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.3.5
+Version: 1.3.7
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 License: BSD 3-Clause License

{rclone_api-1.3.5 → rclone_api-1.3.7}/pyproject.toml

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

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/__init__.py

@@ -7,7 +7,7 @@ from .config import Config, Parsed, Section
 from .diff import DiffItem, DiffOption, DiffType
 from .dir import Dir
 from .dir_listing import DirListing
-from .file import File
+from .file import File, FileItem
 from .filelist import FileList
 
 # Import the configure_logging function to make it available at package level
@@ -28,6 +28,7 @@ __all__ = [
     "RPath",
     "DirListing",
     "FileList",
+    "FileItem",
     "Process",
     "DiffItem",
     "DiffType",

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/cmd/copy_large_s3.py

@@ -4,8 +4,6 @@ from pathlib import Path
 
 from rclone_api import MultiUploadResult, Rclone, SizeSuffix
 
-_1MB = 1024 * 1024
-
 
 @dataclass
 class Args:
@@ -39,7 +37,7 @@ def _parse_args() -> Args:
         "--chunk-size",
         help="Chunk size that will be read and uploaded in SizeSuffix form, too low or too high will cause issues",
         type=str,
-        default="64MB",  # if this is too low or too high an s3 service
+        default="128MB",  # if this is too low or too high an s3 service
     )
     parser.add_argument(
         "--read-threads",

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/exec.py

@@ -14,7 +14,7 @@ class RcloneExec:
     rclone_exe: Path
 
     def execute(
-        self, cmd: list[str], check: bool, capture: bool | None = None
+        self, cmd: list[str], check: bool, capture: bool | Path | None = None
     ) -> subprocess.CompletedProcess:
         """Execute rclone command."""
         from rclone_api.util import rclone_execute

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/file.py

@@ -1,9 +1,46 @@
 import json
+import warnings
+from dataclasses import dataclass
 from pathlib import Path
 
 from rclone_api.rpath import RPath
 
 
+# File is too complex, this is a simple dataclass that can be streamed out.
+@dataclass
+class FileItem:
+    """Remote file dataclass."""
+
+    path: str
+    name: str
+    size: int
+    mime_type: str
+    mod_time: str
+
+    @staticmethod
+    def from_json(data: dict) -> "FileItem | None":
+        try:
+            return FileItem(
+                data["Path"],
+                data["Name"],
+                data["Size"],
+                data["MimeType"],
+                data["ModTime"],
+            )
+        except KeyError:
+            warnings.warn(f"Invalid data: {data}")
+            return None
+
+    @staticmethod
+    def from_json_str(data: str) -> "FileItem | None":
+        try:
+            data_dict = json.loads(data)
+            return FileItem.from_json(data_dict)
+        except json.JSONDecodeError:
+            warnings.warn(f"Invalid JSON data: {data}")
+            return None
+
+
 class File:
     """Remote file dataclass."""
 

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/mount_read_chunker.py

@@ -6,7 +6,7 @@ from threading import Lock, Semaphore
 from typing import Any
 
 from rclone_api.mount import Mount
-from rclone_api.types import FilePart
+from rclone_api.types import FilePart, SizeSuffix
 
 # Create a logger for this module
 logger = logging.getLogger(__name__)
@@ -86,7 +86,13 @@ class MultiMountFileChunker:
             self.semaphore.release()
         logger.debug("Mount released")
 
-    def fetch(self, offset: int, size: int, extra: Any) -> Future[FilePart]:
+    def fetch(
+        self, offset: int | SizeSuffix, size: int | SizeSuffix, extra: Any
+    ) -> Future[FilePart]:
+        offset = SizeSuffix(offset).as_int()
+        size = SizeSuffix(size).as_int()
+        if isinstance(size, SizeSuffix):
+            size = size.as_int()
         if self.verbose:
             logger.debug(f"Fetching data range: offset={offset}, size={size}")
 

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/process.py

@@ -72,6 +72,12 @@ class Process:
 
         atexit.register(exit_cleanup)
 
+    def __enter__(self) -> "Process":
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        self.cleanup()
+
     def cleanup(self) -> None:
         if self.tempdir and self.needs_cleanup:
             try:

{rclone_api-1.3.5 → rclone_api-1.3.7}/src/rclone_api/profile/mount_copy_bytes.py

@@ -218,7 +218,7 @@ def test_profile_copy_bytes(
             1024 * 1024 * 16,
             # 1024 * 1024 * 32,
             1024 * 1024 * 64,
-            #1024 * 1024 * 128,
+            # 1024 * 1024 * 128,
             1024 * 1024 * 256,
         ]
     # transfer_list = [1, 2, 4, 8, 16]
@@ -253,8 +253,10 @@ def _parse_args() -> Args:
     args = parser.parse_args()
     return Args(direct_io=args.direct_io, num=args.num, size=args.size)
 
+
 _SHOW_CREDS = False
 
+
 def main() -> None:
     """Main entry point."""
     print("Running test_profile_copy_bytes")