rclone-api 1.1.76__py2.py3-none-any.whl → 1.1.78__py2.py3-none-any.whl

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/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.dist-info → rclone_api-1.1.78.dist-info}/METADATA

@@ -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.dist-info → rclone_api-1.1.78.dist-info}/RECORD

@@ -11,7 +11,7 @@ rclone_api/exec.py,sha256=Pd7pUBd8ib5MzqvMybG2DQISPRbDRu20VjVRL2mLAVY,1076
 rclone_api/file.py,sha256=EP5yT2dZ0H2p7CY5n0y5k5pHhIliV25pm8KOwBklUTk,1863
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
-rclone_api/mount.py,sha256=7YWS7nyB3D2T7zmmXHP_mN9JB8vyaBHhIs5WrtPAAqo,13883
+rclone_api/mount.py,sha256=ghMMi1bszAhI_eqgbqPXKhy1-iXMf-uzvggw0U1bqC0,13536
 rclone_api/process.py,sha256=rBj_S86jC6nqCYop-jq8r9eMSteKeObxUrJMgH8LZvI,5084
 rclone_api/rclone.py,sha256=3z1RY6AvYWL4aRuyY1aguXvake8bA99exemQc5Itenk,48754
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
@@ -25,7 +25,7 @@ rclone_api/cmd/copy_large_s3.py,sha256=-rfedi-ZzPUdCSP8ai9LRL0y1xVkvN-viQQlk8HVU
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
 rclone_api/experimental/flags.py,sha256=qCVD--fSTmzlk9hloRLr0q9elzAOFzPsvVpKM3aB1Mk,2739
 rclone_api/experimental/flags_base.py,sha256=ajU_czkTcAxXYU-SlmiCfHY7aCQGHvpCLqJ-Z8uZLk0,2102
-rclone_api/profile/mount_copy_bytes.py,sha256=e57dGHSfiOJJcE99gJp_9JU1fvFwk9on1nC60RBl258,7793
+rclone_api/profile/mount_copy_bytes.py,sha256=uwOmWkJklVnLqmdKTCXgBAz7p8maZlIzibd7nasp3pQ,8157
 rclone_api/s3/api.py,sha256=qxtRDUpHYqJ7StJRtP8U_PbF_BvYRg705568SyvF-R0,3770
 rclone_api/s3/basic_ops.py,sha256=hK3366xhVEzEcjz9Gk_8lFx6MRceAk72cax6mUrr6ko,2104
 rclone_api/s3/chunk_file.py,sha256=D6wM9Nuu73LNGC8JCCfevqjF3qdZ21mQxYQClFLZLMU,3726
@@ -33,9 +33,9 @@ rclone_api/s3/chunk_types.py,sha256=LbXayXY1KgVU1LkdbASD_BQ7TpVpwVnzMjtz--8LBaE,
 rclone_api/s3/create.py,sha256=wgfkapv_j904CfKuWyiBIWJVxfAx_ftemFSUV14aT68,3149
 rclone_api/s3/types.py,sha256=yBnJ38Tjk6RlydJ-sqZ7DSfyFloy8KDYJ0mv3vlOzLE,1388
 rclone_api/s3/upload_file_multipart.py,sha256=y9azNAU8QH5Ovwz33V2HZwNmJdlFjJg-jrXLZ1gtMds,10364
-rclone_api-1.1.76.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.76.dist-info/METADATA,sha256=PKG9TOdQPSKSnvv-9uHe8_oSdVOKsdF1bJIjHSE1wOc,4537
-rclone_api-1.1.76.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.76.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
-rclone_api-1.1.76.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.76.dist-info/RECORD,,
+rclone_api-1.1.78.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.78.dist-info/METADATA,sha256=SL3-2k-HSVZ-tD0coduYq4opyAiJT7blx5pQyKx4ZsE,4537
+rclone_api-1.1.78.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.78.dist-info/entry_points.txt,sha256=TV8kwP3FRzYwUEr0RLC7aJh0W03SAefIJNXTJ-FdMIQ,200
+rclone_api-1.1.78.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.78.dist-info/RECORD,,