讓自動提交包含同步狀態檔

Author: flier268

app/git_ops.py

@@ -7,6 +7,7 @@
 from git.exc import GitCommandError, InvalidGitRepositoryError, NoSuchPathError
 
 from .models import SyncTask
+from .sync_state import MANIFEST_NAME
 
 
 class GitManager:
@@ -33,10 +34,12 @@ def commit_task_changes(self, task: SyncTask) -> str | None:
             raise ValueError("output directory must be inside the Git working tree")
         relative_target = target_dir.relative_to(working_tree)
         scope = "." if str(relative_target) == "." else str(relative_target)
-        scoped_status = repo.git.status("--porcelain", "--", scope)
+        manifest_path = working_tree / MANIFEST_NAME
+        manifest_scope = manifest_path.relative_to(working_tree).as_posix()
+        scoped_status = repo.git.status("--porcelain", "--", scope, manifest_scope)
         if not scoped_status.strip():
             return None
-        repo.git.add("--all", "--", scope)
+        repo.git.add("--all", "--", scope, manifest_scope)
         message = task.git.commit_message_template.format(task_name=task.name)
         commit = repo.index.commit(message)
         if task.git.auto_push:

app/sync_engine.py

@@ -18,9 +18,7 @@
 from .git_ops import GitManager
 from .models import SyncEvent, SyncTask, TaskStatus
 from .storage import Storage
-
-MANIFEST_NAME = ".office-docs-sync-state.json"
-MANIFEST_VERSION = 1
+from .sync_state import MANIFEST_NAME, MANIFEST_VERSION
 
 
 class TaskEventHandler(FileSystemEventHandler):

app/sync_state.py

@@ -0,0 +1,4 @@
+from __future__ import annotations
+
+MANIFEST_NAME = ".office-docs-sync-state.json"
+MANIFEST_VERSION = 1

tests/test_sync_engine.py

@@ -52,6 +52,25 @@ def test_sync_engine_commits_inside_target_root(tmp_path: Path) -> None:
     assert engine.statuses[task.id or 0].last_error is None
     assert (Path(task.paths.target_root) / ".git").exists()
     assert (Path(task.paths.target_root) / task.paths.output_subdir / "123.md.md").exists()
+    assert (Path(task.paths.target_root) / MANIFEST_NAME).exists()
+
+
+def test_sync_engine_git_commit_includes_manifest(tmp_path: Path) -> None:
+    storage = Storage(tmp_path / "app.db")
+    task = create_task(storage, tmp_path, git_enabled=True)
+    engine = SyncEngine(storage, Converter(), GitManager())
+    source_file = Path(task.paths.source_dir) / "123.md"
+    source_file.write_text("hello\n", encoding="utf-8")
+
+    engine.queue_path(task.id or 0, str(source_file))
+    engine.queued_paths[task.id or 0][source_file] = 0
+    engine._process_task_queue(task)
+
+    repo = engine.git_manager.ensure_repo(task)
+    committed_files = repo.git.show("--name-only", "--pretty=format:", "HEAD").splitlines()
+
+    assert task.paths.output_subdir + "/123.md.md" in committed_files
+    assert MANIFEST_NAME in committed_files
 
 
 def test_reload_tasks_clears_queue_on_disable_and_removes_deleted_task(tmp_path: Path) -> None: