categulario
/
tiempo-rs
1
0
Fork 0
Code Issues 19 Pull Requests 1 Packages Projects Releases 14 Wiki Activity

abbreviated times

This commit is contained in:
Abraham Toriz 2021-07-03 15:53:56 -05:00
parent 94443e1656
commit 1170b39893
No known key found for this signature in database
GPG Key ID: D5B4A746DB5DD42A
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/timeparse.rs
View File

@ -231,5 +231,16 @@ mod tests {
time_diff(parse_time("an hour 10 minutes ago").unwrap(), Local::now() - Duration::minutes(1)); time_diff(parse_time("an hour 10 minutes ago").unwrap(), Local::now() - Duration::minutes(1));
time_diff(parse_time("2 hours five minutes ago").unwrap(), Local::now() - Duration::minutes(1)); time_diff(parse_time("2 hours five minutes ago").unwrap(), Local::now() - Duration::minutes(1));
time_diff(parse_time("an hour 12 minutes ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 12)); time_diff(parse_time("an hour 12 minutes ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 12));
// abbreviated
time_diff(parse_time("2hrs ago").unwrap(), Local::now() - Duration::hours(2));
time_diff(parse_time("10min ago").unwrap(), Local::now() - Duration::minutes(10));
time_diff(parse_time("1hr ago").unwrap(), Local::now() - Duration::hours(1));
time_diff(parse_time("1h ago").unwrap(), Local::now() - Duration::hours(1));
time_diff(parse_time("1h 5m ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 5));
time_diff(parse_time("1h5m ago").unwrap(), Local::now() - Duration::minutes(1 * 60 + 5));
time_diff(parse_time("a m ago").unwrap(), Local::now() - Duration::minutes(1));
time_diff(parse_time("an hr ago").unwrap(), Local::now() - Duration::hours(1));
time_diff(parse_time("a min ago").unwrap(), Local::now() - Duration::minutes(1));
} }
} }

4
src/timeparse/strings.rs
View File

@ -15,7 +15,7 @@ lazy_static! {
)| )|
(?P<htextualnum>\d+) (?P<htextualnum>\d+)
) )
\s+hours? (\s+)?h(ou)?(r)?s?
)? )?
(?P<sep>\s*(,|and)?\s+)? (?P<sep>\s*(,|and)?\s+)?
(?P<minute> (?P<minute>
@ -29,7 +29,7 @@ lazy_static! {
)| )|
(?P<mtextualnum>\d+) (?P<mtextualnum>\d+)
) )
\s+minutes? (\s+)?m(in)?(ute)?s?
)? )?
\s+ago \s+ago
").unwrap(); ").unwrap();