extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-15 08:48:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: fallback to rfc3339 instead of rfc2822 for nagative years

Browse Source
This commit is contained in:
Loïc Riegel 2025-04-11 18:04:24 +02:00
parent 74b1bfff30
commit a007cab99a
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-command/src/formats/to/text.rs
View File

@ -1,3 +1,4 @@
use chrono::Datelike;
use chrono_humanize::HumanTime;
use nu_engine::command_prelude::*;
use nu_protocol::{format_duration, shell_error::io::IoError, ByteStream, PipelineMetadata};
@ -167,7 +168,17 @@ fn local_into_string(
Value::Filesize { val, .. } => val.to_string(),
Value::Duration { val, .. } => format_duration(val),
Value::Date { val, .. } => {
format!("{} ({})", val.to_rfc2822(), HumanTime::from(val))
format!(
"{} ({})",
{
if val.year() >= 0 {
val.to_rfc2822()
} else {
val.to_rfc3339()
}
},
HumanTime::from(val)
)
}
Value::Range { val, .. } => val.to_string(),
Value::String { val, .. } => val,

24
crates/nu-command/src/strings/format/date.rs
View File

@ -1,5 +1,5 @@
use crate::{generate_strftime_list, parse_date_from_string};
use chrono::{DateTime, Locale, TimeZone};
use chrono::{DateTime, Datelike, Locale, TimeZone};
use nu_engine::command_prelude::*;
use nu_utils::locale::{get_system_locale_string, LOCALE_OVERRIDE_ENV_VAR};
@ -228,11 +228,29 @@ fn format_helper(
fn format_helper_rfc2822(value: Value, span: Span) -> Value {
let val_span = value.span();
match value {
Value::Date { val, .. } => Value::string(val.to_rfc2822(), span),
Value::Date { val, .. } => Value::string(
{
if val.year() >= 0 {
val.to_rfc2822()
} else {
val.to_rfc3339()
}
},
span,
),
Value::String { val, .. } => {
let dt = parse_date_from_string(&val, val_span);
match dt {
Ok(x) => Value::string(x.to_rfc2822(), span),
Ok(x) => Value::string(
{
if x.year() >= 0 {
x.to_rfc2822()
} else {
x.to_rfc3339()
}
},
span,
),
Err(e) => e,
}
}