handle datetimes correctly in xlsx

uiua-lang · Jan 4, 2025 · 57fd7cc · 57fd7cc
1 parent ca381c5
commit 57fd7cc
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,7 +70,7 @@ serde_yaml = {version = "0.9.33", optional = true}
 
 # Feature dependencies
 arboard = {version = "3", optional = true}
-calamine = {version = "0.24.0", optional = true}
+calamine = {version = "0.26.1", optional = true}
 color_quant = {version = "1.1", optional = true}
 cosmic-text = {version = "0.12.1", optional = true}
 csv = {version = "1", optional = true}

diff --git a/src/algorithm/monadic.rs b/src/algorithm/monadic.rs
@@ -2245,9 +2245,11 @@ impl Value {
                                 &Data::Float(f) => f.into(),
                                 Data::String(s) => s.clone().into(),
                                 &Data::Bool(b) => b.into(),
-                                Data::DateTime(dt) => dt.to_string().into(),
-                                Data::DateTimeIso(dt) => dt.to_string().into(),
-                                Data::DurationIso(dur) => dur.to_string().into(),
+                                Data::DateTime(dt) => {
+                                    ((dt.as_f64() - 2.0) * 24.0 * 60.0 * 60.0 - 2208988800.0).into()
+                                }
+                                Data::DateTimeIso(dt) => dt.clone().into(),
+                                Data::DurationIso(dur) => dur.clone().into(),
                                 Data::Error(e) => e.to_string().into(),
                                 Data::Empty => String::new().into(),
                             }));