rclone-api 1.0.81__tar.gz → 1.0.83__tar.gz

{rclone_api-1.0.81 → rclone_api-1.0.83}/PKG-INFO

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

{rclone_api-1.0.81 → rclone_api-1.0.83}/pyproject.toml

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

{rclone_api-1.0.81 → rclone_api-1.0.83}/src/rclone_api/rclone.py

@@ -22,7 +22,7 @@ from rclone_api.diff import DiffItem, DiffOption, diff_stream_from_running_proce
 from rclone_api.dir_listing import DirListing
 from rclone_api.exec import RcloneExec
 from rclone_api.file import File
-from rclone_api.group_files import group_files, group_under_one_prefix
+from rclone_api.group_files import group_files
 from rclone_api.process import Process
 from rclone_api.remote import Remote
 from rclone_api.rpath import RPath
@@ -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] = []
 
@@ -847,7 +852,7 @@ class Rclone:
         check = get_check(check)
         files = list(files)
         all_files: list[File] = []
-        src, files = group_under_one_prefix(src, files)
+        # prefix, files = group_under_one_prefix(src, files)
         cmd = ["lsjson", src, "--files-only", "-R"]
         with TemporaryDirectory() as tmpdir:
             # print("files: " + ",".join(files))

{rclone_api-1.0.81 → rclone_api-1.0.83}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.0.81 → rclone_api-1.0.83}/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: