fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gracefully handle all day events in iCal imports

Browse Source 
Do not create two events when importing an event that lasts an entire
day.

Reported-by: Jörn Tillmanns <tillmanns@tuxzone.org>
Reported-by: Håkan Jerning <jerning@home.se>
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2014-08-18 12:16:42 +02:00
parent bcc820ea74
commit f3fe3c818c
3 changed files with 74 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ical.c
View File

@@ -302,19 +302,32 @@ ical_store_event(char *mesg, char *note, long day, long end,
recur_event_new(mesg, note, day, EVENTID, rpt->type,
rpt->freq, rpt->until, exc);
mem_free(rpt);
} else if (end && end != day) {
/* Here we have an event that spans over several days. */
rpt = mem_malloc(sizeof(ical_rpt_t));
rpt->type = RECUR_DAILY;
rpt->freq = 1;
rpt->count = 0;
rpt->until = end;
recur_event_new(mesg, note, day, EVENTID, rpt->type,
rpt->freq, rpt->until, exc);
mem_free(rpt);
} else {
event_new(mesg, note, day, EVENTID);
goto cleanup;
}
if (end == 0 || end - day <= DAYINSEC) {
event_new(mesg, note, day, EVENTID);
goto cleanup;
}
/*
* Here we have an event that spans over several days.
*
* In iCal, the end specifies when the event is supposed to end, in
* calcurse, the end specifies the time that the last occurrence of the
* event starts, so we need to do some conversion here.
*/
end = day + ((end - day - 1) / DAYINSEC) * DAYINSEC;
rpt = mem_malloc(sizeof(ical_rpt_t));
rpt->type = RECUR_DAILY;
rpt->freq = 1;
rpt->count = 0;
rpt->until = end;
recur_event_new(mesg, note, day, EVENTID, rpt->type,
rpt->freq, rpt->until, exc);
mem_free(rpt);
cleanup:
mem_free(mesg);
erase_note(&note);
}