mirror of
https://github.com/nushell/nushell
synced 2025-01-10 12:19:14 +00:00
8925ca5da3
* WIP: move to bytes codec * Progress on adding collect helpers * Progress on adding collect helpers * Add in line splitting back to lines * Lines outputting line primitives * Close to ready? * Finish fixing lines * clippy fixes * fmt fixes * removed unused code * Cleanup a few bits * Cleanup a few bits * Cleanup a few more bits * Fix failing test with corrected test case
116 lines
4.1 KiB
Rust
116 lines
4.1 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::prelude::*;
|
|
use nu_errors::ShellError;
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
|
|
|
|
pub struct Lines;
|
|
|
|
impl WholeStreamCommand for Lines {
|
|
fn name(&self) -> &str {
|
|
"lines"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("lines")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Split single string into rows, one per line."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
lines(args, registry)
|
|
}
|
|
}
|
|
|
|
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
|
|
}
|
|
}
|
|
|
|
fn lines(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
|
let args = args.evaluate_once(registry)?;
|
|
let tag = args.name_tag();
|
|
let name_span = tag.span;
|
|
let mut input = args.input;
|
|
|
|
let mut leftover = vec![];
|
|
let mut leftover_string = String::new();
|
|
let stream = async_stream! {
|
|
loop {
|
|
match input.values.next().await {
|
|
Some(Value { value: UntaggedValue::Primitive(Primitive::String(st)), ..}) => {
|
|
let mut st = leftover_string.clone() + &st;
|
|
leftover.clear();
|
|
|
|
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
|
|
|
|
if !ends_with_line_ending(&st) {
|
|
if let Some(last) = lines.pop() {
|
|
leftover_string = last;
|
|
} else {
|
|
leftover_string.clear();
|
|
}
|
|
} else {
|
|
leftover_string.clear();
|
|
}
|
|
|
|
let success_lines: Vec<_> = lines.iter().map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value())).collect();
|
|
yield futures::stream::iter(success_lines)
|
|
}
|
|
Some(Value { value: UntaggedValue::Primitive(Primitive::Line(st)), ..}) => {
|
|
let mut st = leftover_string.clone() + &st;
|
|
leftover.clear();
|
|
|
|
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
|
|
if !ends_with_line_ending(&st) {
|
|
if let Some(last) = lines.pop() {
|
|
leftover_string = last;
|
|
} else {
|
|
leftover_string.clear();
|
|
}
|
|
} else {
|
|
leftover_string.clear();
|
|
}
|
|
|
|
let success_lines: Vec<_> = lines.iter().map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value())).collect();
|
|
yield futures::stream::iter(success_lines)
|
|
}
|
|
Some( Value { tag: value_span, ..}) => {
|
|
yield 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,
|
|
))]);
|
|
}
|
|
None => {
|
|
if !leftover.is_empty() {
|
|
let mut st = leftover_string.clone();
|
|
if let Ok(extra) = String::from_utf8(leftover) {
|
|
st.push_str(&extra);
|
|
}
|
|
yield futures::stream::iter(vec![ReturnSuccess::value(UntaggedValue::string(st).into_untagged_value())])
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if !leftover_string.is_empty() {
|
|
yield futures::stream::iter(vec![ReturnSuccess::value(UntaggedValue::string(leftover_string).into_untagged_value())]);
|
|
}
|
|
}
|
|
.flatten();
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|