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

Make globset easier to create (less generics)

This commit is contained in:
Félix Saparelli 2021-10-17 17:11:29 +13:00
parent f9cbb11258
commit 34d7c5ee9c
No known key found for this signature in database
GPG Key ID: B948C4BAE44FC474
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/src/filter/globset.rs
View File

@ -1,6 +1,6 @@
//! A simple filterer in the style of the watchexec v1 filter. //! A simple filterer in the style of the watchexec v1 filter.
use std::ffi::{OsStr, OsString}; use std::ffi::OsString;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use ignore::gitignore::{Gitignore, GitignoreBuilder}; use ignore::gitignore::{Gitignore, GitignoreBuilder};
@ -35,41 +35,28 @@ impl GlobsetFilterer {
/// The extensions list is used to filter files by extension. /// The extensions list is used to filter files by extension.
/// ///
/// Non-path events are always passed. /// Non-path events are always passed.
pub fn new<FI, F, II, P, EI, O>( pub fn new(
origin: impl AsRef<Path>, origin: impl AsRef<Path>,
filters: FI, filters: impl IntoIterator<Item = (String, Option<PathBuf>)>,
ignores: II, ignores: impl IntoIterator<Item = (String, Option<PathBuf>)>,
extensions: EI, extensions: impl IntoIterator<Item = OsString>,
) -> Result<Self, ignore::Error> ) -> Result<Self, ignore::Error> {
where
FI: IntoIterator<Item = (F, Option<P>)>,
F: AsRef<str>,
II: IntoIterator<Item = (F, Option<P>)>,
P: AsRef<Path>,
EI: IntoIterator<Item = O>,
O: AsRef<OsStr>,
{
let mut filters_builder = GitignoreBuilder::new(origin); let mut filters_builder = GitignoreBuilder::new(origin);
let mut ignores_builder = filters_builder.clone(); let mut ignores_builder = filters_builder.clone();
for (filter, in_path) in filters { for (filter, in_path) in filters {
let filter = filter.as_ref(); trace!(filter=?&filter, "add filter to globset filterer");
trace!(filter, "add filter to globset filterer"); filters_builder.add_line(in_path, &filter)?;
filters_builder.add_line(in_path.map(|p| p.as_ref().to_owned()), filter)?;
} }
for (ignore, in_path) in ignores { for (ignore, in_path) in ignores {
let ignore = ignore.as_ref(); trace!(ignore=?&ignore, "add ignore to globset filterer");
trace!(ignore, "add ignore to globset filterer"); ignores_builder.add_line(in_path, &ignore)?;
ignores_builder.add_line(in_path.map(|p| p.as_ref().to_owned()), ignore)?;
} }
let filters = filters_builder.build()?; let filters = filters_builder.build()?;
let ignores = ignores_builder.build()?; let ignores = ignores_builder.build()?;
let extensions: Vec<OsString> = extensions let extensions: Vec<OsString> = extensions.into_iter().collect();
.into_iter()
.map(|e| e.as_ref().to_owned())
.collect();
debug!( debug!(
num_filters=%filters.num_ignores(), num_filters=%filters.num_ignores(),
num_neg_filters=%filters.num_whitelists(), num_neg_filters=%filters.num_whitelists(),