rclone-api 1.1.26__py2.py3-none-any.whl → 1.1.29__py2.py3-none-any.whl

rclone_api/rclone.py

@@ -691,7 +691,7 @@ class Rclone:
         from rclone_api.util import S3PathInfo, random_str, split_s3_path
 
         other_args: list[str] = ["--no-modtime", "--vfs-read-wait", "1s"]
-        chunk_size = chunk_size or SizeSuffix("128M")
+        chunk_size = chunk_size or SizeSuffix("64M")
         unit_chunk_size = chunk_size / read_threads
         vfs_read_chunk_size = unit_chunk_size
         vfs_read_chunk_size_limit = chunk_size
@@ -726,8 +726,6 @@ class Rclone:
             verbose=False,
             other_args=other_args,
         ):
-            # raise NotImplementedError("Not implemented yet")
-
             path_info: S3PathInfo = split_s3_path(dst)
             remote = path_info.remote
             bucket_name = path_info.bucket
@@ -813,6 +811,50 @@ class Rclone:
             )
             return out
 
+    def copy_bytes(
+        self,
+        src: str,
+        offset: int,
+        length: int,
+        transfers: int = 16,
+    ) -> bytes | Exception:
+        """Copy bytes from a file to another file."""
+        from rclone_api.util import random_str
+
+        tmp_mnt = Path("tmp_mnt") / random_str(12)
+        src_parent_path = Path(src).parent.as_posix()
+        src_file = Path(src).name
+        other_args: list[str] = ["--no-modtime", "--vfs-read-wait", "1s"]
+        unit_chunk_size = length
+        vfs_read_chunk_size = unit_chunk_size
+        vfs_read_chunk_size_limit = length
+        vfs_read_chunk_streams = transfers
+        vfs_disk_space_total_size = length
+        other_args += ["--vfs-read-chunk-size", str(vfs_read_chunk_size)]
+        other_args += ["--vfs-read-chunk-size-limit", str(vfs_read_chunk_size_limit)]
+        other_args += ["--vfs-read-chunk-streams", str(vfs_read_chunk_streams)]
+        other_args += ["--vfs-disk-space-total-size", str(vfs_disk_space_total_size)]
+        other_args += ["--read-only"]
+        other_args += ["--direct-io"]
+
+        try:
+            # use scoped mount to do the read, then write the bytes to the destination
+            with self.scoped_mount(
+                src_parent_path,
+                tmp_mnt,
+                use_links=True,
+                verbose=False,
+                vfs_cache_mode="minimal",
+                other_args=other_args,
+            ):
+                src_file_mnt = tmp_mnt / src_file
+                with open(src_file_mnt, "rb") as f:
+                    f.seek(offset)
+                    data = f.read(length)
+                    return data
+        except Exception as e:
+            return e
+
     def copy_dir(
         self, src: str | Dir, dst: str | Dir, args: list[str] | None = None
     ) -> CompletedProcess:

rclone_api/s3/api.py

@@ -9,9 +9,9 @@ from rclone_api.s3.basic_ops import (
     list_bucket_contents,
     upload_file,
 )
-from rclone_api.s3.chunk_uploader import MultiUploadResult, upload_file_multipart
 from rclone_api.s3.create import create_s3_client
 from rclone_api.s3.types import S3Credentials, S3MutliPartUploadConfig, S3UploadTarget
+from rclone_api.s3.upload_file_multipart import MultiUploadResult, upload_file_multipart
 
 _MIN_THRESHOLD_FOR_CHUNKING = 5 * 1024 * 1024
 

rclone_api/types.py

@@ -37,41 +37,68 @@ class SizeResult:
 
 
 def _to_size_suffix(size: int) -> str:
-    if size < 1024:
-        return f"{size}B"
-    elif size < 1024**2:
-        val = size / 1024
-        unit = "K"
-    elif size < 1024**3:
-        val = size / (1024**2)
-        unit = "M"
-    elif size < 1024**4:
-        val = size / (1024**3)
-        unit = "G"
-    elif size < 1024**5:
-        val = size / (1024**4)
-        unit = "T"
-    elif size < 1024**6:
-        val = size / (1024**5)
-        unit = "P"
-    else:
-        raise ValueError(f"Invalid size: {size}")
-
-    # If the float is an integer, drop the decimal, otherwise format with one decimal.
-    return f"{int(val) if val.is_integer() else f'{val:.1f}'}{unit}"
+    def _convert(size: int) -> tuple[float, str]:
+        val: float
+        unit: str
+        if size < 1024:
+            val = size
+            unit = "B"
+        elif size < 1024**2:
+            val = size / 1024
+            unit = "K"
+        elif size < 1024**3:
+            val = size / (1024**2)
+            unit = "M"
+        elif size < 1024**4:
+            val = size / (1024**3)
+            unit = "G"
+        elif size < 1024**5:
+            val = size / (1024**4)
+            unit = "T"
+        elif size < 1024**6:
+            val = size / (1024**5)
+            unit = "P"
+        else:
+            raise ValueError(f"Invalid size: {size}")
+
+        return val, unit
+
+    def _fmt(_val: float | int, _unit: str) -> str:
+        # If the float is an integer, drop the decimal, otherwise format with one decimal.
+        val_str: str = str(_val)
+        if not val_str.endswith(".0"):
+            first_str: str = f"{_val:.1f}"
+        else:
+            first_str = str(int(_val))
+        return first_str + _unit
+
+    val, unit = _convert(size)
+    out = _fmt(val, unit)
+    # Now round trip the value to fix floating point issues via rounding.
+    int_val = _from_size_suffix(out)
+    val, unit = _convert(int_val)
+    out = _fmt(val, unit)
+    return out
 
 
 # Update regex to allow decimals (e.g., 16.5MB)
 _PATTERN_SIZE_SUFFIX = re.compile(r"^(\d+(?:\.\d+)?)([A-Za-z]+)$")
 
 
+def _parse_elements(value: str) -> tuple[str, str] | None:
+    match = _PATTERN_SIZE_SUFFIX.match(value)
+    if match is None:
+        return None
+    return match.group(1), match.group(2)
+
+
 def _from_size_suffix(size: str) -> int:
     if size == "0":
         return 0
-    match = _PATTERN_SIZE_SUFFIX.match(size)
-    if match is None:
+    pair = _parse_elements(size)
+    if pair is None:
         raise ValueError(f"Invalid size suffix: {size}")
-    num_str, suffix = match.group(1), match.group(2)
+    num_str, suffix = pair
     n = float(num_str)
     # Determine the unit from the first letter (e.g., "M" from "MB")
     unit = suffix[0].upper()

{rclone_api-1.1.26.dist-info → rclone_api-1.1.29.dist-info}/METADATA

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

{rclone_api-1.1.26.dist-info → rclone_api-1.1.29.dist-info}/RECORD

@@ -13,11 +13,11 @@ rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=H92xPW9lQnbNw5KbtZCl00bD6iRh9yRbCuxku4j_3dg,8036
 rclone_api/mount.py,sha256=g9YkKCGJbWvGF7gzSKtWa8pEgphuW0-e0SySxtOirH4,6093
 rclone_api/process.py,sha256=Hgn8MGEPkBt8C6C4oIuh-n1t1GkFF2miPlIE1lh_Zbc,5045
-rclone_api/rclone.py,sha256=gszjs6MJFoT5tKmBB06sd0OjbtZZAtRdjvha4RrE-lI,40252
+rclone_api/rclone.py,sha256=bdAhJAW5KuxmTCZsSp5LfVUgD5WWfaKtuWyZTM-AGtI,41881
 rclone_api/remote.py,sha256=O9WDUFQy9f6oT1HdUbTixK2eg0xtBBm8k4Xl6aa6K00,431
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/scan_missing_folders.py,sha256=Kulca2Q6WZodt00ATFHkmqqInuoPvBkhTcS9703y6po,4740
-rclone_api/types.py,sha256=-jb8_cU-vTw7oFRcjUiMhXlskavp26Q67EBmENxjsPU,3941
+rclone_api/types.py,sha256=AWVIoCaRkUBCXOQffxdkFCOeUhPwolQh9d2albyAGHc,4730
 rclone_api/util.py,sha256=_Z-GUMVXnHYOGdo2dy2ie2P5fGgyg8KdGjHKicx68Ko,4573
 rclone_api/walk.py,sha256=-54NVE8EJcCstwDoaC_UtHm73R2HrZwVwQmsnv55xNU,3369
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
@@ -25,16 +25,16 @@ 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/s3/api.py,sha256=VstlaEnBjO2JDQuCRLdTfUGvQLbfshlXXhAzimFv4Vc,3763
+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=YELR-EzR7RHpzCDGpYdzlwu21NZW5wttIDvLoONI4aU,3477
 rclone_api/s3/chunk_types.py,sha256=LbXayXY1KgVU1LkdbASD_BQ7TpVpwVnzMjtz--8LBaE,10316
-rclone_api/s3/chunk_uploader.py,sha256=1jQAdk35Fa9Tcq36bS65262cs7AcNG2DAFQ-NdYlWSw,9961
 rclone_api/s3/create.py,sha256=wgfkapv_j904CfKuWyiBIWJVxfAx_ftemFSUV14aT68,3149
 rclone_api/s3/types.py,sha256=yBnJ38Tjk6RlydJ-sqZ7DSfyFloy8KDYJ0mv3vlOzLE,1388
-rclone_api-1.1.26.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.26.dist-info/METADATA,sha256=XP4PVPRFpIgNBCDE-dj1s2Ah4Hw5zBAo-AjAQKwu-f4,4514
-rclone_api-1.1.26.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.26.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.1.26.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.26.dist-info/RECORD,,
+rclone_api/s3/upload_file_multipart.py,sha256=1jQAdk35Fa9Tcq36bS65262cs7AcNG2DAFQ-NdYlWSw,9961
+rclone_api-1.1.29.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.1.29.dist-info/METADATA,sha256=BmYo65cIJ7V2miFqEfW5Kk1Y2-tpcMz1cbTUQNTZlNo,4514
+rclone_api-1.1.29.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
+rclone_api-1.1.29.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
+rclone_api-1.1.29.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.1.29.dist-info/RECORD,,