Add date support in from xlsx (#11952)

<!--
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.
-->
This commit is contained in:
nils-degroot
2024-02-24 14:25:51 +01:00
committed by GitHub
parent 6be91a68f3
commit 67a63162b2
4 changed files with 33 additions and 2 deletions

View File

@ -1,4 +1,6 @@
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;
@ -130,6 +132,11 @@ fn from_xlsx(
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![];
@ -145,6 +152,14 @@ fn from_xlsx(
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),
};