add a bit more validation

Author: va1ha11a

git_sync_filtered/cli.py

@@ -1,8 +1,52 @@
+from fnmatch import translate as glob_translate
+from pathlib import Path
+
 import click
+from pydantic import BaseModel, ConfigDict, FilePath, field_validator
 
 from git_sync_filtered.sync import sync
 
 
+class SyncConfig(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+    private: str
+    public: str
+    keep: tuple[str, ...]
+    keep_from_file: FilePath | None = None
+    sync_branch: str = "upstream/sync"
+    main_branch: str = "main"
+    private_branch: str = "main"
+    dry_run: bool = False
+    merge: bool = False
+    force: bool = False
+
+    @field_validator("keep", mode="before")
+    @classmethod
+    def ensure_non_empty(cls, v: tuple[str, ...]) -> tuple[str, ...]:
+        if not v:
+            raise ValueError("At least one --keep path required")
+        return v
+
+    @field_validator("keep", mode="after")
+    @classmethod
+    def validate_glob_paths(cls, v: tuple[str, ...]) -> tuple[str, ...]:
+        for path in v:
+            if not path:
+                raise ValueError("Keep path cannot be empty")
+            glob_translate(path)
+        return v
+
+    @field_validator("sync_branch", "main_branch", "private_branch", mode="after")
+    @classmethod
+    def validate_branch_name(cls, v: str) -> str:
+        if not v:
+            raise ValueError("Branch name cannot be empty")
+        if v.startswith("/") or ".." in v:
+            raise ValueError(f"Invalid branch name: {v!r}")
+        return v
+
+
 @click.command()
 @click.option("--private", required=True, help="Private repo path or URL")
 @click.option("--public", required=True, help="Public repo path or URL")
@@ -35,18 +79,30 @@ def main(
     """Sync filtered commits from private to public repository."""
 
     try:
-        result = sync(
+        config = SyncConfig(
             private=private,
             public=public,
             keep=keep,
-            keep_from_file=keep_from_file,
+            keep_from_file=Path(keep_from_file) if keep_from_file else None,
             sync_branch=sync_branch,
             main_branch=main_branch,
             private_branch=private_branch,
             dry_run=dry_run,
             merge=merge,
             force=force,
         )
+        result = sync(
+            private=config.private,
+            public=config.public,
+            keep=config.keep,
+            keep_from_file=config.keep_from_file,
+            sync_branch=config.sync_branch,
+            main_branch=config.main_branch,
+            private_branch=config.private_branch,
+            dry_run=config.dry_run,
+            merge=config.merge,
+            force=config.force,
+        )
     except ValueError as e:
         raise click.ClickException(str(e))
 

git_sync_filtered/sync.py

@@ -20,14 +20,14 @@ def read_paths_from_file(path: Path) -> list[str]:
 
 
 def collect_paths_to_keep(
-    keep: tuple[str, ...], keep_from_file: Optional[str]
+    keep: tuple[str, ...], keep_from_file: Optional[Path]
 ) -> list[str]:
-    paths_to_keep = set(keep)
+    paths_to_keep: set[str] = set(keep)
 
     if keep_from_file:
-        paths_to_keep.update(read_paths_from_file(Path(keep_from_file)))
+        paths_to_keep.update(read_paths_from_file(keep_from_file))
 
-    return sorted(list(paths_to_keep))
+    return sorted(paths_to_keep)
 
 
 def run_filter_repo(repo_path: Path | str, paths_to_keep: list[str]) -> None:
@@ -95,7 +95,7 @@ def sync(
     private: str,
     public: str,
     keep: tuple[str, ...],
-    keep_from_file: Optional[str],
+    keep_from_file: Optional[Path],
     sync_branch: str,
     main_branch: str,
     private_branch: str,

pyproject.toml

@@ -22,7 +22,12 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 
-dependencies = ["click>=8.0", "gitpython>=3.1", "git-filter-repo>=2.0"]
+dependencies = [
+  "click>=8.0",
+  "gitpython>=3.1",
+  "git-filter-repo>=2.0",
+  "pydantic>=2.12.5",
+]
 
 [project.optional-dependencies]
 dev = ["pytest", "ruff", "mypy"]
@@ -37,7 +42,7 @@ include = ["git_sync_filtered*"]
 [tool.ruff]
 line-length = 100
 target-version = "py310"
-select = ["E", "F", "ANN"]
+lint.select = ["E", "F", "ANN"]
 
 [dependency-groups]
 dev = ["pytest>=9.0.2"]

tests/unit/test_collect_paths.py

@@ -14,7 +14,7 @@ def test_collect_paths_to_keep_combines_args_and_file(tmp_path: Path) -> None:
 
     result = collect_paths_to_keep(
         keep=("src",),
-        keep_from_file=str(file_path),
+        keep_from_file=file_path,
     )
 
     assert result == ["lib", "src", "tests"]