Robot/watchexec
1
0
Fork 0
mirror of https://github.com/watchexec/watchexec.git synced 2024-11-13 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add filtering to demo CLI

Browse source
This commit is contained in:
Félix Saparelli 2021-09-28 22:24:06 +13:00
parent 7cdb6ac5ad
commit 30dae61a02
No known key found for this signature in database
GPG key ID: B948C4BAE44FC474
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/src/config.rs
View file

@ -1,5 +1,6 @@
use std::{
convert::Infallible, env::current_dir, io::stderr, path::Path, str::FromStr, time::Duration,
convert::Infallible, env::current_dir, io::stderr, path::Path, str::FromStr, sync::Arc,
time::Duration,
};
use clap::ArgMatches;
@ -8,13 +9,15 @@ use watchexec::{
action::{Action, Outcome, Signal},
command::Shell,
config::{InitConfig, RuntimeConfig},
filter::tagged::TaggedFilterer,
fs::Watcher,
handler::PrintDisplay,
signal::Signal as InputSignal,
};
pub fn new(args: &ArgMatches<'static>) -> Result<(InitConfig, RuntimeConfig)> {
Ok((init(args)?, runtime(args)?))
pub fn new(args: &ArgMatches<'static>) -> Result<(InitConfig, RuntimeConfig, Arc<TaggedFilterer>)> {
let r = runtime(args)?;
Ok((init(args)?, r.0, r.1))
}
fn init(_args: &ArgMatches<'static>) -> Result<InitConfig> {
@ -25,7 +28,7 @@ fn init(_args: &ArgMatches<'static>) -> Result<InitConfig> {
Ok(config.build()?)
}
fn runtime(args: &ArgMatches<'static>) -> Result<RuntimeConfig> {
fn runtime(args: &ArgMatches<'static>) -> Result<(RuntimeConfig, Arc<TaggedFilterer>)> {
let mut config = RuntimeConfig::default();
config.command(
@ -90,6 +93,9 @@ fn runtime(args: &ArgMatches<'static>) -> Result<RuntimeConfig> {
let print_events = args.is_present("print-events");
let once = args.is_present("once");
let filterer = TaggedFilterer::new(".", ".");
config.filterer(filterer.clone());
config.on_action(move |action: Action| {
let fut = async { Ok::<(), Infallible>(()) };
@ -180,10 +186,10 @@ fn runtime(args: &ArgMatches<'static>) -> Result<RuntimeConfig> {
fut
});
Ok(config)
Ok((config, filterer))
}
// until 2.0
// until 2.0, then Powershell
#[cfg(windows)]
fn default_shell() -> Shell {
Shell::Cmd

6
cli/src/main.rs
View file

@ -28,7 +28,11 @@ async fn main() -> Result<()> {
.ok();
}
let (init, runtime) = config::new(&args)?;
let (init, runtime, filterer) = config::new(&args)?;
for filter in args.values_of("filter").unwrap_or_default() {
filterer.add_filter(filter.parse()?).await?;
}
let wx = Watchexec::new(init, runtime)?;