From 08d4886a82ccc371dac91ec1906fb99dcc1a828f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 17 Aug 2020 18:25:54 +0200 Subject: Errors not correct in this context. --- module/vcomponent/vdir/save-delete.scm | 44 +++++++++++----------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/module/vcomponent/vdir/save-delete.scm b/module/vcomponent/vdir/save-delete.scm index 02db9d7a..0bc9cb4a 100644 --- a/module/vcomponent/vdir/save-delete.scm +++ b/module/vcomponent/vdir/save-delete.scm @@ -17,39 +17,23 @@ ) -(define / file-name-separator-string) - (define-public (save-event event) (define calendar (parent event)) - (case (prop calendar '-X-HNH-SOURCETYPE) - [(file) - (error "Importing into direct calendar files not supported")] - - [(vdir) - (let* ((uid (or (prop event 'UID) (uuidgen)))) - (set! (prop event 'UID) uid - ;; TODO use existing filename if present? - (prop event '-X-HNH-FILENAME) (string-append - (prop calendar '-X-HNH-DIRECTORY) - / uid ".ics")) - (with-atomic-output-to-file (prop event '-X-HNH-FILENAME) - (lambda () (print-components-with-fake-parent (list event)))) - uid)] - - [else - (error "Source of calendar unknown, aborting.") - ])) + (assert 'vdir (prop calendar '-X-HNH-SOURCETYPE)) -(define-public (remove-event event) - (define calendar (parent event)) - (case (prop calendar '-X-HNH-SOURCETYPE) - [(file) - (error "Removing events from large files unsupported")] + (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"))) + (with-atomic-output-to-file (prop event '-X-HNH-FILENAME) + (lambda () (print-components-with-fake-parent (list event)))) + uid)) - [(vdir) - (delete-file (prop event '-X-HNH-FILENAME))] - [else - (error "Source of calendar unknown, aborting.") - ])) +(define-public (remove-event event) + (define calendar (parent event)) + (assert 'vdir (prop calendar '-X-HNH-SOURCETYPE)) + (delete-file (prop event '-X-HNH-FILENAME))) -- cgit v1.2.3