From 831ee6e441e33bc4ce7a87aeb58de45efcadc807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 5 Nov 2019 11:37:33 +0100 Subject: Move remaining stuff out of vcomponent. --- module/vcomponent/recurrence/generate.scm | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'module/vcomponent/recurrence/generate.scm') diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index 6e022bcc..58961f5e 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -45,27 +45,27 @@ (define (next-event ev r) (let ((e (copy-vcomponent ev))) - (let-env ((TZ (and=> (prop (attr* e 'DTSTART) 'TZID) car)))) - - (let ((d (time-utc->date (attr e 'DTSTART))) - (i (interval r))) - (case (freq r) - ((SECONDLY) (mod! (second d) = (+ i))) - ((MINUTELY) (mod! (minute d) = (+ i))) - ((HOURLY) (mod! (hour d) = (+ i))) - ((DAILY) (mod! (day d) = (+ i))) - ((WEEKLY) (mod! (day d) = (+ (* i 7)))) - ((MONTHLY) (mod! (month d) = (+ i))) - ((YEARLY) (mod! (year d) = (+ i)))) - - (set! (zone-offset d) - (zone-offset (time-utc->date (date->time-utc d)))) - - (set! (attr e 'DTSTART) (date->time-utc d))) - - (when (attr e 'DTEND) - (set! (attr e 'DTEND) - (add-duration (attr e 'DTSTART) (attr e 'DURATION)))) + (let-env ((TZ (and=> (prop (attr* e 'DTSTART) 'TZID) car))) + + (let ((d (time-utc->date (attr e 'DTSTART))) + (i (interval r))) + (case (freq r) + ((SECONDLY) (mod! (second d) = (+ i))) + ((MINUTELY) (mod! (minute d) = (+ i))) + ((HOURLY) (mod! (hour d) = (+ i))) + ((DAILY) (mod! (day d) = (+ i))) + ((WEEKLY) (mod! (day d) = (+ (* i 7)))) + ((MONTHLY) (mod! (month d) = (+ i))) + ((YEARLY) (mod! (year d) = (+ i)))) + + (set! (zone-offset d) + (zone-offset (time-utc->date (date->time-utc d)))) + + (set! (attr e 'DTSTART) (date->time-utc d))) + + (when (attr e 'DTEND) + (set! (attr e 'DTEND) + (add-duration (attr e 'DTSTART) (attr e 'DURATION))))) e)) -- cgit v1.2.3