mirror of
https://github.com/watchexec/watchexec.git
synced 2024-09-29 22:51:33 +02:00
Make globset easier to create (less generics)
This commit is contained in:
parent
f9cbb11258
commit
34d7c5ee9c
@ -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(),
|
||||||
|
Loading…
Reference in New Issue
Block a user