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

Support for ical import of events which spans over several days added (thanks Andreas for reporting the bug).

Browse Source
This commit is contained in:
Frederic Culot 2009-07-05 19:37:34 +00:00
parent fb68568c04
commit e3d2e58b67
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
* README: Erik Saule added to the list of contributors * README: Erik Saule added to the list of contributors
* src/calcurse.1: manpage updated with the -S flag description * src/calcurse.1: manpage updated with the -S flag description
* src/io.c (ical_store_event): Support for events which spans
over several days added (thanks Andreas for reporting the bug)
2009-06-28 Frederic Culot <frederic@culot.org> 2009-06-28 Frederic Culot <frederic@culot.org>

31
src/io.c
View File

@ -1,4 +1,4 @@
/* $calcurse: io.c,v 1.64 2009/06/28 09:53:17 culot Exp $ */ /* $calcurse: io.c,v 1.65 2009/07/05 19:37:34 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -1658,17 +1658,29 @@ ical_store_todo (int priority, char *mesg, char *note)
} }
static void static void
ical_store_event (char *mesg, char *note, long day, ical_rpt_t *rpt, ical_store_event (char *mesg, char *note, long day, long end, ical_rpt_t *rpt,
days_t *exc) days_t *exc)
{ {
const int EVENTID = 1; const int EVENTID = 1;
if (rpt != NULL) if (rpt)
{ {
recur_event_new (mesg, note, day, EVENTID, rpt->type, rpt->freq, recur_event_new (mesg, note, day, EVENTID, rpt->type, rpt->freq,
rpt->until, &exc); rpt->until, &exc);
mem_free (rpt); 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 else
{ {
event_new (mesg, note, day, EVENTID); event_new (mesg, note, day, EVENTID);
@ -2387,9 +2399,10 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints,
else if (vevent.start == vevent.end) else if (vevent.start == vevent.end)
{ {
vevent_type = EVENT; vevent_type = EVENT;
vevent.end = 0L;
ical_store_event (vevent.mesg, vevent.note, ical_store_event (vevent.mesg, vevent.note,
vevent.start, vevent.rpt, vevent.start, vevent.end,
vevent.exc); vevent.rpt, vevent.exc);
(*noevents)++; (*noevents)++;
return; return;
} }
@ -2410,8 +2423,14 @@ ical_read_event (FILE *fdi, FILE *log, unsigned *noevents, unsigned *noapoints,
(*noapoints)++; (*noapoints)++;
break; break;
case EVENT: case EVENT:
if (vevent.start == 0)
{
ical_log (log, ICAL_VEVENT, ITEMLINE,
_("event date is not defined."));
goto cleanup;
}
ical_store_event (vevent.mesg, vevent.note, vevent.start, ical_store_event (vevent.mesg, vevent.note, vevent.start,
vevent.rpt, vevent.exc); vevent.end, vevent.rpt, vevent.exc);
(*noevents)++; (*noevents)++;
break; break;
case UNDEFINED: case UNDEFINED: