Support multiple ical files

[lackey] / cals / ical.c

diff --git a/cals/ical.c b/cals/ical.c
index 33df76c7ebbff68c21293cf79d0600acaae47fdd..ce76391988cee5630d86c6620f9c587e1690db8e 100644 (file)
--- a/cals/ical.c
+++ b/cals/ical.c
@@ -15,8 +15,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _XOPEN_SOURCE
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <wordexp.h>
 #include <libical/ical.h>
 
 #include "util.h"
@@ -30,6 +33,20 @@ typedef struct {
        struct icaltimetype end;
 } ical_inst;
 
+typedef struct ical_t {
+       char          *name;
+       char          *location;
+       char          *username;
+       char          *password;
+       icalcomponent *ical;
+       struct ical_t *next;
+} ical_t;
+
+/* Static data */
+static ical_t  calendars[] = {
+       { .location = "data/all.ics" },
+};
+
 /* Helper functions */
 static int ical_compare(const void *_a, const void *_b)
 {
@@ -102,6 +119,8 @@ static void add_recur(icalarray *array, icalcomponent *comp,
                                .end   = iend,
                        });
                }
+
+               icalrecur_iterator_free(iter);
        }
 
        /* Add children */
@@ -113,15 +132,36 @@ static void add_recur(icalarray *array, icalcomponent *comp,
        }
 }
 
+static void read_icals(void)
+{
+       for (ical_t *cal = calendars; cal; cal = cal->next) {
+               if (cal->ical == NULL && cal->location) {
+                       wordexp_t wexp;
+                       wordexp(cal->location, &wexp, WRDE_NOCMD);
+                       if (wexp.we_wordc == 0)
+                               continue;
+                       FILE *file = fopen(wexp.we_wordv[0], "r");
+                       wordfree(&wexp);
+                       if (!file)
+                               continue;
+
+                       icalparser *parser = icalparser_new();
+                       icalparser_set_gen_data(parser, file);
+                       cal->ical = icalparser_parse(parser, (void*)fgets);
+                       icalparser_free(parser);
+               }
+       }
+}
+
 /* Event functions */
 static event_t *to_event(ical_inst *inst)
 {
        icalproperty *prop = icalcomponent_get_first_property(inst->comp, ICAL_CATEGORIES_PROPERTY);
 
        event_t *event = new0(event_t);
-       event->name  = icalcomponent_get_summary(inst->comp);
-       event->desc  = icalcomponent_get_description(inst->comp);
-       event->loc   = icalcomponent_get_location(inst->comp);
+       event->name  = strcopy(icalcomponent_get_summary(inst->comp));
+       event->desc  = strcopy(icalcomponent_get_description(inst->comp));
+       event->loc   = strcopy(icalcomponent_get_location(inst->comp));
        event->cat   = icalproperty_get_value_as_string_r(prop);
        event->start = to_date(inst->start);
        event->end   = to_date(inst->end);
@@ -156,9 +196,9 @@ static todo_t *to_todo(ical_inst *inst)
        icalproperty *perc = icalcomponent_get_first_property(inst->comp, ICAL_PERCENTCOMPLETE_PROPERTY);
 
        todo_t *todo = new0(todo_t);
-       todo->name   = icalcomponent_get_summary(inst->comp);
-       todo->desc   = icalcomponent_get_description(inst->comp);
-       todo->cat    = icalproperty_get_value_as_string(cat);
+       todo->name   = strcopy(icalcomponent_get_summary(inst->comp));
+       todo->desc   = strcopy(icalcomponent_get_description(inst->comp));
+       todo->cat    = strcopy(icalproperty_get_value_as_string(cat));
        todo->status = icalcomponent_get_status(inst->comp) == ICAL_STATUS_COMPLETED ? 100 :
                       perc ? icalproperty_get_percentcomplete(perc) : 0;
        todo->start  = to_date(inst->start);
@@ -190,45 +230,35 @@ static void print_todos(todo_t *start)
 /* Event functions */
 event_t *ical_events(cal_t *cal, year_t year, month_t month, day_t day, int days)
 {
-       /* Load ical */
-       FILE *file = fopen("data/all.ics", "r");
-       if (!file)
-               return NULL;
-       icalparser *parser = icalparser_new();
-       icalparser_set_gen_data(parser, file);
-       icalcomponent *ical = icalparser_parse(parser, (void*)fgets);
+       read_icals();
 
-       /* Add events */
        icalarray *array = icalarray_new(sizeof(ical_inst), 1);
-       icaltimetype start = {.year = 2000};
-       icaltimetype end   = {.year = 2020};
-       add_recur(array, ical, start, end, ICAL_VEVENT_COMPONENT);
+       icaltimetype start = {.year = year-10};
+       icaltimetype end   = {.year = year+10};
+       for (ical_t *cal = calendars; cal; cal = cal->next)
+               add_recur(array, cal->ical, start, end, ICAL_VEVENT_COMPONENT);
        icalarray_sort(array, ical_compare);
-       return to_events(array);
+       event_t *events = to_events(array);
+       icalarray_free(array);
 
-       /* Todo, memory management */
+       return events;
 }
 
 /* Todo functions */
 todo_t *ical_todos(cal_t *cal, year_t year, month_t month, day_t day, int days)
 {
-       /* Load ical */
-       FILE *file = fopen("data/all.ics", "r");
-       if (!file)
-               return NULL;
-       icalparser *parser = icalparser_new();
-       icalparser_set_gen_data(parser, file);
-       icalcomponent *ical = icalparser_parse(parser, (void*)fgets);
+       read_icals();
 
-       /* Add todos */
        icalarray *array = icalarray_new(sizeof(ical_inst), 1);
-       icaltimetype start = {.year = 2000};
-       icaltimetype end   = {.year = 2020};
-       add_recur(array, ical, start, end, ICAL_VTODO_COMPONENT);
+       icaltimetype start = {.year = year-10};
+       icaltimetype end   = {.year = year+10};
+       for (ical_t *cal = calendars; cal; cal = cal->next)
+               add_recur(array, cal->ical, start, end, ICAL_VTODO_COMPONENT);
        icalarray_sort(array, ical_compare);
-       return to_todos(array);
+       todo_t *todos = to_todos(array);
+       icalarray_free(array);
 
-       /* Todo, memory management */
+       return todos;
 }
 
 /* Test functions */
@@ -270,12 +300,14 @@ void ical_test(void)
        add_recur(array, ical, 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, ical, start, end, ICAL_VTODO_COMPONENT);
        icalarray_sort(array, ical_compare);
        todo_t *todos = to_todos(array);
+       icalarray_free(array);
 
        /* Print */
        //ical_printr(ical, 0);