rclone-api 1.0.29__py2.py3-none-any.whl → 1.0.31__py2.py3-none-any.whl

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/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/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.dist-info → rclone_api-1.0.31.dist-info}/METADATA

@@ -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.dist-info → rclone_api-1.0.31.dist-info}/RECORD

@@ -2,23 +2,23 @@ rclone_api/__init__.py,sha256=L_ulzYG9WmQqmrVANt-Omi1FJUQVTkXA7SVZx9QH_9M,457
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
 rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
-rclone_api/diff.py,sha256=yxg0e4142CKYe_S-RWYrTfgPIEFRr8p0f8_0dBrJapI,3822
+rclone_api/diff.py,sha256=3WzU_jsIU_Zv-0VslAc--bm8tl7pzFl4fXTwPGeqbwY,4109
 rclone_api/dir.py,sha256=vV-bcI2ESijmwF5rPID5WO2K7soAfZa35wv4KRh_GIo,2154
 rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,1571
 rclone_api/exec.py,sha256=HWmnU2Jwb-3EttSbAJSaLloYA7YI2mHTzRJ5VEri9aM,941
 rclone_api/file.py,sha256=D02iHJW1LhfOiM_R_yPHP8_ApnDiYrkuraVcrV8-qkw,1246
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
-rclone_api/rclone.py,sha256=Yxuwz8cp-gcVJ45iyRadVDy8UfXzaWO_ynCJ86xhPyk,16578
+rclone_api/rclone.py,sha256=AHxdI_X-MwO1x74YCjocdNmhyOOhQHXIrlsB5lGhpjM,17897
 rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
-rclone_api/util.py,sha256=AWTImA1liCMw52wtS-Gs8Abz96diQ39x6Tx56mvbrEo,3860
+rclone_api/util.py,sha256=sUjH5NmsawmNbPMY7V6hD8vFJXCwbl44XM1kuij3tA0,3918
 rclone_api/walk.py,sha256=kca0t1GAnF6FLclN01G8NG__Qe-ggodLtAbQSHyVPng,2968
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.29.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.29.dist-info/METADATA,sha256=KhCB5p_r3yRKvZAGCXZgY3UW3gWwU8Vx-Z2oKMy8P7c,4488
-rclone_api-1.0.29.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.29.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.29.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.29.dist-info/RECORD,,
+rclone_api-1.0.31.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.31.dist-info/METADATA,sha256=-VZg53oPrt0McTNAkhx4XZqIQAux2psCcBty7a2hFzE,4488
+rclone_api-1.0.31.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.31.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.31.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.31.dist-info/RECORD,,