PlexSheep/crock
Archived
1
0
Fork 0
generated from PlexSheep/rs-base
Code Issues 7 Pull requests Projects Releases 9 Packages 1 Wiki Activity

support H:M format in countdown

Browse source
This commit is contained in:
race604 2022-08-31 09:53:54 +08:00
parent 12150375cb
commit f3e58a635d
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/app.rs
View file

@ -272,6 +272,12 @@ fn parse_datetime(s: &str) -> Result<DateTime<Local>, String> {
let s = s.trim(); let s = s.trim();
let today = Local::today(); let today = Local::today();
let time = NaiveTime::parse_from_str(s, "%H:%M");
if time.is_ok() {
let time = NaiveDateTime::new(today.naive_local(), time.unwrap());
return Ok(Local.from_local_datetime(&time).unwrap());
}
let time = NaiveTime::parse_from_str(s, "%H:%M:%S"); let time = NaiveTime::parse_from_str(s, "%H:%M:%S");
if time.is_ok() { if time.is_ok() {
let time = NaiveDateTime::new(today.naive_local(), time.unwrap()); let time = NaiveDateTime::new(today.naive_local(), time.unwrap());

7
src/app/modes.rs
View file

@ -47,9 +47,6 @@ fn format_duration(duration: Duration, format: DurationFormat) -> String {
} }
} }
if is_neg {
result.push('-');
}
if days > 0 { if days > 0 {
let _ = write!(result, "{}:", days); let _ = write!(result, "{}:", days);
} }
@ -59,6 +56,10 @@ fn format_duration(duration: Duration, format: DurationFormat) -> String {
} }
append_number(&mut result, minutes % 60); append_number(&mut result, minutes % 60);
result.push(':'); result.push(':');
if is_neg {
result.insert(0, '-');
}
match format { match format {
DurationFormat::HourMinSecDeci => { DurationFormat::HourMinSecDeci => {
let _ = write!(result, "{:02}.{}", seconds % 60, (millis % 1000) / 100); let _ = write!(result, "{:02}.{}", seconds % 60, (millis % 1000) / 100);