Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 14:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

make duration pretty print clearer (#2150)

Browse source 
* make duration pretty print clearer

* fix typo and tests

* fix typo and tests
This commit is contained in:
Jonathan Turner 2020-07-10 14:06:52 -07:00 committed by GitHub
parent f32ab696d3
commit 6820d70e7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2643,6 +2643,7 @@ dependencies = [
"nu-errors", "nu-errors",
"nu-source", "nu-source",
"num-bigint", "num-bigint",
"num-integer",
"num-traits 0.2.12", "num-traits 0.2.12",
"query_interface", "query_interface",
"serde 1.0.114", "serde 1.0.114",
@ -2820,6 +2821,7 @@ dependencies = [
"nu-plugin", "nu-plugin",
"nu-protocol", "nu-protocol",
"nu-source", "nu-source",
"num-bigint",
] ]
[[package]] [[package]]

6
crates/nu-cli/tests/commands/math/mod.rs
View file

@ -168,7 +168,7 @@ fn duration_math() {
"# "#
)); ));
assert_eq!(actual.out, "8:00:00:00.0"); assert_eq!(actual.out, "8d");
} }
#[test] #[test]
@ -180,7 +180,7 @@ fn duration_math_with_nanoseconds() {
"# "#
)); ));
assert_eq!(actual.out, "7:00:00:00.00000001"); assert_eq!(actual.out, "7d 10ns");
} }
#[test] #[test]
@ -192,7 +192,7 @@ fn duration_math_with_negative() {
"# "#
)); ));
assert_eq!(actual.out, "-6:00:00:00.0"); assert_eq!(actual.out, "-6d");
} }
#[test] #[test]

60
crates/nu-protocol/src/value/primitive.rs
View file

@ -368,32 +368,42 @@ pub fn format_duration(duration: &BigInt) -> String {
let (mins, secs): (BigInt, BigInt) = secs.div_rem(&big_int_60); let (mins, secs): (BigInt, BigInt) = secs.div_rem(&big_int_60);
let (hours, mins): (BigInt, BigInt) = mins.div_rem(&big_int_60); let (hours, mins): (BigInt, BigInt) = mins.div_rem(&big_int_60);
let (days, hours): (BigInt, BigInt) = hours.div_rem(&big_int_24); let (days, hours): (BigInt, BigInt) = hours.div_rem(&big_int_24);
let decimals = if millis.is_zero() && micros.is_zero() && nanos.is_zero() {
String::from("0") let mut output_prep = vec![];
} else {
format!("{:03}{:03}{:03}", millis, micros, nanos) if !days.is_zero() {
.trim_end_matches('0') output_prep.push(format!("{}d", days));
.to_string()
};
match (
days.is_zero(),
hours.is_zero(),
mins.is_zero(),
secs.is_zero(),
) {
(true, true, true, true) => format!("{}.{}", if sign == 1 { "0" } else { "-0" }, decimals),
(true, true, true, _) => format!("{}.{}", sign * secs, decimals),
(true, true, _, _) => format!("{}:{:02}.{}", sign * mins, secs, decimals),
(true, _, _, _) => format!("{}:{:02}:{:02}.{}", sign * hours, mins, secs, decimals),
_ => format!(
"{}:{:02}:{:02}:{:02}.{}",
sign * days,
hours,
mins,
secs,
decimals
),
} }
if !hours.is_zero() {
output_prep.push(format!("{}h", hours));
}
if !mins.is_zero() {
output_prep.push(format!("{}m", mins));
}
if !secs.is_zero() {
output_prep.push(format!("{}s", secs));
}
if !millis.is_zero() {
output_prep.push(format!("{}ms", millis));
}
if !micros.is_zero() {
output_prep.push(format!("{}us", micros));
}
if !nanos.is_zero() {
output_prep.push(format!("{}ns", nanos));
}
format!(
"{}{}",
if sign == -1 { "-" } else { "" },
output_prep.join(" ")
)
} }
#[allow(clippy::cognitive_complexity)] #[allow(clippy::cognitive_complexity)]