Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-22 20:15:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #509 from emgelb/master

Browse Source 
Convert default formatting so single-digit hour times are 0-padded
This commit is contained in:
Benjamin Sago 2020-01-19 00:05:07 +00:00 committed by GitHub
commit e198cac3a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/output/time.rs
View File

@ -122,17 +122,37 @@ impl DefaultFormat {
}
}
impl DefaultFormat {
fn is_recent(&self, date: LocalDateTime) -> bool {
date.year() == self.current_year
}
fn month_to_abbrev(month: datetime::Month) -> &'static str {
match month {
datetime::Month::January => "Jan",
datetime::Month::February => "Feb",
datetime::Month::March => "Mar",
datetime::Month::April => "Apr",
datetime::Month::May => "May",
datetime::Month::June => "Jun",
datetime::Month::July => "Jul",
datetime::Month::August => "August",
datetime::Month::September => "Sep",
datetime::Month::October => "Oct",
datetime::Month::November => "Nov",
datetime::Month::December => "Dec",
}
}
#[allow(trivial_numeric_casts)]
fn format_local(&self, time: Duration) -> String {
let date = LocalDateTime::at(time.as_secs() as i64);
if self.is_recent(date) {
self.date_and_time.format(&date, &self.locale)
format!("{:2} {} {:02}:{:02}",
date.day(), DefaultFormat::month_to_abbrev(date.month()),
date.hour(), date.minute())
}
else {
self.date_and_year.format(&date, &self.locale)
@ -144,7 +164,9 @@ impl DefaultFormat {
let date = zone.to_zoned(LocalDateTime::at(time.as_secs() as i64));
if self.is_recent(date) {
self.date_and_time.format(&date, &self.locale)
format!("{:2} {} {:02}:{:02}",
date.day(), DefaultFormat::month_to_abbrev(date.month()),
date.hour(), date.minute())
}
else {
self.date_and_year.format(&date, &self.locale)
@ -153,6 +175,7 @@ impl DefaultFormat {
}
#[allow(trivial_numeric_casts)]
fn long_local(time: Duration) -> String {
let date = LocalDateTime::at(time.as_secs() as i64);