dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-31 09:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

refactor: simplify file watcher filter function implementation

Browse source
This commit is contained in:
Paul Gauthier (aider) 2024-12-01 08:09:13 -08:00
parent aa6d9779d3
commit e8ccc030c0
1 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

63
aider/watch.py
View file

@ -76,49 +76,40 @@ class FileWatcher:
self.changed_files = set() self.changed_files = set()
self.gitignores = gitignores self.gitignores = gitignores
#ai stop making this so indirect; just `def filter_func()` and use self.gitignores in it! self.gitignore_spec = load_gitignores([Path(g) for g in self.gitignores] if self.gitignores else [])
gitignore_paths = [Path(g) for g in self.gitignores] if self.gitignores else []
gitignore_spec = load_gitignores(gitignore_paths)
self.filter_func = self.create_filter_func(gitignore_spec, None)
coder.io.file_watcher = self coder.io.file_watcher = self
def create_filter_func(self, gitignore_spec, ignore_func): def filter_func(self, change_type, path):
"""Creates a filter function for the file watcher""" """Filter function for the file watcher"""
path_obj = Path(path)
path_abs = path_obj.absolute()
def filter_func(change_type, path): if not path_abs.is_relative_to(self.root.absolute()):
path_obj = Path(path) return False
path_abs = path_obj.absolute()
if not path_abs.is_relative_to(self.root.absolute()): rel_path = path_abs.relative_to(self.root)
return False if self.verbose:
dump(rel_path)
rel_path = path_abs.relative_to(self.root) if self.gitignore_spec and self.gitignore_spec.match_file(str(rel_path)):
return False
if not is_source_file(path_obj):
return False
if self.verbose:
dump("ok", rel_path)
# Check if file contains AI markers
try:
content = self.io.read_text(str(path_abs))
return self.ai_comment_pattern.search(content)
except Exception as err:
if self.verbose: if self.verbose:
dump(rel_path) print("error")
dump(err)
if gitignore_spec and gitignore_spec.match_file(str(rel_path)): return False
return False
if ignore_func and ignore_func(rel_path):
return False
if not is_source_file(path_obj):
return False
if self.verbose:
dump("ok", rel_path)
# Check if file contains AI markers
try:
content = self.io.read_text(str(path_abs))
return self.ai_comment_pattern.search(content)
except Exception as err:
if self.verbose:
print("error")
dump(err)
return False
return filter_func
def start(self): def start(self):
"""Start watching for file changes""" """Start watching for file changes"""