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

Implement tagged's --no-meta

This commit is contained in:
Félix Saparelli 2021-12-29 18:51:51 +13:00
parent c45840b657
commit ffcdf17914
No known key found for this signature in database
GPG Key ID: B948C4BAE44FC474
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/filterer/common.rs
View File

@ -105,6 +105,8 @@ pub async fn ignores(_args: &ArgMatches<'static>, origin: &Path) -> Result<Vec<I
// TODO: --no-ignore
// TODO: --no-vcs-ignore
// TODO: --no-global-ignore
// TODO: --no-default-ignore (whatever that was)
Ok(ignores)
}

44
cli/src/filterer/tagged.rs
View File

@ -1,13 +1,13 @@
use std::{path::PathBuf, sync::Arc};
use std::sync::Arc;
use clap::ArgMatches;
use futures::future::try_join_all;
use miette::Result;
use miette::{IntoDiagnostic, Result};
use tracing::debug;
use watchexec::{
filter::tagged::{
files::{self, FilterFile},
Filter, TaggedFilterer,
Filter, Matcher, Op, Pattern, TaggedFilterer,
},
ignore_files::IgnoreFile,
};
@ -16,19 +16,7 @@ pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
let (project_origin, workdir) = super::common::dirs(args).await?;
let ignores = super::common::ignores(args, &project_origin).await?;
let mut filters = Vec::new();
for filter in args.values_of("filter").unwrap_or_default() {
let mut filter: Filter = filter.parse()?;
filter.in_path = Some(workdir.clone());
filters.push(filter);
}
debug!(?filters, "parsed filters");
let filterer = TaggedFilterer::new(project_origin, workdir)?;
filterer.add_filters(&filters).await?;
let filterer = TaggedFilterer::new(project_origin, workdir.clone())?;
for ignore in &ignores {
filterer.add_ignore_file(ignore).await?;
@ -39,18 +27,20 @@ pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
let file = FilterFile(IgnoreFile {
applies_in: None,
applies_to: None,
path: PathBuf::from(path),
path: dunce::canonicalize(path).into_diagnostic()?,
});
filter_files.push(file);
}
debug!(?filter_files, "resolved command filter files");
if !args.is_present("no-global-filters") {
// TODO: handle errors
let (global_filter_files, _errors) = files::from_environment().await;
debug!(?global_filter_files, "discovered global filter files");
filter_files.extend(global_filter_files);
}
let filters = try_join_all(
let mut filters = try_join_all(
filter_files
.into_iter()
.map(|file| async move { file.load().await }),
@ -59,6 +49,24 @@ pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
.into_iter()
.flatten()
.collect::<Vec<_>>();
for filter in args.values_of("filter").unwrap_or_default() {
let mut filter: Filter = filter.parse()?;
filter.in_path = Some(workdir.clone());
filters.push(filter);
}
if args.is_present("no-meta") {
filters.push(Filter {
in_path: Some(workdir.clone()),
on: Matcher::FileEventKind,
op: Op::NotGlob,
pat: Pattern::Glob("Modify(Metadata(*))".to_string()),
negate: false,
});
}
debug!(?filters, "parsed filters");
filterer.add_filters(&filters).await?;
Ok(filterer)