rclone-api 1.0.65__py2.py3-none-any.whl → 1.0.67__py2.py3-none-any.whl

rclone_api/__init__.py

@@ -6,7 +6,7 @@ from .dir_listing import DirListing
 from .file import File
 from .filelist import FileList
 from .process import Process
-from .rclone import DiffOption, Rclone, rclone_verbose
+from .rclone import DiffOption, ListingOption, Rclone, rclone_verbose
 from .remote import Remote
 from .rpath import RPath
 
@@ -25,4 +25,5 @@ __all__ = [
     "rclone_verbose",
     "CompletedProcess",
     "DiffOption",
+    "ListingOption",
 ]

rclone_api/diff.py

@@ -19,6 +19,15 @@ class DiffType(Enum):
     ERROR = "!"  # means there was an error
 
 
+class DiffOption(Enum):
+    COMBINED = "combined"
+    MISSING_ON_SRC = "missing-on-src"
+    MISSING_ON_DST = "missing-on-dst"
+    DIFFER = "differ"
+    MATCH = "match"
+    ERROR = "error"
+
+
 @dataclass
 class DiffItem:
     type: DiffType
@@ -42,31 +51,56 @@ class DiffItem:
         return f"{self.src_prefix}/{self.path}"
 
 
-def _classify_diff(line: str, src_slug: str, dst_slug: str) -> DiffItem | None:
+def _parse_missing_on_src_dst(line: str) -> str | None:
+    if line.endswith("does-not-exist"):
+        # 2025/02/17 14:43:38 ERROR : zachs_video/breaking_ai_mind.mp4: file not in S3 bucket rclone-api-unit-test path does-not-exist
+        parts = line.split(" : ", 1)
+        if len(parts) < 1:
+            return None
+        right = parts[1]
+        file_path = right.split(":", 1)[0]
+        return file_path.strip()
+    return None
+
+
+def _classify_diff(
+    line: str, src_slug: str, dst_slug: str, diff_option: DiffOption
+) -> DiffItem | None:
     def _new(type: DiffType, path: str) -> DiffItem:
         return DiffItem(type, path, src_prefix=src_slug, dst_prefix=dst_slug)
 
-    suffix = line[1:].strip() if len(line) > 0 else ""
-    if line.startswith(DiffType.EQUAL.value):
-        return _new(DiffType.EQUAL, suffix)
-    if line.startswith(DiffType.MISSING_ON_SRC.value):
-        return _new(DiffType.MISSING_ON_SRC, suffix)
-    if line.startswith(DiffType.MISSING_ON_DST.value):
-        # return DiffItem(DiffType.MISSING_ON_DST, f"{src_slug}/{suffix}")
-        return _new(DiffType.MISSING_ON_DST, suffix)
-    if line.startswith(DiffType.DIFFERENT.value):
-        # return DiffItem(DiffType.DIFFERENT, suffix)
-        return _new(DiffType.DIFFERENT, suffix)
-    if line.startswith(DiffType.ERROR.value):
-        # return DiffItem(DiffType.ERROR, suffix)
-        return _new(DiffType.ERROR, suffix)
-    return None
+    if diff_option == DiffOption.COMBINED:
+        suffix = line[1:].strip() if len(line) > 0 else ""
+        if line.startswith(DiffType.EQUAL.value):
+            return _new(DiffType.EQUAL, suffix)
+        if line.startswith(DiffType.MISSING_ON_SRC.value):
+            return _new(DiffType.MISSING_ON_SRC, suffix)
+        if line.startswith(DiffType.MISSING_ON_DST.value):
+            return _new(DiffType.MISSING_ON_DST, suffix)
+        if line.startswith(DiffType.DIFFERENT.value):
+            return _new(DiffType.DIFFERENT, suffix)
+        if line.startswith(DiffType.ERROR.value):
+            return _new(DiffType.ERROR, suffix)
+        return None
+    if diff_option == DiffOption.MISSING_ON_SRC:
+        filename_src: str | None = _parse_missing_on_src_dst(line)
+        if filename_src is not None:
+            return _new(DiffType.MISSING_ON_SRC, filename_src)
+        return None
+    if diff_option == DiffOption.MISSING_ON_DST:
+        filename_dst: str | None = _parse_missing_on_src_dst(line)
+        if filename_dst is not None:
+            return _new(DiffType.MISSING_ON_DST, filename_dst)
+        return None
+    else:
+        raise ValueError(f"Unknown diff_option: {diff_option}")
 
 
 def _async_diff_stream_from_running_process(
     running_process: Process,
     src_slug: str,
     dst_slug: str,
+    diff_option: DiffOption,
     output: Queue[DiffItem | None],
 ) -> None:
     count = 0
@@ -81,7 +115,7 @@ def _async_diff_stream_from_running_process(
                     first_few_lines.append(line_str)
                 # _classify_line_type
                 diff_item: DiffItem | None = _classify_diff(
-                    line_str, src_slug, dst_slug
+                    line_str, src_slug, dst_slug, diff_option
                 )
                 if diff_item is None:
                     # Some other output that we don't care about, debug print etc.
@@ -111,14 +145,17 @@ def diff_stream_from_running_process(
     running_process: Process,
     src_slug: str,
     dst_slug: str,
+    diff_option: DiffOption,
 ) -> Generator[DiffItem, None, None]:
     output: Queue[DiffItem | None] = Queue()
     # process_output_to_diff_stream(running_process, src_slug, dst_slug, output)
-    thread = Thread(
-        target=_async_diff_stream_from_running_process,
-        args=(running_process, src_slug, dst_slug, output),
-        daemon=True,
-    )
+
+    def _task() -> None:
+        _async_diff_stream_from_running_process(
+            running_process, src_slug, dst_slug, diff_option, output
+        )
+
+    thread = Thread(target=_task, daemon=True)
     thread.start()
     while True:
         item = output.get()

rclone_api/rclone.py

@@ -18,7 +18,7 @@ from rclone_api.completed_process import CompletedProcess
 from rclone_api.config import Config
 from rclone_api.convert import convert_to_filestr_list, convert_to_str
 from rclone_api.deprecated import deprecated
-from rclone_api.diff import DiffItem, diff_stream_from_running_process
+from rclone_api.diff import DiffItem, DiffOption, diff_stream_from_running_process
 from rclone_api.dir_listing import DirListing
 from rclone_api.exec import RcloneExec
 from rclone_api.file import File
@@ -47,13 +47,10 @@ 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 ListingOption(Enum):
+    DIRS_ONLY = "dirs-only"
+    FILES_ONLY = "files-only"
+    ALL = "all"
 
 
 class Rclone:
@@ -133,6 +130,7 @@ class Rclone:
         max_depth: int | None = None,
         glob: str | None = None,
         reverse: bool = False,
+        listing_option: ListingOption = ListingOption.ALL,
     ) -> DirListing:
         """List files in the given path.
 
@@ -156,6 +154,9 @@ class Rclone:
             if max_depth > 0:
                 cmd.append("--max-depth")
                 cmd.append(str(max_depth))
+        if listing_option != ListingOption.ALL:
+            cmd.append(f"--{listing_option.value}")
+
         cmd.append(str(path))
         remote = path.remote if isinstance(path, Dir) else path
         assert isinstance(remote, Remote)
@@ -235,7 +236,9 @@ class Rclone:
             cmd += other_args
         proc = self._launch_process(cmd, capture=True)
         item: DiffItem
-        for item in diff_stream_from_running_process(proc, src_slug=src, dst_slug=dst):
+        for item in diff_stream_from_running_process(
+            running_process=proc, src_slug=src, dst_slug=dst, diff_option=diff_option
+        ):
             if item is None:
                 break
             yield item

{rclone_api-1.0.65.dist-info → rclone_api-1.0.67.dist-info}/METADATA

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

{rclone_api-1.0.65.dist-info → rclone_api-1.0.67.dist-info}/RECORD

@@ -1,10 +1,10 @@
-rclone_api/__init__.py,sha256=M9JDm9dhkEUUxnTdfLVzMUJUZdIDWuvTbEoCN_HU_iE,597
+rclone_api/__init__.py,sha256=B9q_4JU5Myh0DN-wqr_IgF5hZeAvszrGcqs2x-3hq-Q,633
 rclone_api/cli.py,sha256=dibfAZIh0kXWsBbfp3onKLjyZXo54mTzDjUdzJlDlWo,231
 rclone_api/completed_process.py,sha256=Pp-hXnLgej0IGO5ee9Fmx64dGzIofbQFEUyXdFCvO54,1371
 rclone_api/config.py,sha256=tP6cU9DnCCEIRc_KP9HPur1jFLLg2QGFSxNwFm6_MVw,118
 rclone_api/convert.py,sha256=Mx9Qo7zhkOedJd8LdhPvNGHp8znJzOk4f_2KWnoGc78,1012
 rclone_api/deprecated.py,sha256=qWKpnZdYcBK7YQZKuVoWWXDwi-uqiAtbjgPcci_efow,590
-rclone_api/diff.py,sha256=HVt246BMXR6jrc_RgywC5HLbdbELls1OLrse6kcT-Ak,4038
+rclone_api/diff.py,sha256=ggdDLUZxa13jMcPzKBcwAElmPCNWMOSR89D4yhpO74M,5264
 rclone_api/dir.py,sha256=2-PFaDpjEs28z82DQ-TyaCgrm_OgpwlkwfTnx1-Wwpk,2194
 rclone_api/dir_listing.py,sha256=9Qqf2SUswrOEkyqmaH23V51I18X6ePiXb9B1vUwRF5o,1571
 rclone_api/exec.py,sha256=1ovvaMXDEfLiT7BrYZyE85u_yFhEUwUNW3jPOzqknR8,1023
@@ -12,16 +12,16 @@ rclone_api/file.py,sha256=YtR5Y6c0YfXTS-sReOy2UgiSnafcAeO6b2hnbojBQD4,1423
 rclone_api/filelist.py,sha256=xbiusvNgaB_b_kQOZoHMJJxn6TWGtPrWd2J042BI28o,767
 rclone_api/group_files.py,sha256=kOHh6ysFDkxjldSwvW6KqmiADUC1yFCdrZRY57TvbGY,5328
 rclone_api/process.py,sha256=RrMfTe0bndmJ6gBK67ioqNvCstJ8aTC8RlGX1XBLlcw,4191
-rclone_api/rclone.py,sha256=4YNHRuc11oqMVtN7SbuX0cylasWoWkua7UGefrhYGGM,27837
+rclone_api/rclone.py,sha256=CLjyQXRt-YaWwEOKZ2G1LACxUprtG8eLGAcNkVywxh8,27985
 rclone_api/remote.py,sha256=c9hlRKBCg1BFB9MCINaQIoCg10qyAkeqiS4brl8ce-8,343
 rclone_api/rpath.py,sha256=8ZA_1wxWtskwcy0I8V2VbjKDmzPkiWd8Q2JQSvh-sYE,2586
 rclone_api/util.py,sha256=_cvmHcJPRl2yXw4zgZiop3z-riA_8Ek6S5NDPw8cqSY,4198
 rclone_api/walk.py,sha256=UaNOE3ICd8k5ouSFZvkVEH4r2GnnrD9TxfwkFcQnayo,3170
 rclone_api/assets/example.txt,sha256=lTBovRjiz0_TgtAtbA1C5hNi2ffbqnNPqkKg6UiKCT8,54
 rclone_api/cmd/list_files.py,sha256=x8FHODEilwKqwdiU1jdkeJbLwOqUkUQuDWPo2u_zpf0,741
-rclone_api-1.0.65.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
-rclone_api-1.0.65.dist-info/METADATA,sha256=Chedoc_vmPbywO4y6TdJeBwwcI6a8UcSrSvI2S7wf_I,4489
-rclone_api-1.0.65.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-rclone_api-1.0.65.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
-rclone_api-1.0.65.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
-rclone_api-1.0.65.dist-info/RECORD,,
+rclone_api-1.0.67.dist-info/LICENSE,sha256=b6pOoifSXiUaz_lDS84vWlG3fr4yUKwB8fzkrH9R8bQ,1064
+rclone_api-1.0.67.dist-info/METADATA,sha256=H866NatSXqCR0niXYtEebKY14_byytSoF1jZ1HHab1s,4489
+rclone_api-1.0.67.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+rclone_api-1.0.67.dist-info/entry_points.txt,sha256=XUoTX3m7CWxdj2VAKhEuO0NMOfX2qf-OcEDFwdyk9ZE,72
+rclone_api-1.0.67.dist-info/top_level.txt,sha256=EvZ7uuruUpe9RiUyEp25d1Keq7PWYNT0O_-mr8FCG5g,11
+rclone_api-1.0.67.dist-info/RECORD,,