rclone-api 1.4.30__tar.gz → 1.4.32__tar.gz

{rclone_api-1.4.30 → rclone_api-1.4.32}/PKG-INFO

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

{rclone_api-1.4.30 → rclone_api-1.4.32}/pyproject.toml

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

{rclone_api-1.4.30 → rclone_api-1.4.32}/src/rclone_api/__init__.py

@@ -399,7 +399,7 @@ class Rclone:
     def copy_file_s3_resumable(
         self,
         src: str,  # src:/Bucket/path/myfile.large.zst
-        dst_dir: str,  # dst:/Bucket/path/myfile.large.zst-parts/part.{part_number:05d}.start-end
+        dst: str,  # dst:/Bucket/path/myfile.large.zst
         part_infos: list[PartInfo] | None = None,
         upload_threads: int = 8,  # Number of reader and writer threads to use
         merge_threads: int = 4,  # Number of threads to use for merging the parts
@@ -407,7 +407,7 @@ class Rclone:
         """Copy a file in parts."""
         return self.impl.copy_file_s3_resumable(
             src=src,
-            dst_dir=dst_dir,
+            dst=dst,
             part_infos=part_infos,
             upload_threads=upload_threads,
             merge_threads=merge_threads,

{rclone_api-1.4.30 → rclone_api-1.4.32}/src/rclone_api/cmd/copy_large_s3.py

@@ -1,4 +1,5 @@
 import argparse
+import sys
 from dataclasses import dataclass
 from pathlib import Path
 
@@ -89,7 +90,7 @@ def main() -> int:
     # )
     err: Exception | None = rclone.copy_file_s3_resumable(
         src=args.src,
-        dst_dir=args.dst,
+        dst=args.dst,
     )
     if err is not None:
         print(f"Error: {err}")
@@ -98,20 +99,13 @@ def main() -> int:
 
 
 if __name__ == "__main__":
-    import sys
 
-    # here = Path(__file__).parent
-    # project_root = here.parent.parent.parent
-    # print(f"project_root: {project_root}")
-    # os.chdir(str(project_root))
-    # cwd = Path(__file__).parent
-    # print(f"cwd: {cwd}")
     sys.argv.append("--config")
     sys.argv.append("rclone.conf")
     sys.argv.append(
         "45061:aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst"
     )
     sys.argv.append(
-        "dst:TorrentBooks/aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst-parts"
+        "dst:TorrentBooks/aa_misc_data/aa_misc_data/world_lending_library_2024_11.tar.zst"
     )
     main()

{rclone_api-1.4.30 → rclone_api-1.4.32}/src/rclone_api/rclone_impl.py

@@ -786,7 +786,7 @@ class RcloneImpl:
     def copy_file_s3_resumable(
         self,
         src: str,  # src:/Bucket/path/myfile.large.zst
-        dst_dir: str,  # dst:/Bucket/path/myfile.large.zst-parts/
+        dst: str,  # dst:/Bucket/path/myfile.large
         part_infos: list[PartInfo] | None = None,
         upload_threads: int = 8,
         merge_threads: int = 4,
@@ -796,6 +796,10 @@ class RcloneImpl:
             copy_file_parts_resumable,
         )
 
+        if dst.endswith("/"):
+            dst = dst[:-1]
+        dst_dir = f"{dst}-parts"
+
         out = copy_file_parts_resumable(
             self=self,
             src=src,

{rclone_api-1.4.30 → rclone_api-1.4.32}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.4.30 → rclone_api-1.4.32}/tests/test_copy_file_resumable_s3.py

@@ -88,8 +88,8 @@ class RcloneCopyResumableFileToS3(unittest.TestCase):
 
     def test_copy_parts(self) -> None:
         src_file = "dst:rclone-api-unit-test/zachs_video/global_alliance.mp4"
-        dst_dir = "dst:rclone-api-unit-test/test_data/global_alliance.mp4-parts/"
-        dst_file = src_file.replace("-parts", "")
+        dst = "dst:rclone-api-unit-test/test_data/global_alliance.mp4"
+        dst_dir = "dst:rclone-api-unit-test/test_data/global_alliance.mp4-parts"
 
         # print(f"BUCKET_KEY_SECRET: {SECRET_ACCESS_KEY}")
         config_text = _generate_rclone_config(PORT)
@@ -110,7 +110,7 @@ class RcloneCopyResumableFileToS3(unittest.TestCase):
 
         err = rclone.copy_file_s3_resumable(
             src=src_file,
-            dst_dir=dst_dir,
+            dst=dst,
             part_infos=part_infos,
         )
 
@@ -119,11 +119,11 @@ class RcloneCopyResumableFileToS3(unittest.TestCase):
         # Second time should go fast.
         rclone.copy_file_s3_resumable(
             src=src_file,
-            dst_dir=dst_dir,
+            dst=dst,
             part_infos=part_infos,
         )
 
-        dir_listing = rclone.ls(dst_file)
+        dir_listing = rclone.ls(dst)
         print(f"dir_listing: {dir_listing}")
         self.assertEqual(len(dir_listing.files), 1)
         expected_files = dir_listing.files[0]
@@ -131,9 +131,9 @@ class RcloneCopyResumableFileToS3(unittest.TestCase):
         self.assertEqual(expected_files.name, "global_alliance.mp4")
         self.assertEqual(expected_files.size, src_size)
 
-        dst_dir_listing = rclone.ls(dst_dir)
+        dst_dir_listing = rclone.ls(dst)
         print(f"dst_dir_listing: {dst_dir_listing}")
-        self.assertEqual(len(dst_dir_listing.files), 0)
+        self.assertEqual(len(dst_dir_listing.files), 1)
         self.assertEqual(len(dst_dir_listing.dirs), 0)
 
         rclone.purge(dst_dir)