From 92611a7aa9f8ec5c01a6890ec3e660cd27d7b8b0 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sat, 8 Jun 2013 01:02:37 +0000 Subject: [PATCH] Merge calendar items --- src/cal.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/src/cal.c b/src/cal.c index da835da..9a40308 100644 --- a/src/cal.c +++ b/src/cal.c @@ -15,6 +15,8 @@ * along with this program. If not, see . */ +#include + #include "util.h" #include "date.h" #include "cal.h" @@ -23,6 +25,53 @@ event_t *EVENTS; todo_t *TODOS; +/* 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; + (*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; + (*last) = (*next); + (*next) = (*next)->next; +} + +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) { @@ -43,13 +92,15 @@ void cal_init(void) /* Get events */ event_t *cal_events(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); + 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); } /* Get todos */ todo_t *cal_todos(year_t year, month_t month, day_t day, int days) { - return ical_todos(0, year, month, day, days) - ?: dummy_todos(0, year, month, day, days); + 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); } -- 2.43.2