mirror of
https://github.com/nushell/nushell
synced 2025-01-25 11:25:21 +00:00
193b00764b
* Moves off of draining between filters. Instead, the sink will pull on the stream, and will drain element-wise. This moves the whole stream to being lazy. * Adds ctrl-c support and connects it into some of the key points where we pull on the stream. If a ctrl-c is detect, we immediately halt pulling on the stream and return to the prompt. * Moves away from having a SourceMap where anchor locations are stored. Now AnchorLocation is kept directly in the Tag. * To make this possible, split tag and span. Span is largely used in the parser and is copyable. Tag is now no longer copyable.
139 lines
3.8 KiB
Rust
139 lines
3.8 KiB
Rust
use crate::commands::WholeStreamCommand;
|
|
use crate::data::{Primitive, TaggedDictBuilder, Value};
|
|
use crate::prelude::*;
|
|
use csv::ReaderBuilder;
|
|
|
|
pub struct FromTSV;
|
|
|
|
#[derive(Deserialize)]
|
|
pub struct FromTSVArgs {
|
|
headerless: bool,
|
|
}
|
|
|
|
impl WholeStreamCommand for FromTSV {
|
|
fn name(&self) -> &str {
|
|
"from-tsv"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from-tsv").switch("headerless")
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .tsv and create table."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
args: CommandArgs,
|
|
registry: &CommandRegistry,
|
|
) -> Result<OutputStream, ShellError> {
|
|
args.process(registry, from_tsv)?.run()
|
|
}
|
|
}
|
|
|
|
pub fn from_tsv_string_to_value(
|
|
s: String,
|
|
headerless: bool,
|
|
tag: impl Into<Tag>,
|
|
) -> Result<Tagged<Value>, csv::Error> {
|
|
let mut reader = ReaderBuilder::new()
|
|
.has_headers(false)
|
|
.delimiter(b'\t')
|
|
.from_reader(s.as_bytes());
|
|
let tag = tag.into();
|
|
|
|
let mut fields: VecDeque<String> = VecDeque::new();
|
|
let mut iter = reader.records();
|
|
let mut rows = vec![];
|
|
|
|
if let Some(result) = iter.next() {
|
|
let line = result?;
|
|
|
|
for (idx, item) in line.iter().enumerate() {
|
|
if headerless {
|
|
fields.push_back(format!("Column{}", idx + 1));
|
|
} else {
|
|
fields.push_back(item.to_string());
|
|
}
|
|
}
|
|
}
|
|
|
|
loop {
|
|
if let Some(row_values) = iter.next() {
|
|
let row_values = row_values?;
|
|
|
|
let mut row = TaggedDictBuilder::new(&tag);
|
|
|
|
for (idx, entry) in row_values.iter().enumerate() {
|
|
row.insert_tagged(
|
|
fields.get(idx).unwrap(),
|
|
Value::Primitive(Primitive::String(String::from(entry))).tagged(&tag),
|
|
);
|
|
}
|
|
|
|
rows.push(row.into_tagged_value());
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
Ok(Value::Table(rows).tagged(&tag))
|
|
}
|
|
|
|
fn from_tsv(
|
|
FromTSVArgs {
|
|
headerless: skip_headers,
|
|
}: FromTSVArgs,
|
|
RunnableContext { input, name, .. }: RunnableContext,
|
|
) -> Result<OutputStream, ShellError> {
|
|
let name_tag = name;
|
|
|
|
let stream = async_stream! {
|
|
let values: Vec<Tagged<Value>> = input.values.collect().await;
|
|
|
|
let mut concat_string = String::new();
|
|
let mut latest_tag: Option<Tag> = None;
|
|
|
|
for value in values {
|
|
let value_tag = value.tag();
|
|
latest_tag = Some(value_tag.clone());
|
|
match value.item {
|
|
Value::Primitive(Primitive::String(s)) => {
|
|
concat_string.push_str(&s);
|
|
concat_string.push_str("\n");
|
|
}
|
|
_ => yield Err(ShellError::labeled_error_with_secondary(
|
|
"Expected a string from pipeline",
|
|
"requires string input",
|
|
&name_tag,
|
|
"value originates from here",
|
|
&value_tag,
|
|
)),
|
|
|
|
}
|
|
}
|
|
|
|
match from_tsv_string_to_value(concat_string, skip_headers, name_tag.clone()) {
|
|
Ok(x) => match x {
|
|
Tagged { item: Value::Table(list), .. } => {
|
|
for l in list {
|
|
yield ReturnSuccess::value(l);
|
|
}
|
|
}
|
|
x => yield ReturnSuccess::value(x),
|
|
},
|
|
Err(_) => if let Some(last_tag) = latest_tag {
|
|
yield Err(ShellError::labeled_error_with_secondary(
|
|
"Could not parse as TSV",
|
|
"input cannot be parsed as TSV",
|
|
&name_tag,
|
|
"value originates from here",
|
|
&last_tag,
|
|
))
|
|
} ,
|
|
}
|
|
};
|
|
|
|
Ok(stream.to_output_stream())
|
|
}
|