Continuation of #8229 # Description The `ShellError` enum at the moment is kind of messy. Many variants are basic tuple structs where you always have to reference the implementation with its macro invocation to know which field serves which purpose. Furthermore we have both variants that are kind of redundant or either overly broad to be useful for the user to match on or overly specific with few uses. So I set out to start fixing the lacking documentation and naming to make it feasible to critically review the individual usages and fix those. Furthermore we can decide to join or split up variants that don't seem to be fit for purpose. **Everyone:** Feel free to add review comments if you spot inconsistent use of `ShellError` variants. - Name fields of `SE::IncorrectValue` - Merge and name fields on `SE::TypeMismatch` - Name fields on `SE::UnsupportedOperator` - Name fields on `AssignmentRequires*` and fix doc - Name fields on `SE::UnknownOperator` - Name fields on `SE::MissingParameter` - Name fields on `SE::DelimiterError` - Name fields on `SE::IncompatibleParametersSingle` # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far)
154 lines
4.8 KiB
Rust
154 lines
4.8 KiB
Rust
use super::delimited::{from_delimited_data, trim_from_str};
|
|
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct FromCsv;
|
|
|
|
impl Command for FromCsv {
|
|
fn name(&self) -> &str {
|
|
"from csv"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from csv")
|
|
.input_output_types(vec![(Type::String, Type::Table(vec![]))])
|
|
.named(
|
|
"separator",
|
|
SyntaxShape::String,
|
|
"a character to separate columns, defaults to ','",
|
|
Some('s'),
|
|
)
|
|
.switch(
|
|
"noheaders",
|
|
"don't treat the first row as column names",
|
|
Some('n'),
|
|
)
|
|
.switch("no-infer", "no field type inferencing", None)
|
|
.named(
|
|
"trim",
|
|
SyntaxShape::String,
|
|
"drop leading and trailing whitespaces around headers names and/or field values",
|
|
Some('t'),
|
|
)
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse text as .csv and create table."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
from_csv(engine_state, stack, call, input)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Convert comma-separated data to a table",
|
|
example: "\"ColA,ColB\n1,2\" | from csv",
|
|
result: Some(Value::List {
|
|
vals: vec![Value::Record {
|
|
cols: vec!["ColA".to_string(), "ColB".to_string()],
|
|
vals: vec![
|
|
Value::test_int(1),
|
|
Value::test_int(2),
|
|
],
|
|
span: Span::test_data(),
|
|
}],
|
|
span: Span::test_data(),
|
|
})
|
|
},
|
|
Example {
|
|
description: "Convert comma-separated data to a table, ignoring headers",
|
|
example: "open data.txt | from csv --noheaders",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert comma-separated data to a table, ignoring headers",
|
|
example: "open data.txt | from csv -n",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert semicolon-separated data to a table",
|
|
example: "open data.txt | from csv --separator ';'",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert semicolon-separated data to a table, dropping all possible whitespaces around header names and field values",
|
|
example: "open data.txt | from csv --trim all",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert semicolon-separated data to a table, dropping all possible whitespaces around header names",
|
|
example: "open data.txt | from csv --trim headers",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert semicolon-separated data to a table, dropping all possible whitespaces around field values",
|
|
example: "open data.txt | from csv --trim fields",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn from_csv(
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let name = call.head;
|
|
|
|
let no_infer = call.has_flag("no-infer");
|
|
let noheaders = call.has_flag("noheaders");
|
|
let separator: Option<Value> = call.get_flag(engine_state, stack, "separator")?;
|
|
let trim: Option<Value> = call.get_flag(engine_state, stack, "trim")?;
|
|
|
|
let sep = match separator {
|
|
Some(Value::String { val: s, span }) => {
|
|
if s == r"\t" {
|
|
'\t'
|
|
} else {
|
|
let vec_s: Vec<char> = s.chars().collect();
|
|
if vec_s.len() != 1 {
|
|
return Err(ShellError::MissingParameter {
|
|
param_name: "single character separator".into(),
|
|
span,
|
|
});
|
|
};
|
|
vec_s[0]
|
|
}
|
|
}
|
|
_ => ',',
|
|
};
|
|
|
|
let trim = trim_from_str(trim)?;
|
|
|
|
from_delimited_data(noheaders, no_infer, sep, trim, input, name)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(FromCsv {})
|
|
}
|
|
}
|