diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-03-17 22:15:59 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-03-28 14:17:47 +0200 |
| commit | d4667f94fbd2927e1c76a06567a92dedf1213e43 (patch) | |
| tree | 1db96f4ee662f2b221790318feaa48b66044aa82 /module/vcomponent/formats/vdir/save-delete.scm | |
| parent | Use catch* where appropriate (diff) | |
| download | calp-d4667f94fbd2927e1c76a06567a92dedf1213e43.tar.gz calp-d4667f94fbd2927e1c76a06567a92dedf1213e43.tar.xz | |
Remove assert.
Barely used, and almost always was better server by a propper error
call.
Diffstat (limited to 'module/vcomponent/formats/vdir/save-delete.scm')
| -rw-r--r-- | module/vcomponent/formats/vdir/save-delete.scm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/module/vcomponent/formats/vdir/save-delete.scm b/module/vcomponent/formats/vdir/save-delete.scm index 7de9379b..8fdc615e 100644 --- a/module/vcomponent/formats/vdir/save-delete.scm +++ b/module/vcomponent/formats/vdir/save-delete.scm @@ -13,7 +13,6 @@ :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)) @@ -23,7 +22,11 @@ (define-public (save-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 "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 @@ -38,5 +41,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))) |