rclone-api 1.0.66__tar.gz → 1.0.67__tar.gz

{rclone_api-1.0.66 → rclone_api-1.0.67}/PKG-INFO

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

{rclone_api-1.0.66 → rclone_api-1.0.67}/pyproject.toml

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

{rclone_api-1.0.66 → rclone_api-1.0.67}/src/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-1.0.66 → rclone_api-1.0.67}/src/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-1.0.66 → rclone_api-1.0.67}/src/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,15 +47,6 @@ 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"
@@ -245,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.66 → rclone_api-1.0.67}/src/rclone_api.egg-info/PKG-INFO

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

{rclone_api-1.0.66 → rclone_api-1.0.67}/tests/test_diff.py

@@ -7,7 +7,7 @@ import unittest
 
 from dotenv import load_dotenv
 
-from rclone_api import Config, Rclone
+from rclone_api import Config, DiffOption, Rclone
 from rclone_api.diff import DiffItem, DiffType
 
 load_dotenv()
@@ -70,6 +70,38 @@ class RcloneDiffTests(unittest.TestCase):
         msg = "\n".join([str(item) for item in all])
         print(msg)
 
+    def test_diff_missing_on_dst(self) -> None:
+        rclone = Rclone(_generate_rclone_config())
+        item: DiffItem
+        all: list[DiffItem] = []
+        for item in rclone.diff(
+            "dst:rclone-api-unit-test",
+            "dst:rclone-api-unit-test/does-not-exist",
+            diff_option=DiffOption.MISSING_ON_DST,
+        ):
+            self.assertEqual(
+                item.type, DiffType.MISSING_ON_DST
+            )  # should be equal because same repo
+            all.append(item)
+        self.assertGreater(len(all), 0)
+        msg = "\n".join([str(item) for item in all])
+        print(msg)
+
+    def test_diff_missing_on_src(self) -> None:
+        rclone = Rclone(_generate_rclone_config())
+        item: DiffItem
+        all: list[DiffItem] = []
+        for item in rclone.diff(
+            "dst:rclone-api-unit-test/does-not-exist",
+            "dst:rclone-api-unit-test",
+            diff_option=DiffOption.MISSING_ON_SRC,
+        ):
+            self.assertEqual(item.type, DiffType.MISSING_ON_SRC)
+            all.append(item)
+        self.assertGreater(len(all), 0)
+        msg = "\n".join([str(item) for item in all])
+        print(msg)
+
 
 if __name__ == "__main__":
     unittest.main()