Output cal field for ical events and todos

[lackey] / cals / ical.c

diff --git a/cals/ical.c b/cals/ical.c
index c8147371411db4a77c185eb8411e0b3348caabbd..2862e725b0328f1fb16dd2e6b785c7597762f7a1 100644 (file)
--- a/cals/ical.c
+++ b/cals/ical.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -29,17 +29,18 @@
 
 /* Local types */
 typedef struct {
+       cal_t *cal;
        icalcomponent *comp;
        struct icaltimetype start;
        struct icaltimetype end;
 } ical_inst;
 
 typedef struct ical_t {
-       char          *name;
+       cal_t          cal;
        char          *location;
        char          *username;
        char          *password;
-       icalcomponent *ical;
+       icalcomponent *comp;
        struct ical_t *next;
 } ical_t;
 
@@ -79,7 +80,8 @@ static icaltimetype to_itime(date_t time)
        };
 }
 
-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)
 {
@@ -107,6 +109,7 @@ static void add_recur(icalarray *array, icalcomponent *comp,
                if (icaltime_is_null_time(cstart) ||
                    which == ICAL_VTODO_COMPONENT) {
                        icalarray_append(array, &(ical_inst){
+                               .cal   = cal,
                                .comp  = comp,
                                .start = cstart,
                                .end   = cend,
@@ -124,6 +127,7 @@ static void add_recur(icalarray *array, icalcomponent *comp,
                                break;    // instance begins after stop time
 
                        icalarray_append(array, &(ical_inst){
+                               .cal   = cal,
                                .comp  = comp,
                                .start = istart,
                                .end   = iend,
@@ -137,7 +141,7 @@ static void add_recur(icalarray *array, icalcomponent *comp,
        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);
        }
 }
@@ -145,7 +149,7 @@ 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) {
+               if (cal->comp == NULL && cal->location) {
                        wordexp_t wexp;
                        wordexp(cal->location, &wexp, WRDE_NOCMD);
                        if (wexp.we_wordc == 0)
@@ -157,7 +161,7 @@ static void read_icals(void)
 
                        icalparser *parser = icalparser_new();
                        icalparser_set_gen_data(parser, file);
-                       cal->ical = icalparser_parse(parser, (void*)fgets);
+                       cal->comp = icalparser_parse(parser, (void*)fgets);
                        icalparser_free(parser);
                }
        }
@@ -175,6 +179,7 @@ static event_t *to_event(ical_inst *inst)
        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;
 }
 
@@ -213,6 +218,7 @@ static todo_t *to_todo(ical_inst *inst)
                       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;
 }
 
@@ -248,13 +254,14 @@ void ical_config(const char *group, const char *name, const char *key, const cha
 
        /* Find existing calendar */
        for (cal = calendars; cal; last = cal, cal = cal->next)
-               if (match(cal->name, name))
+               if (match(cal->cal.name, name))
                        break;
 
        /* Create new calendar */
        if (!cal) {
                cal = new0(ical_t);
-               cal->name = get_name(name);
+               cal->cal.type = "ical";
+               cal->cal.name = get_name(name);
                if (last)
                        last->next = cal;
                else
@@ -271,6 +278,17 @@ void ical_config(const char *group, const char *name, const char *key, const cha
                cal->password = get_string(value);
 }
 
+/* Cal functions */
+cal_t *ical_cals(void)
+{
+       read_icals();
+
+       for (ical_t *cal = calendars; cal; cal = cal->next)
+               cal->cal.next = &cal->next->cal;
+
+       return &calendars->cal;
+}
+
 /* Event functions */
 event_t *ical_events(date_t _start, date_t _end)
 {
@@ -280,7 +298,7 @@ event_t *ical_events(date_t _start, date_t _end)
        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->ical, 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);
@@ -297,7 +315,7 @@ todo_t *ical_todos(date_t _start, date_t _end)
        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->ical, 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);
@@ -332,7 +350,7 @@ void ical_test(void)
        FILE *file = fopen("data/all.ics", "r");
        icalparser *parser = icalparser_new();
        icalparser_set_gen_data(parser, file);
-       icalcomponent *ical = icalparser_parse(parser, (void*)fgets);
+       icalcomponent *comp = icalparser_parse(parser, (void*)fgets);
 
        /* Misc */
        icalarray *array;
@@ -341,20 +359,20 @@ void ical_test(void)
 
        /* Find events */
        array = icalarray_new(sizeof(ical_inst), 1);
-       add_recur(array, ical, 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, ical, 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(ical, 0);
+       //ical_printr(comp, 0);
        //print_events(events);
        print_todos(todos);