RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 11:07:44 +00:00
Code Issues Activity

ls: cache recent time threshold in jiff implementation

Browse source
This commit is contained in:
Nicolas Boichat 2025-04-30 00:29:23 +08:00
parent fc947eca33
commit c599363242
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uu/ls/src/ls.rs
View file

@ -272,15 +272,15 @@ enum TimeStyle {
} }
/// Whether the given date is considered recent (i.e., in the last 6 months). /// Whether the given date is considered recent (i.e., in the last 6 months).
fn is_recent(time: Timestamp) -> bool { fn is_recent(time: Timestamp, state: &mut ListState) -> bool {
// According to GNU a Gregorian year has 365.2425 * 24 * 60 * 60 == 31556952 seconds on the average. // According to GNU a Gregorian year has 365.2425 * 24 * 60 * 60 == 31556952 seconds on the average.
time + Duration::new(31_556_952 / 2, 0) > Timestamp::now() time > state.recent_time_threshold
} }
impl TimeStyle { impl TimeStyle {
/// Format the given time according to this time format style. /// Format the given time according to this time format style.
fn format(&self, date: Zoned) -> String { fn format(&self, date: Zoned, state: &mut ListState) -> String {
let recent = is_recent(date.timestamp()); let recent = is_recent(date.timestamp(), state);
match (self, recent) { match (self, recent) {
(Self::FullIso, _) => date.strftime("%Y-%m-%d %H:%M:%S.%f %z").to_string(), (Self::FullIso, _) => date.strftime("%Y-%m-%d %H:%M:%S.%f %z").to_string(),
(Self::LongIso, _) => date.strftime("%Y-%m-%d %H:%M").to_string(), (Self::LongIso, _) => date.strftime("%Y-%m-%d %H:%M").to_string(),
@ -2056,6 +2056,7 @@ struct ListState<'a> {
uid_cache: HashMap<u32, String>, uid_cache: HashMap<u32, String>,
#[cfg(unix)] #[cfg(unix)]
gid_cache: HashMap<u32, String>, gid_cache: HashMap<u32, String>,
recent_time_threshold: Timestamp,
} }
#[allow(clippy::cognitive_complexity)] #[allow(clippy::cognitive_complexity)]
@ -2072,6 +2073,7 @@ pub fn list(locs: Vec<&Path>, config: &Config) -> UResult<()> {
uid_cache: HashMap::new(), uid_cache: HashMap::new(),
#[cfg(unix)] #[cfg(unix)]
gid_cache: HashMap::new(), gid_cache: HashMap::new(),
recent_time_threshold: Timestamp::now() - Duration::new(31_556_952 / 2, 0),
}; };
for loc in locs { for loc in locs {
@ -2867,7 +2869,7 @@ fn display_item_long(
}; };
output_display.extend(b" "); output_display.extend(b" ");
output_display.extend(display_date(md, config).as_bytes()); output_display.extend(display_date(md, config, state).as_bytes());
output_display.extend(b" "); output_display.extend(b" ");
let item_name = display_item_name( let item_name = display_item_name(
@ -3071,9 +3073,9 @@ fn get_time(md: &Metadata, config: &Config) -> Option<Zoned> {
time.try_into().ok() time.try_into().ok()
} }
fn display_date(metadata: &Metadata, config: &Config) -> String { fn display_date(metadata: &Metadata, config: &Config, state: &mut ListState) -> String {
match get_time(metadata, config) { match get_time(metadata, config) {
Some(time) => config.time_style.format(time), Some(time) => config.time_style.format(time, state),
None => "???".into(), None => "???".into(),
} }
} }