/*
- * Copyright (C) 2012 Andy Spencer <andy753421@gmail.com>
+ * Copyright (C) 2012-2013 Andy Spencer <andy753421@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
/* Local types */
typedef struct {
+ cal_t *cal;
icalcomponent *comp;
struct icaltimetype start;
struct icaltimetype end;
};
}
-static void add_recur(icalarray *array, icalcomponent *comp,
+static void add_recur(cal_t *cal,
+ icalarray *array, icalcomponent *comp,
icaltimetype start, icaltimetype end,
icalcomponent_kind which)
{
if (icaltime_is_null_time(cstart) ||
which == ICAL_VTODO_COMPONENT) {
icalarray_append(array, &(ical_inst){
+ .cal = cal,
.comp = comp,
.start = cstart,
.end = cend,
break; // instance begins after stop time
icalarray_append(array, &(ical_inst){
+ .cal = cal,
.comp = comp,
.start = istart,
.end = iend,
icalcomponent_kind find = ICAL_ANY_COMPONENT;
icalcomponent *child = icalcomponent_get_first_component(comp, find);
while (child) {
- add_recur(array, child, start, end, which);
+ add_recur(cal, array, child, start, end, which);
child = icalcomponent_get_next_component(comp, find);
}
}
event->cat = icalproperty_get_value_as_string_r(prop);
event->start = to_date(inst->start);
event->end = to_date(inst->end);
+ event->cal = inst->cal;
return event;
}
perc ? icalproperty_get_percentcomplete(perc) : 0;
todo->start = to_date(inst->start);
todo->due = to_date(icalcomponent_get_due(inst->comp));
+ todo->cal = inst->cal;
return todo;
}
icaltimetype end = to_itime(_end);
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
for (ical_t *cal = calendars; cal; cal = cal->next)
- add_recur(array, cal->comp, start, end, ICAL_VEVENT_COMPONENT);
+ add_recur(&cal->cal, array, cal->comp, start, end, ICAL_VEVENT_COMPONENT);
icalarray_sort(array, ical_compare);
event_t *events = to_events(array);
icalarray_free(array);
icaltimetype end = to_itime(_end);
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
for (ical_t *cal = calendars; cal; cal = cal->next)
- add_recur(array, cal->comp, start, end, ICAL_VTODO_COMPONENT);
+ add_recur(&cal->cal, array, cal->comp, start, end, ICAL_VTODO_COMPONENT);
icalarray_sort(array, ical_compare);
todo_t *todos = to_todos(array);
icalarray_free(array);
/* Find events */
array = icalarray_new(sizeof(ical_inst), 1);
- add_recur(array, comp, start, end, ICAL_VEVENT_COMPONENT);
+ add_recur(NULL, array, comp, start, end, ICAL_VEVENT_COMPONENT);
icalarray_sort(array, ical_compare);
event_t *events = to_events(array);
icalarray_free(array);
/* Find Todos */
array = icalarray_new(sizeof(ical_inst), 1);
- add_recur(array, comp, start, end, ICAL_VTODO_COMPONENT);
+ add_recur(NULL, array, comp, start, end, ICAL_VTODO_COMPONENT);
icalarray_sort(array, ical_compare);
todo_t *todos = to_todos(array);
icalarray_free(array);
/* Print */
- //ical_printr(comp, 0);
- //print_events(events);
+ ical_printr(comp, 0);
+ print_events(events);
print_todos(todos);
(void)print_events;