1 files changed, 25 insertions, 10 deletions
diff --git a/module/vcomponent/formats/vdir/save-delete.scm b/module/vcomponent/formats/vdir/save-delete.scm
index 6068e34c..01d34f9f 100644
--- a/module/vcomponent/formats/vdir/save-delete.scm
+++ b/module/vcomponent/formats/vdir/save-delete.scm
@@ -11,8 +11,8 @@
 
 (define-module (vcomponent formats vdir save-delete)
   :use-module (hnh util)
+  :use-module (hnh util uuid)
   :use-module ((hnh util path) :select (path-append))
-  :use-module ((hnh util exceptions) :select (assert))
   :use-module (vcomponent formats ical output)
   :use-module (vcomponent)
   :use-module ((hnh util io) :select (with-atomic-output-to-file))
@@ -22,14 +22,25 @@
 (define-public (save-event event)
   (define calendar (parent event))
 
-  (assert (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE)))
-
-  (let* ((uid (or (prop event 'UID) (uuidgen))))
-    (set! (prop event 'UID) uid
-      ;; TODO use existing filename if present?
-      (prop event '-X-HNH-FILENAME) (path-append
-                                      (prop calendar '-X-HNH-DIRECTORY)
-                                      (string-append uid ".ics")))
+  (unless calendar
+    (scm-error 'wrong-type-arg "save-event"
+               (_ "Can only save events belonging to calendars, event uid = ~s")
+               (list (prop event 'UID))
+               #f))
+
+  (unless (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE))
+    (scm-error 'wrong-type-arg "save-event"
+               (_ "Can only save events belonging to vdir calendars. Calendar is of type ~s")
+               (list (prop calendar '-X-HNH-SOURCETYPE))
+               #f))
+
+  (let* ((uid (or (prop event 'UID) (uuid))))
+    (set! (prop event 'UID) uid)
+    (unless (prop event 'X-HNH-FILENAME)
+      (set! (prop event '-X-HNH-FILENAME)
+        (path-append
+         (prop calendar '-X-HNH-DIRECTORY)
+         (string-append uid ".ics"))))
     (with-atomic-output-to-file (prop event '-X-HNH-FILENAME)
       (lambda () (print-components-with-fake-parent (list event))))
     uid))
@@ -37,5 +48,9 @@
 
 (define-public (remove-event event)
   (define calendar (parent event))
-  (assert (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE)))
+  (unless (eq? 'vdir (prop calendar '-X-HNH-SOURCETYPE))
+    (scm-error 'wrong-type-arg "remove-event"
+               (_ "Can only remove events belonging to vdir calendars. Calendar is of type ~s")
+               (list (prop calendar '-X-HNH-SOURCETYPE))
+               #f))
   (delete-file (prop event '-X-HNH-FILENAME)))