rclone-api 1.1.76__tar.gz → 1.1.78__tar.gz

{rclone_api-1.1.76 → rclone_api-1.1.78}/PKG-INFO

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

{rclone_api-1.1.76 → rclone_api-1.1.78}/pyproject.toml

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

{rclone_api-1.1.76 → rclone_api-1.1.78}/src/rclone_api/mount.py

@@ -310,18 +310,17 @@ class MultiMountFileChunker:
                 executor.submit(lambda: mount.close())
 
     def fetch(self, offset: int, size: int) -> bytes | Exception:
-        print(f"Fetching chunk {offset} - {offset + size} from {self.filename}")
         try:
             try:
-                assert offset % self.chunk_size.as_int() == 0, f"Invalid offset: {offset}"
-                #assert size <= self.chunk_size.as_int(), f"Invalid size: {size}"
+                assert (
+                    offset % self.chunk_size.as_int() == 0
+                ), f"Invalid offset: {offset}"
                 assert size > 0, f"Invalid size: {size}"
                 assert offset >= 0, f"Invalid offset: {offset}"
             except AssertionError as e:
                 warnings.warn(f"Invalid chunk request: {e}")
                 return ValueError(e)
 
-            print("Collecting chunks")
             chunks: list[tuple[int, int]] = []
             start = offset
             end = offset + size
@@ -338,13 +337,11 @@ class MultiMountFileChunker:
                     self.mounts_processing.append(mount)
 
                 path = mount.mount_path / self.filename
-                print(f"Fetching chunk {start} - {start + chunk_size} from {path}")
 
-                def task(start=start, size=chunk_size, path=path,mount=mount) -> bytes | Exception:
+                def task(
+                    start=start, size=chunk_size, path=path, mount=mount
+                ) -> bytes | Exception:
                     try:
-                        print(
-                            f"Fetching chunk {start} - {start + size} from {path}"
-                        )
                         with path.open("rb") as f:
                             f.seek(offset)
                             return f.read(size)

{rclone_api-1.1.76 → rclone_api-1.1.78}/src/rclone_api/profile/mount_copy_bytes.py

@@ -13,6 +13,7 @@ import psutil
 from dotenv import load_dotenv
 
 from rclone_api import Config, Rclone, SizeSuffix
+from rclone_api.mount import MultiMountFileChunker
 
 os.environ["RCLONE_API_VERBOSE"] = "1"
 
@@ -119,15 +120,27 @@ def _run_profile(
     net_io_start = psutil.net_io_counters()
     start = time.time()
     chunk_size = size // transfers
-    bytes_or_err: bytes | Exception = rclone.copy_bytes(
+
+    filechunker: MultiMountFileChunker = rclone.get_multi_mount_file_chunker(
         src=src_file,
-        offset=offset.as_int(),
-        length=size.as_int(),
         chunk_size=chunk_size,
+        threads=transfers,
         direct_io=direct_io,
-        max_threads=transfers,
         mount_log=mount_log,
     )
+
+    # bytes_or_err: bytes | Exception = rclone.copy_bytes(
+    #     src=src_file,
+    #     offset=offset.as_int(),
+    #     length=size.as_int(),
+    #     chunk_size=chunk_size,
+    #     direct_io=direct_io,
+    #     max_threads=transfers,
+    #     mount_log=mount_log,
+    # )
+
+    bytes_or_err = filechunker.fetch(offset.as_int(), size.as_int())
+
     diff = time.time() - start
     net_io_end = psutil.net_io_counters()
     if isinstance(bytes_or_err, Exception):

{rclone_api-1.1.76 → rclone_api-1.1.78}/src/rclone_api.egg-info/PKG-INFO

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