Output cal field for ical events and todos

[lackey] / src / cal.c

diff --git a/src/cal.c b/src/cal.c
index 9a40308b5b8db239def241c4c671f91ea459f2cf..62b21ac8dd0d2c9426cfe9d2a4bb31c2e288ea82 100644 (file)
--- a/src/cal.c
+++ b/src/cal.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
@@ -21,10 +21,26 @@
 #include "date.h"
 #include "cal.h"
 
+/* Macros */
+#define CAL(name) \
+       void     name##_config(const char *group, const char *name, const char *key, const char *value); \
+       cal_t   *name##_cals(void); \
+       event_t *name##_events(date_t start, date_t end); \
+       todo_t  *name##_todos(date_t start, date_t end)
+
+/* Prototypes */
+CAL(dummy);
+CAL(ical);
+
 /* Global data */
+cal_t   *CALS;
 event_t *EVENTS;
 todo_t  *TODOS;
 
+/* Local data */
+static date_t start;
+static date_t end;
+
 /* Merge events and todos */
 static void add_event(event_t **first, event_t **last, event_t **next)
 {
@@ -46,6 +62,18 @@ static void add_todo(todo_t **first, todo_t **last, todo_t **next)
        (*next) = (*next)->next;
 }
 
+static cal_t *merge_cals(cal_t *a, cal_t *b)
+{
+       // TODO - we should sort these
+       if (!a) return b;
+       if (!b) return a;
+       cal_t *last = a;
+       while (last->next)
+               last = last->next;
+       last->next = b;
+       return a;
+}
+
 static event_t *merge_events(event_t *a, event_t *b)
 {
        event_t *first = NULL, *last = NULL;
@@ -75,8 +103,13 @@ static todo_t *merge_todos(todo_t *a, todo_t *b)
 /* Initialize */
 void cal_init(void)
 {
-       EVENTS = cal_events(2012, JAN, 0, 366);
-       TODOS  = cal_todos(2012, JAN, 0, 366);
+       /* Load calendars */
+       CALS = merge_cals(
+               dummy_cals(),
+                ical_cals());
+
+       /* Load data */
+       cal_load(YEAR, MONTH, DAY, 1);
 
        /* Debug */
        for (event_t *e = EVENTS; e; e = e->next)
@@ -89,18 +122,67 @@ void cal_init(void)
                                e->start.hour, e->start.min, e->name, e->desc);
 }
 
-/* Get events */
-event_t *cal_events(year_t year, month_t month, day_t day, int days)
+/* Load events and todos */
+void cal_load(year_t year, month_t month, day_t day, int days)
 {
-       event_t *dummy = dummy_events(0, year, month, day, days);
-       event_t *ical  =  ical_events(0, year, month, day, days);
-       return merge_events(dummy, ical);
+       year_t  eyear  = year;
+       month_t emonth = month;
+       day_t   eday   = day;
+       add_days(&eyear, &emonth, &eday, days);
+
+       /* Skip if we already loaded enough info */
+       if (before(&start, year,  month,  day,  0, 0) &&
+          !before(&end,  eyear, emonth, eday, 24, 0))
+               return;
+
+       /* Free uneeded data */
+       for (event_t *next, *cur = EVENTS; cur; cur = next) {
+               next = cur->next;
+               if (cur->name) free(cur->name);
+               if (cur->desc) free(cur->desc);
+               if (cur->loc)  free(cur->loc);
+               if (cur->cat)  free(cur->cat);
+               free(cur);
+       }
+       for (todo_t *next, *cur = TODOS; cur; cur = next) {
+               next = cur->next;
+               if (cur->name) free(cur->name);
+               if (cur->desc) free(cur->desc);
+               if (cur->cat)  free(cur->cat);
+               free(cur);
+       }
+
+       /* Push dates out a bit to avoid reloading,
+        * enough to at least cover the current year */
+       add_days(&year,  &month,  &day, -366);
+       add_days(&eyear, &emonth, &eday, 366);
+       start = (date_t){year,  month,  day};
+       end   = (date_t){eyear, emonth, eday};
+
+       /* Load events */
+       EVENTS = merge_events(
+               dummy_events(start, end),
+                ical_events(start, end));
+
+       /* Load todos */
+       TODOS  = merge_todos(
+               dummy_todos(start, end),
+                ical_todos(start, end));
+
+       /* Verify events and todos*/
+       //for (event_t *cur = EVENTS; cur; cur = cur->next)
+       //      if (!cur->cal)
+       //              error("Missing cal in event '%s'", cur->name);
+       //for (todo_t *cur = TODOS; cur; cur = cur->next)
+       //      if (!cur->cal)
+       //              error("Missing cal in todo '%s'", cur->name);
 }
 
-/* Get todos */
-todo_t *cal_todos(year_t year, month_t month, day_t day, int days)
+/* Config parser */
+void cal_config(const char *group, const char *name, const char *key, const char *value)
 {
-       todo_t *dummy = dummy_todos(0, year, month, day, days);
-       todo_t *ical  =  ical_todos(0, year, month, day, days);
-       return merge_todos(dummy, ical);
+       if (match(group, "dummy"))
+               dummy_config(group, name, key, value);
+       else if (match(group, "ical"))
+               ical_config(group, name, key, value);
 }