/*
- * 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
#include <libical/ical.h>
#include "util.h"
+#include "conf.h"
#include "date.h"
#include "cal.h"
/* 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;
/* Static data */
-static ical_t calendars[] = {
- { .location = "data/all.ics" },
-};
+static ical_t *calendars;
/* Helper functions */
static int ical_compare(const void *_a, const void *_b)
};
}
-static void add_recur(icalarray *array, icalcomponent *comp,
+static icaltimetype to_itime(date_t time)
+{
+ return (struct icaltimetype){
+ .year = time.year,
+ .month = time.month + 1,
+ .day = time.day + 1,
+ .hour = time.hour,
+ .minute = time.min
+ };
+}
+
+static void add_recur(cal_t *cal,
+ icalarray *array, icalcomponent *comp,
icaltimetype start, icaltimetype end,
icalcomponent_kind which)
{
if (icaltime_is_null_time(cstart) ||
which == ICAL_VTODO_COMPONENT) {
icalarray_append(array, &(ical_inst){
+ .cal = cal,
.comp = comp,
.start = cstart,
.end = cend,
break; // instance begins after stop time
icalarray_append(array, &(ical_inst){
+ .cal = cal,
.comp = comp,
.start = istart,
.end = iend,
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);
}
}
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)
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);
}
}
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;
}
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;
}
cur->name ?: cur->desc ?: "[no summary]");
}
+/* Config parser */
+void ical_config(const char *group, const char *name, const char *key, const char *value)
+{
+ ical_t *cal = NULL, *last = NULL;
+
+ /* Make sure it's valid */
+ if (!match(group, "ical") || !name)
+ return;
+
+ /* Find existing calendar */
+ for (cal = calendars; cal; last = cal, cal = cal->next)
+ if (match(cal->cal.name, name))
+ break;
+
+ /* Create new calendar */
+ if (!cal) {
+ cal = new0(ical_t);
+ cal->cal.type = "ical";
+ cal->cal.name = get_name(name);
+ if (last)
+ last->next = cal;
+ else
+ calendars = cal;
+ return;
+ }
+
+ /* Set calendar values */
+ if (match(key, "location"))
+ cal->location = get_string(value);
+ else if (match(key, "username"))
+ cal->username = get_string(value);
+ else if (match(key, "password"))
+ 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(cal_t *cal, year_t year, month_t month, day_t day, int days)
+event_t *ical_events(date_t _start, date_t _end)
{
read_icals();
+ icaltimetype start = to_itime(_start);
+ icaltimetype end = to_itime(_end);
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
- icaltimetype start = {.year = year-10};
- icaltimetype end = {.year = year+10};
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);
}
/* Todo functions */
-todo_t *ical_todos(cal_t *cal, year_t year, month_t month, day_t day, int days)
+todo_t *ical_todos(date_t _start, date_t _end)
{
read_icals();
+ icaltimetype start = to_itime(_start);
+ icaltimetype end = to_itime(_end);
icalarray *array = icalarray_new(sizeof(ical_inst), 1);
- icaltimetype start = {.year = year-10};
- icaltimetype end = {.year = year+10};
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);
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;
/* 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);
projects / lackey / blobdiff