rclone-api 1.1.23__tar.gz → 1.1.25__tar.gz

{rclone_api-1.1.23 → rclone_api-1.1.25}/PKG-INFO

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

{rclone_api-1.1.23 → rclone_api-1.1.25}/pyproject.toml

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

{rclone_api-1.1.23 → rclone_api-1.1.25}/src/rclone_api/cmd/copy_large_s3.py

@@ -39,13 +39,13 @@ def _parse_args() -> Args:
         "--chunk-size",
         help="Chunk size that will be read and uploaded in in SizeSuffix (i.e. 128M = 128 megabytes) form",
         type=str,
-        default="256MB",
+        default="64MB",
     )
     parser.add_argument(
         "--threads",
         help="Number of threads to use per chunk",
         type=int,
-        default=32,
+        default=8,
     )
     parser.add_argument(
         "--write-threads",

{rclone_api-1.1.23 → rclone_api-1.1.25}/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.23 → rclone_api-1.1.25}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.1.23 → rclone_api-1.1.25}/src/rclone_api.egg-info/SOURCES.txt

@@ -62,6 +62,7 @@ src/rclone_api/s3/create.py
 src/rclone_api/s3/types.py
 tests/test_cmd_list_files.py
 tests/test_copy.py
+tests/test_copy_file_resumable_s3.py
 tests/test_copy_files.py
 tests/test_diff.py
 tests/test_group_files.py
@@ -69,7 +70,6 @@ tests/test_is_synced.py
 tests/test_ls.py
 tests/test_mount.py
 tests/test_mount_s3.py
-tests/test_mounted_ranged_download.py
 tests/test_obscure.py
 tests/test_rclone_config.py
 tests/test_remote_control.py

{rclone_api-1.1.23 → rclone_api-1.1.25}/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__":