rclone-api 1.0.82__tar.gz → 1.0.84__tar.gz

{rclone_api-1.0.82 → rclone_api-1.0.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.82
+Version: 1.0.84
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.82 → rclone_api-1.0.84}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "python-dotenv>=1.0.0",
 ]
 # Change this with the version number bump.
-version = "1.0.82"
+version = "1.0.84"
 
 [tool.setuptools]
 package-dir = {"" = "src"}

{rclone_api-1.0.82 → rclone_api-1.0.84}/src/rclone_api/rclone.py

@@ -394,7 +394,12 @@ class Rclone:
                     f"Invalid file path, contains a remote, which is not allowed for copy_files: {p}"
                 )
 
-        datalists: dict[str, list[str]] = group_files(payload, fully_qualified=False)
+        if max_partition_workers > 1:
+            datalists: dict[str, list[str]] = group_files(
+                payload, fully_qualified=False
+            )
+        else:
+            datalists = {"": payload}
         # out: subprocess.CompletedProcess | None = None
         out: list[CompletedProcess] = []
 
@@ -490,7 +495,16 @@ class Rclone:
                         warnings.warn(f"Error deleting files: {cp.stderr}")
         return out
 
-    def copy(self, src: Dir | str, dst: Dir | str) -> CompletedProcess:
+    def copy(
+        self,
+        src: Dir | str,
+        dst: Dir | str,
+        check: bool | None = None,
+        transfers: int | None = None,
+        checkers: int | None = None,
+        multi_thread_streams: int | None = None,
+        other_args: list[str] | None = None,
+    ) -> CompletedProcess:
         """Copy files from source to destination.
 
         Args:
@@ -501,8 +515,17 @@ class Rclone:
         # dst_dir = dst.path.path
         src_dir = convert_to_str(src)
         dst_dir = convert_to_str(dst)
+        check = get_check(check)
+        checkers = checkers or 1000
+        transfers = transfers or 32
         cmd_list: list[str] = ["copy", src_dir, dst_dir]
-        cp = self._run(cmd_list)
+        cmd_list += ["--checkers", str(checkers)]
+        cmd_list += ["--transfers", str(transfers)]
+        if multi_thread_streams is not None:
+            cmd_list += ["--multi-thread-streams", str(multi_thread_streams)]
+        if other_args:
+            cmd_list += other_args
+        cp = self._run(cmd_list, check=check, capture=False)
         return CompletedProcess.from_subprocess(cp)
 
     def purge(self, path: Dir | str) -> CompletedProcess:

{rclone_api-1.0.82 → rclone_api-1.0.84}/src/rclone_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rclone_api
-Version: 1.0.82
+Version: 1.0.84
 Summary: rclone api in python
 Home-page: https://github.com/zackees/rclone-api
 Maintainer: Zachary Vorhies

{rclone_api-1.0.82 → rclone_api-1.0.84}/tests/test_copy_files.py

@@ -75,7 +75,33 @@ class RcloneCopyFilesTest(unittest.TestCase):
         print(f"first_file: {first_file_str}")
         include_files: list[str] = [first_file.name]
         completed_procs: list[CompletedProcess] = rclone.copy_files(
-            src=src_prefix, dst=dst_prefix, files=include_files
+            src=src_prefix, dst=dst_prefix, files=include_files, max_partition_workers=2
+        )
+        self.assertGreater(len(completed_procs), 0)
+        for proc in completed_procs:
+            print(proc.stdout)
+            print(proc.stderr)
+            self.assertTrue(proc.returncode == 0)
+        self.assertTrue(rclone.exists(dst_prefix))
+        rclone.purge(dst_prefix)
+        print(f"Checking that {dst_prefix} was deleted")
+        still_exists = rclone.exists(dst_prefix)
+        self.assertFalse(still_exists)
+        print("done")
+
+    def test_copylist_one_worker(self) -> None:
+        """Test copying a list of files to remote storage."""
+        rclone = Rclone(_generate_rclone_config())
+        dst_prefix = f"dst:{BUCKET_NAME}/test_out"
+        src_prefix = f"dst:{BUCKET_NAME}/zachs_video"
+        listing: DirListing = rclone.ls(src_prefix, glob="*.png")
+        self.assertGreater(len(listing.files), 0)
+        first_file: File = listing.files[0]
+        first_file_str = first_file.to_string(include_remote=False)
+        print(f"first_file: {first_file_str}")
+        include_files: list[str] = [first_file.name]
+        completed_procs: list[CompletedProcess] = rclone.copy_files(
+            src=src_prefix, dst=dst_prefix, files=include_files, max_partition_workers=1
         )
         self.assertGreater(len(completed_procs), 0)
         for proc in completed_procs: