9 files changed, 36 insertions, 63 deletions
diff --git a/module/vcomponent/parse/types.scm b/module/vcomponent/formats/common/types.scm
index ba4b2b47..87425c01 100644
--- a/module/vcomponent/parse/types.scm
+++ b/module/vcomponent/formats/common/types.scm
@@ -1,9 +1,10 @@
-(define-module (vcomponent parse types)
+(define-module (vcomponent formats common types)
   :use-module (calp util)
   :use-module (calp util exceptions)
   :use-module (base64)
   :use-module (datetime)
   :use-module (srfi srfi-9 gnu)
+  :use-module (datetime timespec)
   )
 
 ;; BINARY
@@ -103,8 +104,6 @@
 (define (parse-uri props value)
   value)
 
-(use-modules (datetime timespec))
-
 ;; UTC-OFFSET
 (define (parse-utc-offset props value)
   (make-timespec
diff --git a/module/vcomponent/ical/output.scm b/module/vcomponent/formats/ical/output.scm
index bcc6bb1d..9efac3c4 100644
--- a/module/vcomponent/ical/output.scm
+++ b/module/vcomponent/formats/ical/output.scm
@@ -1,21 +1,21 @@
-(define-module (vcomponent ical output)
+(define-module (vcomponent formats ical output)
+  :use-module (calp util exceptions)
+  :use-module (calp util)
+  :use-module (datetime)
+  :use-module (datetime zic)
+  :use-module ((datetime instance) :select (zoneinfo))
+  :use-module (glob)
   :use-module (ice-9 format)
   :use-module (ice-9 match)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
-  :use-module (vcomponent)
-  :use-module (vcomponent datetime)
   :use-module (srfi srfi-1)
-  :use-module (datetime)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
-  :use-module (datetime zic)
-  :use-module (glob)
-  :use-module (vcomponent recurrence)
+  :use-module (vcomponent)
+  :use-module (vcomponent datetime)
   :use-module (vcomponent geo)
-  :use-module (vcomponent ical types)
-  :autoload (vcomponent instance) (global-event-object)
-  :use-module ((datetime instance) :select (zoneinfo))
+  :use-module (vcomponent formats ical types)
+  :use-module (vcomponent recurrence)
+  :autoload (vcomponent util instance) (global-event-object)
   )
 
 (define (prodid)
@@ -165,32 +165,6 @@
          => (lambda (alts) (hash-map->list (lambda (_ comp) (component->ical-string comp))
                                       alts))]))
 
-;; TODO tzid param on dtstart vs tz field in datetime object
-;; TODO remove this, replace with methods from (output vdir)
-;; how do we keep these two in sync?
-(define (write-event-to-file event calendar-path)
-  (define cal (make-vcomponent 'VCALENDAR))
-
-  (set! (prop cal 'PRODID) (prodid)
-        (prop cal 'VERSION) "2.0"
-        (prop cal 'CALSCALE) "GREGORIAN")
-
-  (add-child! cal event)
-
-  (awhen (and (provided? 'zoneinfo) 
-              (param (prop* event 'DTSTART) 'TZID))
-         ;; TODO this is broken
-         (add-child! cal (zoneinfo->vtimezone (zoneinfo) it)))
-
-  (unless (prop event 'UID)
-    (set! (prop event 'UID)
-      (uuidgen)))
-
-  (with-output-to-file (glob (format #f "~a/~a.ics"
-                                     calendar-path
-                                     (prop event 'UID)))
-    (lambda () (component->ical-string cal))))
-
 
 
 (define (print-header)
diff --git a/module/vcomponent/ical/parse.scm b/module/vcomponent/formats/ical/parse.scm
index b67ae593..d76044a3 100644
--- a/module/vcomponent/ical/parse.scm
+++ b/module/vcomponent/formats/ical/parse.scm
@@ -1,14 +1,14 @@
-(define-module (vcomponent ical parse)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+(define-module (vcomponent formats ical parse)
   :use-module ((ice-9 rdelim) :select (read-line))
-  :use-module (vcomponent base)
+  :use-module (calp util exceptions)
+  :use-module (calp util)
   :use-module (datetime)
   :use-module (srfi srfi-1)
-  :use-module (srfi srfi-9 gnu)
   :use-module (srfi srfi-26)
-  :use-module (vcomponent parse types)
+  :use-module (srfi srfi-9 gnu)
+  :use-module (vcomponent base)
   :use-module (vcomponent geo)
+  :use-module (vcomponent formats common types)
  )
 
 (define string->symbol
diff --git a/module/vcomponent/ical/types.scm b/module/vcomponent/formats/ical/types.scm
index 1ec9d0bd..d063ca8f 100644
--- a/module/vcomponent/ical/types.scm
+++ b/module/vcomponent/formats/ical/types.scm
@@ -1,10 +1,12 @@
 ;; see (vcomponent parse types)
-(define-module (vcomponent ical types)
+(define-module (vcomponent formats ical types)
   :use-module (calp util)
   :use-module (calp util exceptions)
   :use-module (base64)
-  :use-module (datetime))
+  :use-module (datetime)
+  :use-module (datetime timespec))
 
+;; TODO shouldn't these really take vline:s?
 
 (define (write-binary _ value)
   (bytevector->base64-string value))
@@ -62,8 +64,6 @@
   value)
 
 
-(use-modules (datetime timespec))
-
 (define (write-utc-offset _ value)
   (with-output-to-string
     (lambda ()
diff --git a/module/vcomponent/vdir/parse.scm b/module/vcomponent/formats/vdir/parse.scm
index 6bbd1329..f3810887 100644
--- a/module/vcomponent/vdir/parse.scm
+++ b/module/vcomponent/formats/vdir/parse.scm
@@ -1,10 +1,10 @@
 ;;; Commentary:
 ;; Code for parsing vdir's and icalendar files.
 ;; This module handles the finding of files, while
-;; (vcomponent parse ical) handles reading data from icalendar files.
+;; (vcomponent formats parse ical) handles reading data from icalendar files.
 ;;; Code:
 
-(define-module (vcomponent vdir parse)
+(define-module (vcomponent formats vdir parse)
   :use-module (srfi srfi-1)
 
   :use-module ((ice-9 hash-table) :select (alist->hash-table))
@@ -15,7 +15,7 @@
   :use-module (calp util exceptions)
   :use-module (vcomponent base)
 
-  :use-module (vcomponent ical parse)
+  :use-module (vcomponent formats ical parse)
   )
 
 
diff --git a/module/vcomponent/vdir/save-delete.scm b/module/vcomponent/formats/vdir/save-delete.scm
index b3c7f9c5..1c70dabf 100644
--- a/module/vcomponent/vdir/save-delete.scm
+++ b/module/vcomponent/formats/vdir/save-delete.scm
@@ -9,10 +9,10 @@
 
 ;;; Code:
 
-(define-module (vcomponent vdir save-delete)
+(define-module (vcomponent formats vdir save-delete)
   :use-module (calp util)
   :use-module ((calp util exceptions) :select (assert))
-  :use-module (vcomponent ical output)
+  :use-module (vcomponent formats ical output)
   :use-module (vcomponent)
   :use-module ((calp util io) :select (with-atomic-output-to-file))
   )
diff --git a/module/vcomponent/xcal/output.scm b/module/vcomponent/formats/xcal/output.scm
index 70288cba..e2cada83 100644
--- a/module/vcomponent/xcal/output.scm
+++ b/module/vcomponent/formats/xcal/output.scm
@@ -1,9 +1,9 @@
-(define-module (vcomponent xcal output)
+(define-module (vcomponent formats xcal output)
   :use-module (calp util)
   :use-module (calp util exceptions)
   :use-module (vcomponent)
   :use-module (vcomponent geo)
-  :use-module (vcomponent xcal types)
+  :use-module (vcomponent formats xcal types)
   :use-module (ice-9 match)
   :use-module (datetime)
   :use-module (srfi srfi-1)
diff --git a/module/vcomponent/xcal/parse.scm b/module/vcomponent/formats/xcal/parse.scm
index c6a2122f..e84f380e 100644
--- a/module/vcomponent/xcal/parse.scm
+++ b/module/vcomponent/formats/xcal/parse.scm
@@ -1,4 +1,4 @@
-(define-module (vcomponent xcal parse)
+(define-module (vcomponent formats xcal parse)
   :use-module (calp util)
   :use-module (calp util exceptions)
   :use-module (base64)
@@ -6,7 +6,7 @@
   :use-module (sxml match)
   :use-module (vcomponent)
   :use-module (vcomponent geo)
-  :use-module (vcomponent parse types)
+  :use-module (vcomponent formats common types)
   :use-module (datetime)
   :use-module (srfi srfi-1)
   )
diff --git a/module/vcomponent/xcal/types.scm b/module/vcomponent/formats/xcal/types.scm
index 468400f4..34c7c40d 100644
--- a/module/vcomponent/xcal/types.scm
+++ b/module/vcomponent/formats/xcal/types.scm
@@ -1,6 +1,6 @@
-(define-module (vcomponent xcal types)
+(define-module (vcomponent formats xcal types)
   :use-module (calp util)
-  :use-module (vcomponent ical types)
+  :use-module (vcomponent formats ical types)
   :use-module (datetime)
   )
 
@@ -40,7 +40,7 @@
      (hashq-set! sxml-writers simple-type
                  (lambda (p v)
                    `(,(downcase-symbol simple-type)
-                     ,(((@ (vcomponent ical types) get-writer) simple-type) p v)))))
+                     ,(((@ (vcomponent formats ical types) get-writer) simple-type) p v)))))
 
 (hashq-set! sxml-writers 'BOOLEAN write-boolean)
 (hashq-set! sxml-writers 'DATE write-date)