dbx-sync 0.2.0__tar.gz → 0.3.0__tar.gz

{dbx_sync-0.2.0 → dbx_sync-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbx-sync
-Version: 0.2.0
+Version: 0.3.0
 Summary: Synchronize Databricks workspace content with a local directory.
 Project-URL: Repository, https://github.com/gramhagen/dbx-sync
 Author: gramhagen

{dbx_sync-0.2.0 → dbx_sync-0.3.0}/src/dbx_sync/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{dbx_sync-0.2.0 → dbx_sync-0.3.0}/src/dbx_sync/sync.py

@@ -621,6 +621,20 @@ def run_forever(config: dict[str, Any], config_path: Path, dry_run: bool) -> int
                     result["removed"],
                     result["skipped"],
                 )
+                if result["conflicts"] > 0:
+                    conflicted_paths = [
+                        path
+                        for path, state in config.get("files", {}).items()
+                        if state.get("last_action") == "conflict"
+                    ]
+                    LOGGER.error(
+                        "Stopping watch mode: %d conflict(s) detected. "
+                        "Conflicting file(s): %s. "
+                        "Run with --force to clear sync state and retry.",
+                        result["conflicts"],
+                        ", ".join(conflicted_paths),
+                    )
+                    return 1
 
             time.sleep(int(config["poll_interval_seconds"]))
     except KeyboardInterrupt:

{dbx_sync-0.2.0 → dbx_sync-0.3.0}/tests/test_sync.py

@@ -804,6 +804,30 @@ def test_run_forever_retries_after_sync_pass_failure(
     assert mock_sleep.call_count == 2
 
 
+@patch("dbx_sync.sync.time.sleep", side_effect=KeyboardInterrupt)
+@patch(
+    "dbx_sync.sync.run_sync_pass",
+    return_value={"downloaded": 0, "uploaded": 0, "conflicts": 1, "removed": 0, "skipped": 0},
+)
+def test_run_forever_exits_on_conflict(
+    mock_run_sync_pass: MagicMock, mock_sleep: MagicMock, tmp_path: Path
+) -> None:
+    config = {
+        "local_dir": str(tmp_path),
+        "remote_path": "/workspace",
+        "poll_interval_seconds": 1,
+        "files": {
+            "/workspace/nb": {**sync._default_file_state(), "last_action": "conflict"},
+        },
+    }
+
+    result = sync.run_forever(config, tmp_path / "config.json", dry_run=False)
+
+    assert result == 1
+    mock_run_sync_pass.assert_called_once()
+    mock_sleep.assert_not_called()
+
+
 @patch(
     "dbx_sync.sync.run_sync_pass",
     return_value={"downloaded": 0, "uploaded": 0, "conflicts": 0, "removed": 0, "skipped": 0},