tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CalendarEvent: test and fix repeated values

This commit is contained in:
Dietmar Maurer 2020-05-16 07:43:51 +02:00
parent fed270bf3f
commit 99baf7afcc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tools/systemd/time.rs
View File

@ -75,7 +75,7 @@ impl DateTimeValue {
if value < *start { if value < *start {
set_next(*start); set_next(*start);
} else if *repetition > 0 { } else if *repetition > 0 {
set_next(((value - start + repetition) / repetition) * repetition); set_next(start + ((value - start + repetition) / repetition) * repetition);
} }
} }
} }
@ -262,7 +262,7 @@ pub fn compute_next_event(
if event.hour.iter().find(|hspec| hspec.contains(hour)).is_none() { if event.hour.iter().find(|hspec| hspec.contains(hour)).is_none() {
if let Some(n) = DateTimeValue::find_next(&event.hour, hour) { if let Some(n) = DateTimeValue::find_next(&event.hour, hour) {
// test next hour // test next hour
t.tm_sec = 0; t.tm_min = 0; t.tm_hour += n as libc::c_int; t.tm_sec = 0; t.tm_min = 0; t.tm_hour = n as libc::c_int;
wrap_time(&mut t); wrap_time(&mut t);
continue; continue;
} else { } else {
@ -280,7 +280,7 @@ pub fn compute_next_event(
if event.minute.iter().find(|hspec| hspec.contains(minute)).is_none() { if event.minute.iter().find(|hspec| hspec.contains(minute)).is_none() {
if let Some(n) = DateTimeValue::find_next(&event.minute, minute) { if let Some(n) = DateTimeValue::find_next(&event.minute, minute) {
// test next minute // test next minute
t.tm_sec = 0; t.tm_min += n as libc::c_int; t.tm_sec = 0; t.tm_min = n as libc::c_int;
wrap_time(&mut t); wrap_time(&mut t);
continue; continue;
} else { } else {
@ -353,6 +353,11 @@ mod test {
test_value("mon 2:*", THURSDAY_00_00, THURSDAY_00_00 + 4*DAY + 2*HOUR)?; test_value("mon 2:*", THURSDAY_00_00, THURSDAY_00_00 + 4*DAY + 2*HOUR)?;
test_value("mon 2:50", THURSDAY_00_00, THURSDAY_00_00 + 4*DAY + 2*HOUR + 50*MIN)?; test_value("mon 2:50", THURSDAY_00_00, THURSDAY_00_00 + 4*DAY + 2*HOUR + 50*MIN)?;
let n = test_value("5/2:0", THURSDAY_00_00, THURSDAY_00_00 + 5*HOUR)?;
let n = test_value("5/2:0", n, THURSDAY_00_00 + 7*HOUR)?;
let n = test_value("5/2:0", n, THURSDAY_00_00 + 9*HOUR)?;
test_value("5/2:0", n, THURSDAY_00_00 + 11*HOUR)?;
let mut n = test_value("*:*", THURSDAY_00_00, THURSDAY_00_00 + MIN)?; let mut n = test_value("*:*", THURSDAY_00_00, THURSDAY_00_00 + MIN)?;
for i in 2..100 { for i in 2..100 {
n = test_value("*:*", n, THURSDAY_00_00 + i*MIN)?; n = test_value("*:*", n, THURSDAY_00_00 + i*MIN)?;