diff options
author | Lars Henriksen <LarsHenriksen@get2net.dk> | 2019-08-14 23:32:45 +0200 |
---|---|---|
committer | Lukas Fleischer <lfleischer@calcurse.org> | 2019-09-06 18:15:36 -0400 |
commit | 2ae30b223ecf79f92bf81af934c40dd645be274c (patch) | |
tree | 673e6eef845cc4de637063cac0b7c77705ed5426 /src/recur.c | |
parent | b0ba01d2a7ef7d66b2ea95cdaa6e652015cbfc72 (diff) | |
download | calcurse-2ae30b223ecf79f92bf81af934c40dd645be274c.tar.gz calcurse-2ae30b223ecf79f92bf81af934c40dd645be274c.zip |
Set time-of-day consistently to midnight for until day
A day begins on midnight (inclusive) and ends on midnight (exclusive). A
day as a whole is represented by the initial midnight, i.e. time-of-day
is 00:00.
On load of recurrent appointments (but not events) time-of-day for the
until day is set to 23:59. For a newly created recurrent appointment the
setting depends on the input method: time-of-day is set to 00:00 if
until day is given as a date (day, month and year), but to time-of-day
for the start day if given as an offset (+dd).
The resulting behaviour is only visible in interactive use of calcurse
as proved by the following scenario.
1) Create an appointment with start time 12:00, end time 11:59 (multi
day).
2) Turn it into a recurrent appointment of type daily, frequency 3,
until day +3.
The appointment is correctly displayed with two 2-day occurrences three
days apart.
3) Edit the appointment and select Repetition. Accept existing type,
frequency and end day (now as a date).
The second day of the second occurrence disappears.
4) Repeat 3), but set the end day as an offset (+3).
The second day of the second occurrence reappears.
The inconsistencies have been eliminated, and time-of-day for the until
day is now always 00:00.
Also, until day may equal start day, so midnights should be compared.
Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
Diffstat (limited to 'src/recur.c')
-rw-r--r-- | src/recur.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/recur.c b/src/recur.c index 1fd01ad..d424bca 100644 --- a/src/recur.c +++ b/src/recur.c @@ -433,8 +433,8 @@ struct recur_apoint *recur_apoint_scan(FILE * f, struct tm start, tend = mktime(&end); if (until.tm_year != 0) { - until.tm_hour = 23; - until.tm_min = 59; + until.tm_hour = 0; + until.tm_min = 0; until.tm_sec = 0; until.tm_isdst = -1; until.tm_year -= 1900; @@ -768,7 +768,8 @@ recur_item_find_occurrence(time_t item_start, long item_dur, if (date_cmp_day(day_start, item_start) < 0) return 0; - if (rpt_until != 0 && day_start >= rpt_until + item_dur) + if (rpt_until != 0 && day_start >= rpt_until + + (item_start - update_time_in_date(item_start, 0, 0)) + item_dur) return 0; t = day_start; @@ -834,7 +835,7 @@ recur_item_find_occurrence(time_t item_start, long item_dur, if (LLIST_FIND_FIRST(item_exc, &t, exc_inday)) return 0; - if (rpt_until != 0 && t > rpt_until) + if (rpt_until != 0 && t >= NEXTDAY(rpt_until)) return 0; localtime_r(&t, <_item_day); |