rclone-api 1.0.51__tar.gz → 1.0.53__tar.gz

{rclone_api-1.0.51 → rclone_api-1.0.53}/PKG-INFO

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

{rclone_api-1.0.51 → rclone_api-1.0.53}/pyproject.toml

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

{rclone_api-1.0.51 → rclone_api-1.0.53}/src/rclone_api/rclone.py

@@ -286,6 +286,12 @@ class Rclone:
         if len(payload) == 0:
             return []
 
+        for p in payload:
+            if ":" in p:
+                raise ValueError(
+                    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)
         # out: subprocess.CompletedProcess | None = None
         out: list[CompletedProcess] = []
@@ -295,10 +301,7 @@ class Rclone:
         for common_prefix, files in datalists.items():
 
             def _task(files=files) -> subprocess.CompletedProcess:
-                if verbose:
-                    nfiles = len(files)
-                    files_str = "\n".join(files)
-                    print(f"Copying {nfiles} files: \n{files_str}")
+
                 with TemporaryDirectory() as tmpdir:
                     include_files_txt = Path(tmpdir) / "include_files.txt"
                     include_files_txt.write_text("\n".join(files), encoding="utf-8")
@@ -308,6 +311,13 @@ class Rclone:
                     else:
                         src_path = src
                         dst_path = dst
+
+                    if verbose:
+                        nfiles = len(files)
+                        files_fqdn = [f"{src_path}/{f}" for f in files]
+                        files_str = "\n".join(files_fqdn)
+                        print(f"Copying {nfiles} files: \n{files_str}")
+
                     # print(include_files_txt)
                     cmd_list: list[str] = [
                         "copy",
@@ -319,12 +329,13 @@ class Rclone:
                         "1000",
                         "--transfers",
                         "1000",
+                        "--progress",
                     ]
                     if verbose:
                         cmd_list.append("-vvvv")
                     if other_args is not None:
                         cmd_list += other_args
-                    out = self._run(cmd_list)
+                    out = self._run(cmd_list, capture=not verbose)
                     return out
 
             fut: Future = EXECUTOR.submit(_task)

{rclone_api-1.0.51 → rclone_api-1.0.53}/src/rclone_api.egg-info/PKG-INFO

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