Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix adding globs to the IgnoreFilter (#581)

This commit is contained in:
Jonathan Cammisuli 2023-05-14 00:59:59 -04:00 committed by GitHub
parent 0afb5f2796
commit 6a86caacf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/ignore-files/src/filter.rs
View File

@ -108,7 +108,7 @@ impl IgnoreFilter {
for (file, content) in files_contents.into_iter().flatten() { for (file, content) in files_contents.into_iter().flatten() {
let _span = trace_span!("loading ignore file", ?file).entered(); let _span = trace_span!("loading ignore file", ?file).entered();
let applies_in = get_applies_in_path(origin, Some(&file)); let applies_in = get_applies_in_path(origin, &file);
let parent_ignore = ignores_trie let parent_ignore = ignores_trie
.get_ancestor_value(&applies_in.display().to_string()) .get_ancestor_value(&applies_in.display().to_string())
@ -190,11 +190,11 @@ impl IgnoreFilter {
/// ///
/// Does nothing silently otherwise. /// Does nothing silently otherwise.
pub async fn add_file(&mut self, file: &IgnoreFile) -> Result<(), Error> { pub async fn add_file(&mut self, file: &IgnoreFile) -> Result<(), Error> {
let applies_in = &get_applies_in_path(&self.origin, Some(file)) let applies_in = get_applies_in_path(&self.origin, file)
.display() .display()
.to_string(); .to_string();
let Some(Ignore { builder: Some(ref mut builder), ..}) = self.ignores.get_mut(applies_in) else { let Some(Ignore { builder: Some(ref mut builder), ..}) = self.ignores.get_mut(&applies_in) else {
return Ok(()); return Ok(());
}; };
@ -221,12 +221,12 @@ impl IgnoreFilter {
})?; })?;
} }
self.recompile(Some(file))?; self.recompile(file)?;
Ok(()) Ok(())
} }
fn recompile(&mut self, file: Option<&IgnoreFile>) -> Result<(), Error> { fn recompile(&mut self, file: &IgnoreFile) -> Result<(), Error> {
let applies_in = get_applies_in_path(&self.origin, file) let applies_in = get_applies_in_path(&self.origin, file)
.display() .display()
.to_string(); .to_string();
@ -240,7 +240,7 @@ impl IgnoreFilter {
trace!("recompiling globset"); trace!("recompiling globset");
let recompiled = builder.build().map_err(|err| Error::Glob { let recompiled = builder.build().map_err(|err| Error::Glob {
file: file.map(|file| file.path.clone()), file: Some(file.path.clone()),
err, err,
})?; })?;
@ -283,7 +283,11 @@ impl IgnoreFilter {
.map_err(|err| Error::Glob { file: None, err })?; .map_err(|err| Error::Glob { file: None, err })?;
} }
self.recompile(None)?; self.recompile(&IgnoreFile {
path: "manual glob".into(),
applies_in: Some(applies_in.clone()),
applies_to: None,
})?;
Ok(()) Ok(())
} }
@ -338,17 +342,13 @@ impl IgnoreFilter {
} }
} }
fn get_applies_in_path(origin: &Path, ignore_file: Option<&IgnoreFile>) -> PathBuf { fn get_applies_in_path(origin: &Path, ignore_file: &IgnoreFile) -> PathBuf {
let root_path = PathBuf::from(prefix(origin)); let root_path = PathBuf::from(prefix(origin));
if let Some(ignore_file) = ignore_file { ignore_file
ignore_file .applies_in
.applies_in .as_ref()
.as_ref() .map(|p| PathBuf::from(dunce::simplified(p)))
.map(|p| PathBuf::from(dunce::simplified(p))) .unwrap_or(root_path)
.unwrap_or(root_path)
} else {
root_path
}
} }
/// Gets the root component of a given path. /// Gets the root component of a given path.