Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-26 11:55:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add no-infer flag to 'from xlsx' command

Browse source 
Signed-off-by: Alex Kattathra Johnson <alex.kattathra.johnson@gmail.com>
This commit is contained in:
Alex Kattathra Johnson 2025-01-02 15:17:45 -06:00
parent 0d3f76ddef
commit f48f56bb5c
No known key found for this signature in database
GPG key ID: 64BCC76905798553
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/nu-command/src/formats/from/xlsx.rs
View file

@ -17,6 +17,7 @@ impl Command for FromXlsx {
Signature::build("from xlsx") Signature::build("from xlsx")
.input_output_types(vec![(Type::Binary, Type::table())]) .input_output_types(vec![(Type::Binary, Type::table())])
.allow_variants_without_examples(true) .allow_variants_without_examples(true)
.switch("no-infer", "no field type inferencing", None)
.named( .named(
"sheets", "sheets",
SyntaxShape::List(Box::new(SyntaxShape::String)), SyntaxShape::List(Box::new(SyntaxShape::String)),
@ -47,8 +48,10 @@ impl Command for FromXlsx {
vec![] vec![]
}; };
let no_infer = call.has_flag(engine_state, stack, "no-infer")?;
let metadata = input.metadata().map(|md| md.with_content_type(None)); let metadata = input.metadata().map(|md| md.with_content_type(None));
from_xlsx(input, head, sel_sheets).map(|pd| pd.set_metadata(metadata)) from_xlsx(input, head, sel_sheets, no_infer).map(|pd| pd.set_metadata(metadata))
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
@ -114,6 +117,7 @@ fn from_xlsx(
input: PipelineData, input: PipelineData,
head: Span, head: Span,
sel_sheets: Vec<String>, sel_sheets: Vec<String>,
no_infer: bool,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let span = input.span(); let span = input.span();
let bytes = collect_binary(input, head)?; let bytes = collect_binary(input, head)?;
@ -146,21 +150,25 @@ fn from_xlsx(
.iter() .iter()
.enumerate() .enumerate()
.map(|(i, cell)| { .map(|(i, cell)| {
let value = match cell { let value = if no_infer {
Data::Empty => Value::nothing(head), Value::string(cell.as_string().unwrap_or_default(), head)
Data::String(s) => Value::string(s, head), } else {
Data::Float(f) => Value::float(*f, head), match cell {
Data::Int(i) => Value::int(*i, head), Data::Empty => Value::nothing(head),
Data::Bool(b) => Value::bool(*b, head), Data::String(s) => Value::string(s, head),
Data::DateTime(d) => d Data::Float(f) => Value::float(*f, head),
.as_datetime() Data::Int(i) => Value::int(*i, head),
.and_then(|d| match tz.from_local_datetime(&d) { Data::Bool(b) => Value::bool(*b, head),
LocalResult::Single(d) => Some(d), Data::DateTime(d) => d
_ => None, .as_datetime()
}) .and_then(|d| match tz.from_local_datetime(&d) {
.map(|d| Value::date(d, head)) LocalResult::Single(d) => Some(d),
.unwrap_or(Value::nothing(head)), _ => None,
_ => Value::nothing(head), })
.map(|d| Value::date(d, head))
.unwrap_or(Value::nothing(head)),
_ => Value::nothing(head),
}
}; };
(format!("column{i}"), value) (format!("column{i}"), value)