# Description _(Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes.)_ I opened this PR to unify the run command method. It's mainly to improve consistency across the tree. # User-Facing Changes None. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
151 lines
5.4 KiB
Rust
151 lines
5.4 KiB
Rust
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Command, EngineState, Stack},
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
|
|
};
|
|
|
|
use std::thread;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Complete;
|
|
|
|
impl Command for Complete {
|
|
fn name(&self) -> &str {
|
|
"complete"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("complete")
|
|
.category(Category::System)
|
|
.input_output_types(vec![(Type::Any, Type::Record(vec![]))])
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Capture the outputs and exit code from an external piped in command in a nushell table"
|
|
}
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
r#"In order to capture stdout, stderr, and exit_code, externally piped in commands need to be wrapped with `do`"#
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
_engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
match input {
|
|
PipelineData::ExternalStream {
|
|
stdout,
|
|
stderr,
|
|
exit_code,
|
|
..
|
|
} => {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
|
|
// use a thread to receive stderr message.
|
|
// Or we may get a deadlock if child process sends out too much bytes to stdout.
|
|
//
|
|
// For example: in normal linux system, stdout pipe's limit is 65535 bytes.
|
|
// if child process sends out 65536 bytes, the process will be hanged because no consumer
|
|
// consumes the first 65535 bytes
|
|
// So we need a thread to receive stderr message, then the current thread can continue to consume
|
|
// stdout messages.
|
|
let stderr_handler = stderr.map(|stderr| {
|
|
let stderr_span = stderr.span;
|
|
(
|
|
thread::Builder::new()
|
|
.name("stderr consumer".to_string())
|
|
.spawn(move || {
|
|
let stderr = stderr.into_bytes()?;
|
|
if let Ok(st) = String::from_utf8(stderr.item.clone()) {
|
|
Ok::<_, ShellError>(Value::String {
|
|
val: st,
|
|
span: stderr.span,
|
|
})
|
|
} else {
|
|
Ok::<_, ShellError>(Value::Binary {
|
|
val: stderr.item,
|
|
span: stderr.span,
|
|
})
|
|
}
|
|
})
|
|
.expect("failed to create thread"),
|
|
stderr_span,
|
|
)
|
|
});
|
|
|
|
if let Some(stdout) = stdout {
|
|
cols.push("stdout".to_string());
|
|
let stdout = stdout.into_bytes()?;
|
|
if let Ok(st) = String::from_utf8(stdout.item.clone()) {
|
|
vals.push(Value::String {
|
|
val: st,
|
|
span: stdout.span,
|
|
})
|
|
} else {
|
|
vals.push(Value::Binary {
|
|
val: stdout.item,
|
|
span: stdout.span,
|
|
})
|
|
}
|
|
}
|
|
|
|
if let Some((handler, stderr_span)) = stderr_handler {
|
|
cols.push("stderr".to_string());
|
|
let res = handler.join().map_err(|err| {
|
|
ShellError::ExternalCommand(
|
|
"Fail to receive external commands stderr message".to_string(),
|
|
format!("{err:?}"),
|
|
stderr_span,
|
|
)
|
|
})??;
|
|
vals.push(res)
|
|
};
|
|
|
|
if let Some(exit_code) = exit_code {
|
|
let mut v: Vec<_> = exit_code.collect();
|
|
|
|
if let Some(v) = v.pop() {
|
|
cols.push("exit_code".to_string());
|
|
vals.push(v);
|
|
}
|
|
}
|
|
|
|
Ok(Value::Record {
|
|
cols,
|
|
vals,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data())
|
|
}
|
|
_ => Err(ShellError::GenericError(
|
|
"Complete only works with external streams".to_string(),
|
|
"complete only works on external streams".to_string(),
|
|
Some(call.head),
|
|
None,
|
|
Vec::new(),
|
|
)),
|
|
}
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description:
|
|
"Run the external command to completion, capturing stdout and exit_code",
|
|
example: "^external arg1 | complete",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description:
|
|
"Run external command to completion, capturing, stdout, stderr and exit_code",
|
|
example: "do { ^external arg1 } | complete",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|