<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> This PR add date support when using the `open` command on a xlsx file, and the using `from xlsx` on a xlsx file. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> Currently dates in xlsx files are read as nulls, after this PR this would be regular dates. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
201 lines
6.0 KiB
Rust
201 lines
6.0 KiB
Rust
use calamine::*;
|
|
use chrono::offset::Utc;
|
|
use chrono::{Local, LocalResult, Offset, TimeZone};
|
|
use indexmap::map::IndexMap;
|
|
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,
|
|
};
|
|
use std::io::Cursor;
|
|
|
|
#[derive(Clone)]
|
|
pub struct FromXlsx;
|
|
|
|
impl Command for FromXlsx {
|
|
fn name(&self) -> &str {
|
|
"from xlsx"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("from xlsx")
|
|
.input_output_types(vec![(Type::Binary, Type::Table(vec![]))])
|
|
.allow_variants_without_examples(true)
|
|
.named(
|
|
"sheets",
|
|
SyntaxShape::List(Box::new(SyntaxShape::String)),
|
|
"Only convert specified sheets",
|
|
Some('s'),
|
|
)
|
|
.category(Category::Formats)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Parse binary Excel(.xlsx) data and create table."
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
|
|
let sel_sheets = if let Some(Value::List { vals: columns, .. }) =
|
|
call.get_flag(engine_state, stack, "sheets")?
|
|
{
|
|
convert_columns(columns.as_slice())?
|
|
} else {
|
|
vec![]
|
|
};
|
|
|
|
from_xlsx(input, head, sel_sheets)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Convert binary .xlsx data to a table",
|
|
example: "open --raw test.xlsx | from xlsx",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Convert binary .xlsx data to a table, specifying the tables",
|
|
example: "open --raw test.xlsx | from xlsx --sheets [Spreadsheet1]",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn convert_columns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
|
|
let res = columns
|
|
.iter()
|
|
.map(|value| match &value {
|
|
Value::String { val: s, .. } => Ok(s.clone()),
|
|
_ => Err(ShellError::IncompatibleParametersSingle {
|
|
msg: "Incorrect column format, Only string as column name".to_string(),
|
|
span: value.span(),
|
|
}),
|
|
})
|
|
.collect::<Result<Vec<String>, _>>()?;
|
|
|
|
Ok(res)
|
|
}
|
|
|
|
fn collect_binary(input: PipelineData, span: Span) -> Result<Vec<u8>, ShellError> {
|
|
let mut bytes = vec![];
|
|
let mut values = input.into_iter();
|
|
|
|
loop {
|
|
match values.next() {
|
|
Some(Value::Binary { val: b, .. }) => {
|
|
bytes.extend_from_slice(&b);
|
|
}
|
|
Some(x) => {
|
|
return Err(ShellError::UnsupportedInput {
|
|
msg: "Expected binary from pipeline".to_string(),
|
|
input: "value originates from here".into(),
|
|
msg_span: span,
|
|
input_span: x.span(),
|
|
})
|
|
}
|
|
None => break,
|
|
}
|
|
}
|
|
|
|
Ok(bytes)
|
|
}
|
|
|
|
fn from_xlsx(
|
|
input: PipelineData,
|
|
head: Span,
|
|
sel_sheets: Vec<String>,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let span = input.span();
|
|
let bytes = collect_binary(input, head)?;
|
|
let buf: Cursor<Vec<u8>> = Cursor::new(bytes);
|
|
let mut xlsx = Xlsx::<_>::new(buf).map_err(|_| ShellError::UnsupportedInput {
|
|
msg: "Could not load XLSX file".to_string(),
|
|
input: "value originates from here".into(),
|
|
msg_span: head,
|
|
input_span: span.unwrap_or(head),
|
|
})?;
|
|
|
|
let mut dict = IndexMap::new();
|
|
|
|
let mut sheet_names = xlsx.sheet_names();
|
|
if !sel_sheets.is_empty() {
|
|
sheet_names.retain(|e| sel_sheets.contains(e));
|
|
}
|
|
|
|
let tz = match Local.timestamp_opt(0, 0) {
|
|
LocalResult::Single(tz) => *tz.offset(),
|
|
_ => Utc.fix(),
|
|
};
|
|
|
|
for sheet_name in sheet_names {
|
|
let mut sheet_output = vec![];
|
|
|
|
if let Ok(current_sheet) = xlsx.worksheet_range(&sheet_name) {
|
|
for row in current_sheet.rows() {
|
|
let record = row
|
|
.iter()
|
|
.enumerate()
|
|
.map(|(i, cell)| {
|
|
let value = match cell {
|
|
Data::Empty => Value::nothing(head),
|
|
Data::String(s) => Value::string(s, head),
|
|
Data::Float(f) => Value::float(*f, head),
|
|
Data::Int(i) => Value::int(*i, head),
|
|
Data::Bool(b) => Value::bool(*b, head),
|
|
Data::DateTime(d) => d
|
|
.as_datetime()
|
|
.and_then(|d| match tz.from_local_datetime(&d) {
|
|
LocalResult::Single(d) => Some(d),
|
|
_ => None,
|
|
})
|
|
.map(|d| Value::date(d, head))
|
|
.unwrap_or(Value::nothing(head)),
|
|
_ => Value::nothing(head),
|
|
};
|
|
|
|
(format!("column{i}"), value)
|
|
})
|
|
.collect();
|
|
|
|
sheet_output.push(Value::record(record, head));
|
|
}
|
|
|
|
dict.insert(sheet_name, Value::list(sheet_output, head));
|
|
} else {
|
|
return Err(ShellError::UnsupportedInput {
|
|
msg: "Could not load sheet".to_string(),
|
|
input: "value originates from here".into(),
|
|
msg_span: head,
|
|
input_span: span.unwrap_or(head),
|
|
});
|
|
}
|
|
}
|
|
|
|
Ok(PipelineData::Value(
|
|
Value::record(dict.into_iter().collect(), head),
|
|
None,
|
|
))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(FromXlsx {})
|
|
}
|
|
}
|