rclone-api 1.0.29__tar.gz → 1.0.31__tar.gz

{rclone_api-1.0.29 → rclone_api-1.0.31}/PKG-INFO

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

{rclone_api-1.0.29 → rclone_api-1.0.31}/pyproject.toml

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

{rclone_api-1.0.29 → rclone_api-1.0.31}/src/rclone_api/diff.py

@@ -32,6 +32,15 @@ class DiffItem:
     def __repr__(self) -> str:
         return f"{self.type.name} {self.path}"
 
+    def full_str(self) -> str:
+        return f"{self.type.name} {self.src_prefix}/{self.path} {self.dst_prefix}/{self.path}"
+
+    def dst_path(self) -> str:
+        return f"{self.dst_prefix}/{self.path}"
+
+    def src_path(self) -> str:
+        return f"{self.src_prefix}/{self.path}"
+
 
 def _classify_diff(line: str, src_slug: str, dst_slug: str) -> DiffItem | None:
     def _new(type: DiffType, path: str) -> DiffItem:

{rclone_api-1.0.29 → rclone_api-1.0.31}/src/rclone_api/rclone.py

@@ -9,6 +9,7 @@ from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
 from fnmatch import fnmatch
 from pathlib import Path
+from tempfile import TemporaryDirectory
 from typing import Generator
 
 from rclone_api import Dir
@@ -125,7 +126,7 @@ class Rclone:
         ]
         proc = self._launch_process(cmd, capture=True)
         item: DiffItem
-        for item in diff_stream_from_running_process(proc, src_slug=src, dst_slug=src):
+        for item in diff_stream_from_running_process(proc, src_slug=src, dst_slug=dst):
             if item is None:
                 break
             yield item
@@ -228,8 +229,45 @@ class Rclone:
     ) -> subprocess.CompletedProcess:
         """Delete a directory"""
         payload: list[str] = convert_to_filestr_list(files)
-        cmd_list: list[str] = ["delete"] + payload
-        return self._run(cmd_list)
+
+        datalists: dict[str, list[str]] = {}
+
+        for f in payload:
+            remote, path = f.split(":", 1)
+            if "/" in path:
+                bucket, path = path.split("/", 1)
+                remote = f"{remote}:{bucket}"
+            else:
+                remote = f"{remote}:"
+            if remote not in datalists:
+                datalists[remote] = []
+            datalists[remote].append(path)
+
+        out: subprocess.CompletedProcess | None = None
+
+        for remote, files in datalists.items():
+            with TemporaryDirectory() as tmpdir:
+                include_files_txt = Path(tmpdir) / "include_files.txt"
+                include_files_txt.write_text("\n".join(files), encoding="utf-8")
+
+                print(include_files_txt)
+                cmd_list: list[str] = [
+                    "delete",
+                    remote,
+                    "--files-from",
+                    str(include_files_txt),
+                    "--checkers",
+                    "1000",
+                    "--transfers",
+                    "1000",
+                ]
+                out = self._run(cmd_list)
+                if out.returncode != 0:
+                    print(out)
+                    raise ValueError(f"Error deleting files: {out.stderr}")
+
+        assert out is not None
+        return out
 
     def exists(self, path: Dir | Remote | str | File) -> bool:
         """Check if a file or directory exists."""

{rclone_api-1.0.29 → rclone_api-1.0.31}/src/rclone_api/util.py

@@ -2,6 +2,7 @@ import os
 import shutil
 import subprocess
 import time
+import warnings
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Any
@@ -96,16 +97,17 @@ def rclone_execute(
             cmd_str = subprocess.list2cmdline(cmd)
             print(f"Running: {cmd_str}")
         cp = subprocess.run(
-            cmd, capture_output=True, encoding="utf-8", check=check, shell=False
+            cmd, capture_output=True, encoding="utf-8", check=False, shell=False
         )
         if cp.returncode != 0:
             cmd_str = subprocess.list2cmdline(cmd)
-            print(
+            warnings.warn(
                 f"Error running: {cmd_str}, returncode: {cp.returncode}\n{cp.stdout}\n{cp.stderr}"
             )
-            raise subprocess.CalledProcessError(
-                cp.returncode, cmd, cp.stdout, cp.stderr
-            )
+            if check:
+                raise subprocess.CalledProcessError(
+                    cp.returncode, cmd, cp.stdout, cp.stderr
+                )
         return cp
     finally:
         if tempdir:

{rclone_api-1.0.29 → rclone_api-1.0.31}/src/rclone_api.egg-info/PKG-INFO

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