From 25ff4642ec489755182003ea9b6801b91ca6a208 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 22 Mar 2020 17:33:14 +1000 Subject: [PATCH] accept now_mins_west for v2 legacy timing as well --- rslib/src/sched/cutoff.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rslib/src/sched/cutoff.rs b/rslib/src/sched/cutoff.rs index 8ba4de722..ba3ba484e 100644 --- a/rslib/src/sched/cutoff.rs +++ b/rslib/src/sched/cutoff.rs @@ -144,19 +144,18 @@ pub(crate) fn sched_timing_today( now_mins_west: Option, rollover_hour: Option, ) -> SchedTimingToday { + let now_west = now_mins_west.unwrap_or_else(|| local_minutes_west_for_stamp(now_secs)); match (rollover_hour, created_mins_west) { (None, _) => { // if rollover unset, v1 scheduler sched_timing_today_v1(created_secs, now_secs) } (Some(roll), None) => { - // if creation offset unset, v2 legacy cutoff using local timezone - let offset = local_minutes_west_for_stamp(now_secs); - sched_timing_today_v2_legacy(created_secs, roll, now_secs, offset) + // if creationOffset unset, v2 scheduler with legacy cutoff handling + sched_timing_today_v2_legacy(created_secs, roll, now_secs, now_west) } (Some(roll), Some(crt_west)) => { - // new cutoff code, using provided current timezone, falling back on local timezone - let now_west = now_mins_west.unwrap_or_else(|| local_minutes_west_for_stamp(now_secs)); + // v2 scheduler, new cutoff handling sched_timing_today_v2_new(created_secs, crt_west, now_secs, now_west, roll) } }