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

rclone_api/cmd/copy_large_s3.py

@@ -13,7 +13,7 @@ class Args:
     src: str
     dst: str
     chunk_size: SizeSuffix
-    threads: int
+    read_threads: int
     write_threads: int
     retries: int
     save_state_json: Path
@@ -37,19 +37,19 @@ def _parse_args() -> Args:
     )
     parser.add_argument(
         "--chunk-size",
-        help="Chunk size that will be read and uploaded in in SizeSuffix (i.e. 128M = 128 megabytes) form",
+        help="Chunk size that will be read and uploaded in SizeSuffix form, too low or too high will cause issues",
         type=str,
-        default="64MB",
+        default="64MB",  # if this is too low or too high an s3 service
     )
     parser.add_argument(
-        "--threads",
-        help="Number of threads to use per chunk",
+        "--read-threads",
+        help="Number of concurrent read threads per chunk, only one chunk will be read at a time",
         type=int,
-        default=8,
+        default=32,
     )
     parser.add_argument(
         "--write-threads",
-        help="Max number of chunks to upload in parallel to the destination",
+        help="Max number of chunks to upload in parallel to the destination, each chunk is uploaded in a separate thread",
         type=int,
         default=64,
     )
@@ -67,7 +67,7 @@ def _parse_args() -> Args:
         src=args.src,
         dst=args.dst,
         chunk_size=SizeSuffix(args.chunk_size),
-        threads=args.threads,
+        read_threads=args.read_threads,
         write_threads=args.write_threads,
         retries=args.retries,
         save_state_json=args.resume_json,
@@ -85,11 +85,8 @@ def main() -> int:
         src=args.src,
         dst=args.dst,
         chunk_size=args.chunk_size,
-        read_threads=args.threads,
+        read_threads=args.read_threads,
         write_threads=args.write_threads,
-        # vfs_read_chunk_size=unit_chunk,
-        # vfs_read_chunk_size_limit=args.chunk_size,
-        # vfs_read_chunk_streams=args.threads,
         retries=args.retries,
         save_state_json=args.save_state_json,
         verbose=args.verbose,

rclone_api/types.py

@@ -39,17 +39,26 @@ class SizeResult:
 def _to_size_suffix(size: int) -> str:
     if size < 1024:
         return f"{size}B"
-    if size < 1024 * 1024:
-        return f"{size // 1024}K"
-    if size < 1024 * 1024 * 1024:
-        return f"{size // (1024 * 1024)}M"
-    if size < 1024 * 1024 * 1024 * 1024:
-        return f"{size // (1024 * 1024 * 1024)}G"
-    if size < 1024 * 1024 * 1024 * 1024 * 1024:
-        return f"{size // (1024 * 1024 * 1024 * 1024)}T"
-    if size < 1024 * 1024 * 1024 * 1024 * 1024 * 1024:
-        return f"{size // (1024 * 1024 * 1024 * 1024 * 1024)}P"
-    raise ValueError(f"Invalid size: {size}")
+    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}"
 
 
 # Update regex to allow decimals (e.g., 16.5MB)

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

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

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

@@ -17,11 +17,11 @@ rclone_api/rclone.py,sha256=gszjs6MJFoT5tKmBB06sd0OjbtZZAtRdjvha4RrE-lI,40252
 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=zfTb0iM6mhfqgaYS6j6T0NIOA4e9GymNOXLPhVELe4A,3853
+rclone_api/types.py,sha256=-jb8_cU-vTw7oFRcjUiMhXlskavp26Q67EBmENxjsPU,3941
 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
-rclone_api/cmd/copy_large_s3.py,sha256=n8DyKVl9oIZEQX6syi0GloBXuZG33jOapKE9MmfwdiE,3356
+rclone_api/cmd/copy_large_s3.py,sha256=-rfedi-ZzPUdCSP8ai9LRL0y1xVkvN-viQQlk8HVUWw,3389
 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
@@ -32,9 +32,9 @@ rclone_api/s3/chunk_types.py,sha256=LbXayXY1KgVU1LkdbASD_BQ7TpVpwVnzMjtz--8LBaE,
 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.24.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.1.24.dist-info/METADATA,sha256=XQsuE53luxsOZrJKm1_8D6HOW09ncxhAxkyXwwnGk-s,4514
-rclone_api-1.1.24.dist-info/WHEEL,sha256=rF4EZyR2XVS6irmOHQIJx2SUqXLZKRMUrjsg8UwN-XQ,109
-rclone_api-1.1.24.dist-info/entry_points.txt,sha256=6eNqTRXKhVf8CpWNjXiOa_0Du9tHiW_HD2iQSXRsUg8,132
-rclone_api-1.1.24.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.1.24.dist-info/RECORD,,
+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,,