extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-03-26 07:19:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return Err(ShellError...) instead of panic, yield each row instead of entire table

Browse Source
This commit is contained in:
Sam Hedin 2020-03-28 16:22:00 +01:00
parent 265cd8028a
commit ac1ef302ad
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-cli/src/commands/headers.rs
View File

@ -40,18 +40,18 @@ pub fn headers(
//the headers are the first row in the table
let headers: Vec<String> = match &rows[0].value {
UntaggedValue::Row(d) => {
d.entries.iter().map(|(_, v)| {
Ok(d.entries.iter().map(|(_, v)| {
match v.as_string() {
Ok(s) => s,
Err(_) => String::from("empty-header") //If a cell that should contain a header name is empty, we need to fill it with something.
Err(_) => String::from("empty-header") //If a cell that should contain a header name is empty, we need to fill it with something. TODO: Add indexing to differintate between headers
}
}).collect()
}).collect())
}
_ => panic!("Could not find headers")
};
_ => Err(ShellError::untagged_runtime_error("Couldn't find all headers, was the input a properly formatted table?")),
}?;
//Each row is a dictionary with the headers as keys
let newrows: Vec<Value> = rows.iter().skip(1).map(|r| {
for r in rows.iter().skip(1) {
match &r.value {
UntaggedValue::Row(d) => {
@ -62,13 +62,11 @@ pub fn headers(
i += 1;
}
UntaggedValue::Row(Dictionary{entries}).into_value(r.tag.clone())
yield Ok(ReturnSuccess::Value(UntaggedValue::Row(Dictionary{entries}).into_value(r.tag.clone())))
}
_ => panic!("Row value was not an UntaggedValue::Row")
_ => yield Err(ShellError::untagged_runtime_error("Couldn't iterate through rows, was the input a properly formatted table?"))
}
}).collect();
yield ReturnSuccess::value(UntaggedValue::table(&newrows).into_value(name))
}
};
Ok(stream.to_output_stream())