Load global and -F filter files
This commit is contained in:
parent
db322f1228
commit
c45840b657
|
@ -2552,6 +2552,7 @@ dependencies = [
|
||||||
"console-subscriber",
|
"console-subscriber",
|
||||||
"dunce",
|
"dunce",
|
||||||
"embed-resource",
|
"embed-resource",
|
||||||
|
"futures",
|
||||||
"insta",
|
"insta",
|
||||||
"miette",
|
"miette",
|
||||||
"mimalloc",
|
"mimalloc",
|
||||||
|
|
|
@ -27,6 +27,7 @@ miette = { version = "3.2.0", features = ["fancy"] }
|
||||||
notify-rust = "4.5.2"
|
notify-rust = "4.5.2"
|
||||||
tracing = "0.1.26"
|
tracing = "0.1.26"
|
||||||
watchexec = { path = "../lib" }
|
watchexec = { path = "../lib" }
|
||||||
|
futures = "0.3.17"
|
||||||
|
|
||||||
[dependencies.clap]
|
[dependencies.clap]
|
||||||
version = "2.33.3"
|
version = "2.33.3"
|
||||||
|
|
|
@ -106,6 +106,10 @@ pub fn get_args(tagged_filterer: bool) -> Result<ArgMatches<'static>> {
|
||||||
.help_heading(Some(OPTSET_FILTERING))
|
.help_heading(Some(OPTSET_FILTERING))
|
||||||
.help("Skip auto-ignoring of commonly ignored globs")
|
.help("Skip auto-ignoring of commonly ignored globs")
|
||||||
.long("no-default-ignore"))
|
.long("no-default-ignore"))
|
||||||
|
.arg(Arg::with_name("no-global-ignore") // TODO
|
||||||
|
.help_heading(Some(OPTSET_FILTERING))
|
||||||
|
.help("Skip auto-loading of global or environment-wide ignore files")
|
||||||
|
.long("no-default-ignore"))
|
||||||
.arg(Arg::with_name("postpone")
|
.arg(Arg::with_name("postpone")
|
||||||
.help_heading(Some(OPTSET_BEHAVIOUR))
|
.help_heading(Some(OPTSET_BEHAVIOUR))
|
||||||
.help("Wait until first change to execute command")
|
.help("Wait until first change to execute command")
|
||||||
|
@ -165,7 +169,7 @@ pub fn get_args(tagged_filterer: bool) -> Result<ArgMatches<'static>> {
|
||||||
.value_name("tagged filter"),
|
.value_name("tagged filter"),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::with_name("filter-files") // TODO
|
Arg::with_name("filter-files")
|
||||||
.help_heading(Some(OPTSET_FILTERING))
|
.help_heading(Some(OPTSET_FILTERING))
|
||||||
.help("Load tagged filters from a file")
|
.help("Load tagged filters from a file")
|
||||||
.short("F")
|
.short("F")
|
||||||
|
@ -175,6 +179,12 @@ pub fn get_args(tagged_filterer: bool) -> Result<ArgMatches<'static>> {
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.value_name("path"),
|
.value_name("path"),
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("no-global-filters")
|
||||||
|
.help_heading(Some(OPTSET_FILTERING))
|
||||||
|
.help("Skip auto-loading of global or environment-wide ignore files")
|
||||||
|
.long("no-default-filters"),
|
||||||
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::with_name("no-meta") // TODO
|
Arg::with_name("no-meta") // TODO
|
||||||
.help_heading(Some(OPTSET_FILTERING))
|
.help_heading(Some(OPTSET_FILTERING))
|
||||||
|
|
|
@ -1,9 +1,16 @@
|
||||||
use std::sync::Arc;
|
use std::{path::PathBuf, sync::Arc};
|
||||||
|
|
||||||
use clap::ArgMatches;
|
use clap::ArgMatches;
|
||||||
|
use futures::future::try_join_all;
|
||||||
use miette::Result;
|
use miette::Result;
|
||||||
use tracing::debug;
|
use tracing::debug;
|
||||||
use watchexec::filter::tagged::{Filter, TaggedFilterer};
|
use watchexec::{
|
||||||
|
filter::tagged::{
|
||||||
|
files::{self, FilterFile},
|
||||||
|
Filter, TaggedFilterer,
|
||||||
|
},
|
||||||
|
ignore_files::IgnoreFile,
|
||||||
|
};
|
||||||
|
|
||||||
pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
|
pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
|
||||||
let (project_origin, workdir) = super::common::dirs(args).await?;
|
let (project_origin, workdir) = super::common::dirs(args).await?;
|
||||||
|
@ -27,8 +34,32 @@ pub async fn tagged(args: &ArgMatches<'static>) -> Result<Arc<TaggedFilterer>> {
|
||||||
filterer.add_ignore_file(ignore).await?;
|
filterer.add_ignore_file(ignore).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: load global/env filter files
|
let mut filter_files = Vec::new();
|
||||||
// TODO: load -F filter files
|
for path in args.values_of_os("filter-file").unwrap_or_default() {
|
||||||
|
let file = FilterFile(IgnoreFile {
|
||||||
|
applies_in: None,
|
||||||
|
applies_to: None,
|
||||||
|
path: PathBuf::from(path),
|
||||||
|
});
|
||||||
|
filter_files.push(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
if !args.is_present("no-global-filters") {
|
||||||
|
// TODO: handle errors
|
||||||
|
let (global_filter_files, _errors) = files::from_environment().await;
|
||||||
|
filter_files.extend(global_filter_files);
|
||||||
|
}
|
||||||
|
|
||||||
|
let filters = try_join_all(
|
||||||
|
filter_files
|
||||||
|
.into_iter()
|
||||||
|
.map(|file| async move { file.load().await }),
|
||||||
|
)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.flatten()
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
filterer.add_filters(&filters).await?;
|
||||||
|
|
||||||
Ok(filterer)
|
Ok(filterer)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue