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

converted default formatting so single-digit hour times are 0-padded

Browse Source
This commit is contained in:
E.M. Gelblicht 2019-06-10 17:34:21 -07:00
parent 35bf32abb9
commit 1bf9e397e5
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1,3 +1,5 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.6.9" version = "0.6.9"

27
src/output/time.rs
View File

@ -122,17 +122,37 @@ impl DefaultFormat {
} }
} }
impl DefaultFormat { impl DefaultFormat {
fn is_recent(&self, date: LocalDateTime) -> bool { fn is_recent(&self, date: LocalDateTime) -> bool {
date.year() == self.current_year 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)] #[allow(trivial_numeric_casts)]
fn format_local(&self, time: Time) -> String { fn format_local(&self, time: Time) -> String {
let date = LocalDateTime::at(time.seconds as i64); let date = LocalDateTime::at(time.seconds as i64);
if self.is_recent(date) { 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 { else {
self.date_and_year.format(&date, &self.locale) self.date_and_year.format(&date, &self.locale)
@ -144,7 +164,9 @@ impl DefaultFormat {
let date = zone.to_zoned(LocalDateTime::at(time.seconds as i64)); let date = zone.to_zoned(LocalDateTime::at(time.seconds as i64));
if self.is_recent(date) { 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 { else {
self.date_and_year.format(&date, &self.locale) self.date_and_year.format(&date, &self.locale)
@ -153,6 +175,7 @@ impl DefaultFormat {
} }
#[allow(trivial_numeric_casts)] #[allow(trivial_numeric_casts)]
fn long_local(time: Time) -> String { fn long_local(time: Time) -> String {
let date = LocalDateTime::at(time.seconds as i64); let date = LocalDateTime::at(time.seconds as i64);