rclone-api 1.3.4__tar.gz → 1.3.6__tar.gz

{rclone_api-1.3.4 → rclone_api-1.3.6}/PKG-INFO

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

{rclone_api-1.3.4 → rclone_api-1.3.6}/pyproject.toml

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

{rclone_api-1.3.4 → rclone_api-1.3.6}/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.4 → rclone_api-1.3.6}/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.4 → rclone_api-1.3.6}/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.4 → rclone_api-1.3.6}/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")
@@ -271,7 +273,7 @@ def main() -> None:
         shutil.rmtree(mount_root_path)
 
     args = _parse_args()
-    transfer_list = [args.num]
+    transfer_list = None
     # parallel_workers = args.num
 
     def task(