dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-06 20:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

refactor: optimize file path handling in watch_source_files function

Browse source
This commit is contained in:
Paul Gauthier 2024-10-25 10:51:09 -07:00 • committed by Paul Gauthier (aider)
parent 5918a18dee
commit 893f3f343f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aider/watch.py
View file

@ -5,7 +5,7 @@ from pathspec import PathSpec
from pathspec.patterns import GitWildMatchPattern from pathspec.patterns import GitWildMatchPattern
from watchfiles import watch from watchfiles import watch
from aider.dump import dump from aider.dump import dump # noqa
def is_source_file(path: Path) -> bool: def is_source_file(path: Path) -> bool:
@ -72,23 +72,23 @@ def watch_source_files(directory: str, gitignores: list[str] = None, ignore_func
root = Path(directory) root = Path(directory)
gitignore_paths = [Path(g) for g in gitignores] if gitignores else [] gitignore_paths = [Path(g) for g in gitignores] if gitignores else []
gitignore_spec = load_gitignores(gitignore_paths) gitignore_spec = load_gitignores(gitignore_paths)
root_abs = root.absolute()
# Create a filter function that only accepts source files and respects gitignore # Create a filter function that only accepts source files and respects gitignore
def filter_func(change_type, path): def filter_func(change_type, path):
dump(path, root)
path_obj = Path(path) path_obj = Path(path)
root_abs = root.resolve() path_abs = path_obj.absolute()
path_abs = path_obj.resolve()
if not path_abs.is_relative_to(root_abs): if not path_abs.is_relative_to(root_abs):
return False return False
rel_path = path_abs.relative_to(root_abs) rel_path = path_abs.relative_to(root_abs)
if gitignore_spec and gitignore_spec.match_file(str(rel_path)): if gitignore_spec and gitignore_spec.match_file(str(rel_path)):
return False return False
if ignore_func and ignore_func(rel_path): if ignore_func and ignore_func(rel_path):
return False return False
return is_source_file(path_obj) return is_source_file(path_obj)
# Watch the directory for changes # Watch the directory for changes