X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fcal.c;h=b519d588fb4601d6a33470c2b60997e9bee51591;hb=296fd1bb5f87b1961e98c7ea4c224219012f7161;hp=da835da7225f9280e9463031be8fb6b76983fc08;hpb=035bf3a6553362883c2451c36afc7766002941a3;p=lackey diff --git a/src/cal.c b/src/cal.c index da835da..b519d58 100644 --- a/src/cal.c +++ b/src/cal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Andy Spencer + * Copyright (C) 2012-2013 Andy Spencer * * 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 @@ -15,21 +15,106 @@ * along with this program. If not, see . */ +#include + #include "util.h" #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) +{ + if (*last) + (*last)->next = *next; + else + (*first) = *next; + (*next)->prev = *last; + (*last) = (*next); + (*next) = (*next)->next; +} + +static void add_todo(todo_t **first, todo_t **last, todo_t **next) +{ + if (*last) + (*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; + while (a && b) + if (compare(&a->start, &b->start) <= 0) + add_event(&first, &last, &a); + else + add_event(&first, &last, &b); + while (a) add_event(&first, &last, &a); + while (b) add_event(&first, &last, &b); + return first; +} + +static todo_t *merge_todos(todo_t *a, todo_t *b) +{ + todo_t *first = NULL, *last = NULL; + while (a && b) + if (compare(&a->start, &b->start) <= 0) + add_todo(&first, &last, &a); + else + add_todo(&first, &last, &b); + while (a) add_todo(&first, &last, &a); + while (b) add_todo(&first, &last, &b); + return first; +} + /* 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(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, @@ -38,18 +123,80 @@ void cal_init(void) 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 } -/* 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) { - return ical_events(0, year, month, day, days) - ?: dummy_events(0, year, month, day, days); + 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*/ +#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 } -/* 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) { - return ical_todos(0, year, month, day, days) - ?: dummy_todos(0, year, month, day, days); + if (match(group, "dummy")) + dummy_config(group, name, key, value); + else if (match(group, "ical")) + ical_config(group, name, key, value); }