/*
- * 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
/* 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)
CAL(ical);
/* Global data */
+cal_t *CALS;
event_t *EVENTS;
todo_t *TODOS;
(*last)->next = *next;
else
(*first) = *next;
+ (*next)->prev = *last;
(*last) = (*next);
(*next) = (*next)->next;
}
(*last)->next = *next;
else
(*first) = *next;
+ (*next)->prev = *last;
(*last) = (*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;
/* Initialize */
void cal_init(void)
{
- /* Load a year's worth of data */
- cal_load(YEAR-1, DEC, 31-7, 366+7+7);
+ /* Load calendars */
+ CALS = merge_cals(
+ dummy_cals(),
+ ical_cals());
+
+ /* Load data */
+ cal_load(SEL.year, SEL.month, SEL.day, 1);
/* Debug */
+#ifdef DEBUG_CALS
for (event_t *e = EVENTS; e; e = e->next)
debug("event: %04d-%02d-%02d %02d:%02d: %s - %s",
e->start.year, e->start.month, e->start.day,
debug("todo: %04d-%02d-%02d %02d:%02d: %s - %s",
e->start.year, e->start.month, e->start.day,
e->start.hour, e->start.min, e->name, e->desc);
+#endif
}
/* Load events and todos */
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))
+ if (before(&start, year, month, day, 0, 0) &&
+ !before(&end, eyear, emonth, eday, 24, 0))
return;
/* Free uneeded data */
- // TODO
+ 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 */
dummy_todos(start, end),
ical_todos(start, end));
+ /* Verify events and todos*/
+#ifdef DEBUG_CALS
+ for (event_t *cur = EVENTS; cur; cur = cur->next) {
+ if (!cur->cal)
+ error("Missing cal in event '%s'", cur->name);
+ if ((cur->next && cur->next->prev != cur) ||
+ (cur->prev && cur->prev->next != cur))
+ error("Broken link 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);
+ if ((cur->next && cur->next->prev != cur) ||
+ (cur->prev && cur->prev->next != cur))
+ error("Broken link in todo '%s'", cur->name);
+ }
+#endif
+}
+
+/* Config parser */
+void cal_config(const char *group, const char *name, const char *key, const char *value)
+{
+ if (match(group, "dummy"))
+ dummy_config(group, name, key, value);
+ else if (match(group, "ical"))
+ ical_config(group, name, key, value);
}