Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 21:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implements --headerless for from-csv

Browse source
This commit is contained in:
Thomas Hartmann 2019-11-11 12:01:21 +01:00
parent a3ff5f1246
commit 282cb46ff1
1 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/commands/from_csv.rs
View file

@ -27,7 +27,7 @@ impl WholeStreamCommand for FromCSV {
} }
fn usage(&self) -> &str { fn usage(&self) -> &str {
"Parse text as .csv and create table" "Parse text as .csv and create table."
} }
fn run( fn run(
@ -46,44 +46,29 @@ pub fn from_csv_string_to_value(
tag: impl Into<Tag>, tag: impl Into<Tag>,
) -> Result<Tagged<Value>, csv::Error> { ) -> Result<Tagged<Value>, csv::Error> {
let mut reader = ReaderBuilder::new() let mut reader = ReaderBuilder::new()
.has_headers(false) .has_headers(!headerless)
.delimiter(separator as u8) .delimiter(separator as u8)
.from_reader(s.as_bytes()); .from_reader(s.as_bytes());
let tag = tag.into(); let tag = tag.into();
let mut fields: VecDeque<String> = VecDeque::new(); let headers = if headerless {
let mut iter = reader.records(); (1..=reader.headers()?.len())
.map(|i| format!("Column{}", i))
.collect::<Vec<String>>()
} else {
reader.headers()?.iter().map(String::from).collect()
};
let mut rows = vec![]; let mut rows = vec![];
for row in reader.records() {
if let Some(result) = iter.next() { let mut tagged_row = TaggedDictBuilder::new(&tag);
let line = result?; for (value, header) in row?.iter().zip(headers.iter()) {
tagged_row.insert_tagged(
for (idx, item) in line.iter().enumerate() { header,
if headerless { Value::Primitive(Primitive::String(String::from(value))).tagged(&tag),
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.clone());
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;
} }
rows.push(tagged_row.into_tagged_value());
} }
Ok(Value::Table(rows).tagged(&tag)) Ok(Value::Table(rows).tagged(&tag))
@ -91,7 +76,7 @@ pub fn from_csv_string_to_value(
fn from_csv( fn from_csv(
FromCSVArgs { FromCSVArgs {
headerless: skip_headers, headerless,
separator, separator,
}: FromCSVArgs, }: FromCSVArgs,
RunnableContext { input, name, .. }: RunnableContext, RunnableContext { input, name, .. }: RunnableContext,
@ -141,7 +126,7 @@ fn from_csv(
} }
} }
match from_csv_string_to_value(concat_string, skip_headers, sep, name_tag.clone()) { match from_csv_string_to_value(concat_string, headerless, sep, name_tag.clone()) {
Ok(x) => match x { Ok(x) => match x {
Tagged { item: Value::Table(list), .. } => { Tagged { item: Value::Table(list), .. } => {
for l in list { for l in list {