2019-08-19 07:16:39 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-06-18 02:39:57 +02:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-03-06 17:06:39 +01:00
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
|
2020-07-05 02:20:58 +02:00
|
|
|
use parking_lot::Mutex;
|
2019-06-22 05:43:37 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
pub struct Lines;
|
|
|
|
|
2020-05-29 10:22:52 +02:00
|
|
|
#[async_trait]
|
2019-08-19 07:16:39 +02:00
|
|
|
impl WholeStreamCommand for Lines {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"lines"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("lines")
|
|
|
|
}
|
2019-08-30 00:52:32 +02:00
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Split single string into rows, one per line."
|
|
|
|
}
|
|
|
|
|
2020-05-29 10:22:52 +02:00
|
|
|
async fn run(
|
2019-08-30 00:52:32 +02:00
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-06-14 23:00:42 +02:00
|
|
|
lines(args, registry).await
|
2019-08-30 00:52:32 +02:00
|
|
|
}
|
2020-05-12 17:54:29 +02:00
|
|
|
|
2020-05-18 14:56:01 +02:00
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![Example {
|
|
|
|
description: "Split multi-line string into lines",
|
|
|
|
example: r#"^echo "two\nlines" | lines"#,
|
|
|
|
result: None,
|
2020-05-12 17:54:29 +02:00
|
|
|
}]
|
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
fn ends_with_line_ending(st: &str) -> bool {
|
|
|
|
let mut temp = st.to_string();
|
|
|
|
let last = temp.pop();
|
|
|
|
if let Some(c) = last {
|
|
|
|
c == '\n'
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
2019-06-18 02:39:57 +02:00
|
|
|
|
2020-06-14 23:00:42 +02:00
|
|
|
async fn lines(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
2020-07-05 02:20:58 +02:00
|
|
|
let leftover_string = Arc::new(Mutex::new(String::new()));
|
2020-05-16 05:18:24 +02:00
|
|
|
let registry = registry.clone();
|
2020-06-14 23:00:42 +02:00
|
|
|
let args = args.evaluate_once(®istry).await?;
|
|
|
|
let tag = args.name_tag();
|
|
|
|
let name_span = tag.span;
|
|
|
|
|
|
|
|
let eos = futures::stream::iter(vec![
|
|
|
|
UntaggedValue::Primitive(Primitive::EndOfStream).into_untagged_value()
|
|
|
|
]);
|
|
|
|
|
|
|
|
Ok(args
|
|
|
|
.input
|
|
|
|
.chain(eos)
|
|
|
|
.map(move |item| {
|
2020-07-05 02:20:58 +02:00
|
|
|
let leftover_string = leftover_string.clone();
|
2020-06-14 23:00:42 +02:00
|
|
|
|
|
|
|
match item {
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Primitive(Primitive::String(st)),
|
|
|
|
..
|
2020-03-06 17:06:39 +01:00
|
|
|
}
|
2020-07-18 19:17:56 +02:00
|
|
|
| Value {
|
2020-06-14 23:00:42 +02:00
|
|
|
value: UntaggedValue::Primitive(Primitive::Line(st)),
|
|
|
|
..
|
|
|
|
} => {
|
2020-07-05 02:20:58 +02:00
|
|
|
let mut leftover_string = leftover_string.lock();
|
|
|
|
|
2020-06-14 23:00:42 +02:00
|
|
|
let st = (&*leftover_string).clone() + &st;
|
2020-07-05 02:20:58 +02:00
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
|
2020-07-05 02:20:58 +02:00
|
|
|
|
2020-07-18 19:17:56 +02:00
|
|
|
leftover_string.clear();
|
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
if !ends_with_line_ending(&st) {
|
|
|
|
if let Some(last) = lines.pop() {
|
2020-07-05 02:20:58 +02:00
|
|
|
leftover_string.push_str(&last);
|
2020-03-06 17:06:39 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-14 23:00:42 +02:00
|
|
|
let success_lines: Vec<_> = lines
|
|
|
|
.iter()
|
|
|
|
.map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value()))
|
|
|
|
.collect();
|
2020-07-05 02:20:58 +02:00
|
|
|
|
2020-06-14 23:00:42 +02:00
|
|
|
futures::stream::iter(success_lines)
|
2020-03-06 17:06:39 +01:00
|
|
|
}
|
2020-06-14 23:00:42 +02:00
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Primitive(Primitive::EndOfStream),
|
|
|
|
..
|
|
|
|
} => {
|
2020-07-05 02:20:58 +02:00
|
|
|
let st = (&*leftover_string).lock().clone();
|
|
|
|
if !st.is_empty() {
|
|
|
|
futures::stream::iter(vec![ReturnSuccess::value(
|
|
|
|
UntaggedValue::string(st).into_untagged_value(),
|
|
|
|
)])
|
2020-06-14 23:00:42 +02:00
|
|
|
} else {
|
|
|
|
futures::stream::iter(vec![])
|
2020-03-06 17:06:39 +01:00
|
|
|
}
|
|
|
|
}
|
2020-06-14 23:00:42 +02:00
|
|
|
Value {
|
|
|
|
tag: value_span, ..
|
|
|
|
} => futures::stream::iter(vec![Err(ShellError::labeled_error_with_secondary(
|
|
|
|
"Expected a string from pipeline",
|
|
|
|
"requires string input",
|
|
|
|
name_span,
|
|
|
|
"value originates from here",
|
|
|
|
value_span,
|
|
|
|
))]),
|
2019-06-18 02:39:57 +02:00
|
|
|
}
|
2020-06-14 23:00:42 +02:00
|
|
|
})
|
|
|
|
.flatten()
|
|
|
|
.to_output_stream())
|
2019-06-18 02:39:57 +02:00
|
|
|
}
|
2020-05-18 14:56:01 +02:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::Lines;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn examples_work_as_expected() {
|
|
|
|
use crate::examples::test as test_examples;
|
|
|
|
|
|
|
|
test_examples(Lines {})
|
|
|
|
}
|
|
|
|
}
|