utilities/eza
utilities/eza
1
0
Fork 0
mirror of https://github.com/eza-community/eza synced 2024-07-03 08:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: change the criteria for "recent" timestamp

Browse Source 
The current criteria is to compare the year of a `DateTime` object (not so sure
how timezone is gonna play here just from reading the docs) to a runtime
calculated current year (under the local timezone).

This commit changes the criteria to "less than six months old" + "not dated in
the future".
This commit is contained in:
SPQV MF 2023-10-28 05:14:39 +08:00
parent 9df7dc69c3
commit 7915437106
No known key found for this signature in database
GPG Key ID: DBB482A68818CCC2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/time.rs
View File

@ -1,6 +1,7 @@
//! Timestamp formatting.
use chrono::prelude::*;
use chrono::Duration as OldDuration;
use core::cmp::max;
use once_cell::sync::Lazy;
use std::time::Duration;
@ -67,7 +68,7 @@ impl TimeFormat {
fn default(time: &DateTime<FixedOffset>) -> String {
let month = &*LOCALE.short_month_name(time.month0() as usize);
let month_width = short_month_padding(*MAX_MONTH_WIDTH, month);
let format = if time.year() == *CURRENT_YEAR {
let format = if is_recent(time) {
format!("%_d {month:<month_width$} %H:%M")
} else {
format!("%_d {month:<month_width$} %Y")
@ -87,7 +88,7 @@ fn short_month_padding(max_month_width: usize, month: &str) -> usize {
}
fn iso(time: &DateTime<FixedOffset>) -> String {
if time.year() == *CURRENT_YEAR {
if is_recent(time) {
time.format("%m-%d %H:%M").to_string()
} else {
time.format("%Y-%m-%d").to_string()
@ -119,7 +120,19 @@ fn custom(time: &DateTime<FixedOffset>, fmt: &str) -> String {
time.format(fmt).to_string()
}
static CURRENT_YEAR: Lazy<i32> = Lazy::new(|| Local::now().year());
/// A timestamp is considered to be recent if it is less than six months old,
/// and is not dated in the future.
///
/// From: GNU coreutils manual
/// [Formatting file timestamps](https://www.gnu.org/software/coreutils/manual/html_node/Formatting-file-timestamps.html)
fn is_recent<Tz: TimeZone>(time: &DateTime<Tz>) -> bool {
(time <= &*CURRENT_TIME) && (CURRENT_TIME.signed_duration_since(time) < *RECENT_DURATION)
}
// six months
// TODO: migrate to the std Duration after chrono does it
static RECENT_DURATION: Lazy<OldDuration> = Lazy::new(|| OldDuration::days(30 * 6));
static CURRENT_TIME: Lazy<DateTime<Local>> = Lazy::new(Local::now);
static LOCALE: Lazy<locale::Time> =
Lazy::new(|| locale::Time::load_user_locale().unwrap_or_else(|_| locale::Time::english()));