GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

accept now_mins_west for v2 legacy timing as well

Browse source
This commit is contained in:
Damien Elmes 2020-03-22 17:33:14 +10:00
parent 6c6817563e
commit 25ff4642ec
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rslib/src/sched/cutoff.rs
View file

@ -144,19 +144,18 @@ pub(crate) fn sched_timing_today(
now_mins_west: Option<i32>, now_mins_west: Option<i32>,
rollover_hour: Option<i8>, rollover_hour: Option<i8>,
) -> SchedTimingToday { ) -> SchedTimingToday {
let now_west = now_mins_west.unwrap_or_else(|| local_minutes_west_for_stamp(now_secs));
match (rollover_hour, created_mins_west) { match (rollover_hour, created_mins_west) {
(None, _) => { (None, _) => {
// if rollover unset, v1 scheduler // if rollover unset, v1 scheduler
sched_timing_today_v1(created_secs, now_secs) sched_timing_today_v1(created_secs, now_secs)
} }
(Some(roll), None) => { (Some(roll), None) => {
// if creation offset unset, v2 legacy cutoff using local timezone // if creationOffset unset, v2 scheduler with legacy cutoff handling
let offset = local_minutes_west_for_stamp(now_secs); sched_timing_today_v2_legacy(created_secs, roll, now_secs, now_west)
sched_timing_today_v2_legacy(created_secs, roll, now_secs, offset)
} }
(Some(roll), Some(crt_west)) => { (Some(roll), Some(crt_west)) => {
// new cutoff code, using provided current timezone, falling back on local timezone // v2 scheduler, new cutoff handling
let now_west = now_mins_west.unwrap_or_else(|| local_minutes_west_for_stamp(now_secs));
sched_timing_today_v2_new(created_secs, crt_west, now_secs, now_west, roll) sched_timing_today_v2_new(created_secs, crt_west, now_secs, now_west, roll)
} }
} }