forked from extern/nushell
522a828687
* Refactor InputStream and affected commands. First, making `values` private and leaning on the `Stream` implementation makes consumes of `InputStream` less likely to have to change in the future, if we change what an `InputStream` is internally. Second, we're dropping `Option<InputStream>` as the input to pipelines, internals, and externals. Instead, `InputStream.is_empty` can be used to check for "emptiness". Empty streams are typically only ever used as the first input to a pipeline. * Add run_external internal command. We want to push external commands closer to internal commands, eventually eliminating the concept of "external" completely. This means we can consolidate a couple of things: - Variable evaluation (for example, `$it`, `$nu`, alias vars) - Behaviour of whole stream vs per-item external execution It should also make it easier for us to start introducing argument signatures for external commands, * Update run_external.rs * Update run_external.rs * Update run_external.rs * Update run_external.rs Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
77 lines
2.3 KiB
Rust
77 lines
2.3 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::prelude::*;
|
|
use log::trace;
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
|
|
use nu_source::Tagged;
|
|
|
|
#[derive(Deserialize)]
|
|
struct SplitRowArgs {
|
|
separator: Tagged<String>,
|
|
}
|
|
|
|
pub struct SplitRow;
|
|
|
|
impl WholeStreamCommand for SplitRow {
|
|
fn name(&self) -> &str {
|
|
"split-row"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("split-row").required(
|
|
"separator",
|
|
SyntaxShape::Any,
|
|
"the character that denotes what separates rows",
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Split row contents over multiple rows via the separator."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
args.process(registry, split_row)?.run()
|
|
}
|
|
}
|
|
|
|
fn split_row(
|
|
SplitRowArgs { separator }: SplitRowArgs,
|
|
RunnableContext { input, name, .. }: RunnableContext,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let stream = input
|
|
.map(move |v| {
|
|
if let Ok(s) = v.as_string() {
|
|
let splitter = separator.item.replace("\\n", "\n");
|
|
trace!("splitting with {:?}", splitter);
|
|
let split_result: Vec<_> = s.split(&splitter).filter(|s| s.trim() != "").collect();
|
|
|
|
trace!("split result = {:?}", split_result);
|
|
|
|
let mut result = VecDeque::new();
|
|
for s in split_result {
|
|
result.push_back(ReturnSuccess::value(
|
|
UntaggedValue::Primitive(Primitive::String(s.into())).into_value(&v.tag),
|
|
));
|
|
}
|
|
futures::stream::iter(result)
|
|
} else {
|
|
let mut result = VecDeque::new();
|
|
result.push_back(Err(ShellError::labeled_error_with_secondary(
|
|
"Expected a string from pipeline",
|
|
"requires string input",
|
|
name.span,
|
|
"value originates from here",
|
|
v.tag.span,
|
|
)));
|
|
futures::stream::iter(result)
|
|
}
|
|
})
|
|
.flatten();
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|