rclone-api 1.1.24__tar.gz → 1.1.26__tar.gz

{rclone_api-1.1.24 → rclone_api-1.1.26}/PKG-INFO

@@ -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 → rclone_api-1.1.26}/pyproject.toml

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

{rclone_api-1.1.24 → rclone_api-1.1.26}/src/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-1.1.24 → rclone_api-1.1.26}/src/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 → rclone_api-1.1.26}/src/rclone_api.egg-info/PKG-INFO

@@ -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 → rclone_api-1.1.26}/tests/test_size_suffix.py

@@ -17,9 +17,12 @@ class RcloneSuffixSize(unittest.TestCase):
         self.assertEqual(size_int, 16 * 1024 * 1024)
 
     def test_float_suffix(self) -> None:
-        size_suffix = SizeSuffix("16.5MB")
+        size_suffix = SizeSuffix("16.5M")
         size_int = size_suffix.as_int()
         self.assertEqual(size_int, int(16.5 * 1024 * 1024))
+        # now assert that the string value is the same as the input
+        out_str = str(size_suffix)
+        self.assertEqual(out_str, "16.5M")
 
 
 if __name__ == "__main__":