diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/calendar.c | 4 | ||||
| -rw-r--r-- | src/guile_interface.scm.c | 33 | ||||
| -rw-r--r-- | src/vcal.c | 16 | ||||
| -rw-r--r-- | src/vcal.h | 1 |
4 files changed, 45 insertions, 9 deletions
diff --git a/src/calendar.c b/src/calendar.c index be681abe..403ae83c 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -39,7 +39,7 @@ int handle_file(vcomponent* cal, char* path) { INFO("Parsing a single file"); vcomponent_push_val(cal, "NAME", path); - vcomponent_push_val(cal, "TYPE", "file"); + vcomponent_push_val(cal, "X-HNH-SOURCETYPE", "file"); char* resolved_path = realpath(path, NULL); open_ics (resolved_path, cal); free (resolved_path); @@ -66,7 +66,7 @@ int handle_dir(vcomponent* cal, char* path) { * TODO cut path to its last component. */ vcomponent_push_val(cal, "NAME", path); - vcomponent_push_val(cal, "TYPE", "vdir"); + vcomponent_push_val(cal, "X-HNH-SOURCETYPE", "vdir"); struct dirent* d; while ((d = readdir(dir)) != NULL) { diff --git a/src/guile_interface.scm.c b/src/guile_interface.scm.c index 7c6fee6f..a9485b38 100644 --- a/src/guile_interface.scm.c +++ b/src/guile_interface.scm.c @@ -12,18 +12,23 @@ void init_vcomponent_type (void) { vcomponent_type = scm_make_foreign_object_type(name, slots, NULL); } -SCM_DEFINE (make_vcomponent, "%vcomponent-make", 1, 0, 0, +SCM_DEFINE (make_vcomponent, "%vcomponent-make", 0, 1, 0, (SCM path), "Loads a vdir iCalendar from the given path.") { vcomponent* cal = (vcomponent*) scm_gc_malloc ( sizeof(*cal), "vcomponent"); - INIT(vcomponent, cal, "ROOT"); - char* p = scm_to_utf8_stringn(path, NULL); - read_vcalendar(cal, p); - free(p); + if (SCM_UNBNDP(path)) { + INIT(vcomponent, cal); + } else { + INIT(vcomponent, cal, "ROOT"); + + char* p = scm_to_utf8_stringn(path, NULL); + read_vcalendar(cal, p); + free(p); + } return scm_from_vcomponent (cal); } @@ -171,7 +176,7 @@ SCM_DEFINE (vcomponent_parent, "%vcomponent-parent", 1, 0, 0, } } -SCM_DEFINE(vcomponent_typeof, "%vcomponent-type", 1, 0, 0, +SCM_DEFINE(vcomponent_typeof, "%vcomponent-get-type", 1, 0, 0, (SCM component), "Returns type of vcomponent") { @@ -180,6 +185,22 @@ SCM_DEFINE(vcomponent_typeof, "%vcomponent-type", 1, 0, 0, return scm_from_utf8_symbol(comp->type); } +SCM_DEFINE(vcomponent_set_type_x, "%vcomponent-set-type!", 2, 0, 0, + (SCM component, SCM type), + "Replace current type of vcomponent") +{ + scm_assert_foreign_object_type (vcomponent_type, component); + vcomponent* comp = scm_foreign_object_ref (component, 0); + + if (comp->type) free (comp->type); + + char* ntype = scm_to_utf8_stringn (type, NULL); + comp->type = calloc(sizeof(*ntype), strlen(ntype) + 1); + strcpy(comp->type, ntype); + + return SCM_UNSPECIFIED; +} + SCM scm_from_vcomponent(vcomponent* v) { if (v->scm == NULL) { v->scm = scm_make_foreign_object_1 (vcomponent_type, v); @@ -34,7 +34,12 @@ INIT_F(vcomponent) { INIT(TRIE(content_line), &self->clines); INIT(LLIST(vcomponent), &self->components); - self->type = NULL; + // vcomponent_push_val (self, "X-HNH-FILENAME", "VIRTUAL"); + vcomponent_push_val (self, "X-HNH-SOURCETYPE", "virtual"); + char* type = "VIRTUAL"; + self->type = (char*) calloc(sizeof(*type), strlen(type) + 1); + strcpy(self->type, type); + self->parent = NULL; self->scm = NULL; @@ -52,6 +57,15 @@ INIT_F(vcomponent, const char* type, const char* filename) { INIT(LLIST(vcomponent), &self->components); if (filename != NULL) { + /* + * NOTE + * RFC-7986 adds additional parameters linked to this one. + * - `SOURCE' :: where a (possibly) updated version of the data can be + * found + * - `URL' :: Where the same data can be fonud, but + * differently (but not where the original data can be fonud + * agani). + */ vcomponent_push_val (self, "X-HNH-FILENAME", filename); } @@ -68,6 +68,7 @@ typedef struct s_vcomponent vcomponent; #undef TYPE struct s_vcomponent { + /* VCALENDAR, VEVENT, ... */ char* type; vcomponent* parent; TRIE(content_line) clines; |