rclone-api 1.0.60__tar.gz → 1.0.62__tar.gz

{rclone_api-1.0.60 → rclone_api-1.0.62}/PKG-INFO

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

{rclone_api-1.0.60 → rclone_api-1.0.62}/pyproject.toml

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

{rclone_api-1.0.60 → rclone_api-1.0.62}/src/rclone_api/rclone.py

@@ -47,6 +47,15 @@ class ModTimeStrategy(Enum):
     NO_MODTIME = "no-modtime"
 
 
+class DiffOption(Enum):
+    COMBINED = "combined"
+    MISSING_ON_SRC = "missing-on-src"
+    MISSING_ON_DST = "missing-on-dst"
+    DIFFER = "differ"
+    MATCH = "match"
+    ERROR = "error"
+
+
 class Rclone:
     def __init__(
         self, rclone_conf: Path | Config, rclone_exe: Path | None = None
@@ -190,6 +199,9 @@ class Rclone:
         max_size: (
             str | None
         ) = None,  # e. g. "1GB" - see rclone documentation: https://rclone.org/commands/rclone_check/
+        diff_option: DiffOption = DiffOption.COMBINED,
+        fast_list: bool = True,
+        size_only: bool = False,
         other_args: list[str] | None = None,
     ) -> Generator[DiffItem, None, None]:
         """Be extra careful with the src and dst values. If you are off by one
@@ -203,9 +215,13 @@ class Rclone:
             "1000",
             "--log-level",
             "INFO",
-            "--combined",
+            f"--{diff_option.value}",
             "-",
         ]
+        if size_only:
+            cmd += ["--size-only"]
+        if fast_list:
+            cmd += ["--fast-list"]
         if min_size:
             cmd += ["--min-size", min_size]
         if max_size:
@@ -299,7 +315,7 @@ class Rclone:
         self,
         src: str,
         dst: str,
-        files: list[str],
+        files: list[str] | Path,
         check: bool | None = None,
         verbose: bool | None = None,
         checkers: int | None = None,
@@ -322,7 +338,11 @@ class Rclone:
         checkers = checkers or 1000
         transfers = transfers or 32
         verbose = get_verbose(verbose)
-        payload: list[str] = convert_to_filestr_list(files)
+        payload: list[str] = (
+            files
+            if isinstance(files, list)
+            else [f.strip() for f in files.read_text().splitlines() if f.strip()]
+        )
         if len(payload) == 0:
             return []
 
@@ -341,10 +361,26 @@ class Rclone:
         with ThreadPoolExecutor(max_workers=max_partition_workers) as executor:
             for common_prefix, files in datalists.items():
 
-                def _task(files=files) -> subprocess.CompletedProcess:
+                def _task(
+                    files: list[str] | Path = files,
+                ) -> subprocess.CompletedProcess:
                     with TemporaryDirectory() as tmpdir:
-                        include_files_txt = Path(tmpdir) / "include_files.txt"
-                        include_files_txt.write_text("\n".join(files), encoding="utf-8")
+                        filelist: list[str] = []
+                        filepath: Path
+                        if isinstance(files, list):
+                            include_files_txt = Path(tmpdir) / "include_files.txt"
+                            include_files_txt.write_text(
+                                "\n".join(files), encoding="utf-8"
+                            )
+                            filelist = list(files)
+                            filepath = Path(include_files_txt)
+                        elif isinstance(files, Path):
+                            filelist = [
+                                f.strip()
+                                for f in files.read_text().splitlines()
+                                if f.strip()
+                            ]
+                            filepath = files
                         if common_prefix:
                             src_path = f"{src}/{common_prefix}"
                             dst_path = f"{dst}/{common_prefix}"
@@ -353,8 +389,8 @@ class Rclone:
                             dst_path = dst
 
                         if verbose:
-                            nfiles = len(files)
-                            files_fqdn = [f"  {src_path}/{f}" for f in files]
+                            nfiles = len(filelist)
+                            files_fqdn = [f"  {src_path}/{f}" for f in filelist]
                             print(f"Copying {nfiles} files:")
                             chunk_size = 100
                             for i in range(0, nfiles, chunk_size):
@@ -370,7 +406,7 @@ class Rclone:
                             src_path,
                             dst_path,
                             "--files-from",
-                            str(include_files_txt),
+                            str(filepath),
                             "--checkers",
                             str(checkers),
                             "--transfers",

{rclone_api-1.0.60 → rclone_api-1.0.62}/src/rclone_api.egg-info/PKG-INFO

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