mirror of
https://github.com/nushell/nushell.git
synced 2025-04-15 08:48:19 +02:00
# Description
Possible fix of #11456
This PR fixes a bug where builtin commands did not respect the logic of
dynamically passed boolean flags. The reason is
[has_flag](6f59abaf43/crates/nu-protocol/src/ast/call.rs (L204C5-L212C6)
)
method did not evaluate and take into consideration expression used with
flag.
To address this issue a solution is proposed:
1. `has_flag` method is moved to `CallExt` and new logic to evaluate
expression and check if it is a boolean value is added
2. `has_flag_const` method is added to `CallExt` which is a constant
version of `has_flag`
3. `has_named` method is added to `Call` which is basically the old
logic of `has_flag`
4. All usages of `has_flag` in code are updated, mostly to pass
`engine_state` and `stack` to new `has_flag`. In `run_const` commands it
is replaced with `has_flag_const`. And in a few select places: parser,
`to nuon` and `into string` old logic via `has_named` is used.
# User-Facing Changes
Explicit values of boolean flags are now respected in builtin commands.
Before:

After:

Another example:
Before:

After:

# Tests + Formatting
Added test reproducing some variants of original issue.
322 lines
13 KiB
Rust
322 lines
13 KiB
Rust
use std::path::PathBuf;
|
|
use std::sync::mpsc::{channel, RecvTimeoutError};
|
|
use std::time::Duration;
|
|
|
|
use notify_debouncer_full::{
|
|
new_debouncer,
|
|
notify::{
|
|
event::{DataChange, ModifyKind, RenameMode},
|
|
EventKind, RecursiveMode, Watcher,
|
|
},
|
|
};
|
|
use nu_engine::{current_dir, eval_block, CallExt};
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Closure, Command, EngineState, Stack, StateWorkingSet};
|
|
use nu_protocol::{
|
|
format_error, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature,
|
|
Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
// durations chosen mostly arbitrarily
|
|
const CHECK_CTRL_C_FREQUENCY: Duration = Duration::from_millis(100);
|
|
const DEFAULT_WATCH_DEBOUNCE_DURATION: Duration = Duration::from_millis(100);
|
|
|
|
#[derive(Clone)]
|
|
pub struct Watch;
|
|
|
|
impl Command for Watch {
|
|
fn name(&self) -> &str {
|
|
"watch"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Watch for file changes and execute Nu code when they happen."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["watcher", "reload", "filesystem"]
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("watch")
|
|
.input_output_types(vec![(Type::Nothing, Type::Table(vec![]))])
|
|
.required("path", SyntaxShape::Filepath, "The path to watch. Can be a file or directory.")
|
|
.required("closure",
|
|
SyntaxShape::Closure(Some(vec![SyntaxShape::String, SyntaxShape::String, SyntaxShape::String])),
|
|
"Some Nu code to run whenever a file changes. The closure will be passed `operation`, `path`, and `new_path` (for renames only) arguments in that order.")
|
|
.named(
|
|
"debounce-ms",
|
|
SyntaxShape::Int,
|
|
"Debounce changes for this many milliseconds (default: 100). Adjust if you find that single writes are reported as multiple events",
|
|
Some('d'),
|
|
)
|
|
.named(
|
|
"glob",
|
|
SyntaxShape::String, // SyntaxShape::GlobPattern gets interpreted relative to cwd, so use String instead
|
|
"Only report changes for files that match this glob pattern (default: all files)",
|
|
Some('g'),
|
|
)
|
|
.named(
|
|
"recursive",
|
|
SyntaxShape::Boolean,
|
|
"Watch all directories under `<path>` recursively. Will be ignored if `<path>` is a file (default: true)",
|
|
Some('r'),
|
|
)
|
|
.switch("verbose", "Operate in verbose mode (default: false)", Some('v'))
|
|
.category(Category::FileSystem)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let cwd = current_dir(engine_state, stack)?;
|
|
let path_arg: Spanned<String> = call.req(engine_state, stack, 0)?;
|
|
|
|
let path_no_whitespace = &path_arg
|
|
.item
|
|
.trim_end_matches(|x| matches!(x, '\x09'..='\x0d'));
|
|
|
|
let path = match nu_path::canonicalize_with(path_no_whitespace, cwd) {
|
|
Ok(p) => p,
|
|
Err(_) => {
|
|
return Err(ShellError::DirectoryNotFound {
|
|
dir: path_no_whitespace.to_string(),
|
|
span: path_arg.span,
|
|
})
|
|
}
|
|
};
|
|
|
|
let capture_block: Closure = call.req(engine_state, stack, 1)?;
|
|
let block = engine_state
|
|
.clone()
|
|
.get_block(capture_block.block_id)
|
|
.clone();
|
|
|
|
let verbose = call.has_flag(engine_state, stack, "verbose")?;
|
|
|
|
let debounce_duration_flag: Option<Spanned<i64>> =
|
|
call.get_flag(engine_state, stack, "debounce-ms")?;
|
|
let debounce_duration = match debounce_duration_flag {
|
|
Some(val) => match u64::try_from(val.item) {
|
|
Ok(val) => Duration::from_millis(val),
|
|
Err(_) => {
|
|
return Err(ShellError::TypeMismatch {
|
|
err_message: "Debounce duration is invalid".to_string(),
|
|
span: val.span,
|
|
})
|
|
}
|
|
},
|
|
None => DEFAULT_WATCH_DEBOUNCE_DURATION,
|
|
};
|
|
|
|
let glob_flag: Option<Spanned<String>> = call.get_flag(engine_state, stack, "glob")?;
|
|
let glob_pattern = match glob_flag {
|
|
Some(glob) => {
|
|
let absolute_path = path.join(glob.item);
|
|
if verbose {
|
|
eprintln!("Absolute glob path: {absolute_path:?}");
|
|
}
|
|
|
|
match nu_glob::Pattern::new(&absolute_path.to_string_lossy()) {
|
|
Ok(pattern) => Some(pattern),
|
|
Err(_) => {
|
|
return Err(ShellError::TypeMismatch {
|
|
err_message: "Glob pattern is invalid".to_string(),
|
|
span: glob.span,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
None => None,
|
|
};
|
|
|
|
let recursive_flag: Option<Spanned<bool>> =
|
|
call.get_flag(engine_state, stack, "recursive")?;
|
|
let recursive_mode = match recursive_flag {
|
|
Some(recursive) => {
|
|
if recursive.item {
|
|
RecursiveMode::Recursive
|
|
} else {
|
|
RecursiveMode::NonRecursive
|
|
}
|
|
}
|
|
None => RecursiveMode::Recursive,
|
|
};
|
|
|
|
let ctrlc_ref = &engine_state.ctrlc.clone();
|
|
let (tx, rx) = channel();
|
|
|
|
let mut debouncer = match new_debouncer(debounce_duration, None, tx) {
|
|
Ok(d) => d,
|
|
Err(e) => {
|
|
return Err(ShellError::IOError {
|
|
msg: format!("Failed to create watcher: {e}"),
|
|
})
|
|
}
|
|
};
|
|
if let Err(e) = debouncer.watcher().watch(&path, recursive_mode) {
|
|
return Err(ShellError::IOError {
|
|
msg: format!("Failed to create watcher: {e}"),
|
|
});
|
|
}
|
|
// need to cache to make sure that rename event works.
|
|
debouncer.cache().add_root(&path, recursive_mode);
|
|
|
|
eprintln!("Now watching files at {path:?}. Press ctrl+c to abort.");
|
|
|
|
let event_handler =
|
|
|operation: &str, path: PathBuf, new_path: Option<PathBuf>| -> Result<(), ShellError> {
|
|
let glob_pattern = glob_pattern.clone();
|
|
let matches_glob = match glob_pattern.clone() {
|
|
Some(glob) => glob.matches_path(&path),
|
|
None => true,
|
|
};
|
|
if verbose && glob_pattern.is_some() {
|
|
eprintln!("Matches glob: {matches_glob}");
|
|
}
|
|
|
|
if matches_glob {
|
|
let stack = &mut stack.clone();
|
|
|
|
if let Some(position) = block.signature.get_positional(0) {
|
|
if let Some(position_id) = &position.var_id {
|
|
stack.add_var(*position_id, Value::string(operation, call.span()));
|
|
}
|
|
}
|
|
|
|
if let Some(position) = block.signature.get_positional(1) {
|
|
if let Some(position_id) = &position.var_id {
|
|
stack.add_var(
|
|
*position_id,
|
|
Value::string(path.to_string_lossy(), call.span()),
|
|
);
|
|
}
|
|
}
|
|
|
|
if let Some(position) = block.signature.get_positional(2) {
|
|
if let Some(position_id) = &position.var_id {
|
|
stack.add_var(
|
|
*position_id,
|
|
Value::string(
|
|
new_path.unwrap_or_else(|| "".into()).to_string_lossy(),
|
|
call.span(),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
let eval_result = eval_block(
|
|
engine_state,
|
|
stack,
|
|
&block,
|
|
Value::nothing(call.span()).into_pipeline_data(),
|
|
call.redirect_stdout,
|
|
call.redirect_stderr,
|
|
);
|
|
|
|
match eval_result {
|
|
Ok(val) => {
|
|
val.print(engine_state, stack, false, false)?;
|
|
}
|
|
Err(err) => {
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
eprintln!("{}", format_error(&working_set, &err));
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
};
|
|
|
|
loop {
|
|
match rx.recv_timeout(CHECK_CTRL_C_FREQUENCY) {
|
|
Ok(Ok(events)) => {
|
|
if verbose {
|
|
eprintln!("{events:?}");
|
|
}
|
|
for mut one_event in events {
|
|
let handle_result = match one_event.event.kind {
|
|
// only want to handle event if relative path exists.
|
|
EventKind::Create(_) => one_event
|
|
.paths
|
|
.pop()
|
|
.map(|path| event_handler("Create", path, None))
|
|
.unwrap_or(Ok(())),
|
|
EventKind::Remove(_) => one_event
|
|
.paths
|
|
.pop()
|
|
.map(|path| event_handler("Remove", path, None))
|
|
.unwrap_or(Ok(())),
|
|
EventKind::Modify(ModifyKind::Data(DataChange::Content))
|
|
| EventKind::Modify(ModifyKind::Data(DataChange::Any))
|
|
| EventKind::Modify(ModifyKind::Any) => one_event
|
|
.paths
|
|
.pop()
|
|
.map(|path| event_handler("Write", path, None))
|
|
.unwrap_or(Ok(())),
|
|
EventKind::Modify(ModifyKind::Name(RenameMode::Both)) => one_event
|
|
.paths
|
|
.pop()
|
|
.map(|to| {
|
|
one_event
|
|
.paths
|
|
.pop()
|
|
.map(|from| event_handler("Rename", from, Some(to)))
|
|
.unwrap_or(Ok(()))
|
|
})
|
|
.unwrap_or(Ok(())),
|
|
_ => Ok(()),
|
|
};
|
|
handle_result?;
|
|
}
|
|
}
|
|
Ok(Err(_)) => {
|
|
return Err(ShellError::IOError {
|
|
msg: "Unexpected errors when receiving events".into(),
|
|
})
|
|
}
|
|
Err(RecvTimeoutError::Disconnected) => {
|
|
return Err(ShellError::IOError {
|
|
msg: "Unexpected disconnect from file watcher".into(),
|
|
});
|
|
}
|
|
Err(RecvTimeoutError::Timeout) => {}
|
|
}
|
|
if nu_utils::ctrl_c::was_pressed(ctrlc_ref) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
Ok(PipelineData::empty())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Run `cargo test` whenever a Rust file changes",
|
|
example: r#"watch . --glob=**/*.rs {|| cargo test }"#,
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Watch all changes in the current directory",
|
|
example: r#"watch . { |op, path, new_path| $"($op) ($path) ($new_path)"}"#,
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Log all changes in a directory",
|
|
example: r#"watch /foo/bar { |op, path| $"($op) - ($path)(char nl)" | save --append changes_in_bar.log }"#,
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Note: if you are looking to run a command every N units of time, this can be accomplished with a loop and sleep",
|
|
example: r#"loop { command; sleep duration }"#,
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|