diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-05-19 22:36:30 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-05-19 22:36:30 +0200 |
| commit | 118a9b0265b0d4283e790ed27402372dceaf32bd (patch) | |
| tree | 58b106a4a098bdeacd94514542c9bcd1df43f7ab /module/vcomponent.scm | |
| parent | date=, datetime=, time= any number of arguments. (diff) | |
| download | calp-118a9b0265b0d4283e790ed27402372dceaf32bd.tar.gz calp-118a9b0265b0d4283e790ed27402372dceaf32bd.tar.xz | |
Inline badly named function.
Diffstat (limited to 'module/vcomponent.scm')
| -rw-r--r-- | module/vcomponent.scm | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/module/vcomponent.scm b/module/vcomponent.scm index aaaf5d36..ab850963 100644 --- a/module/vcomponent.scm +++ b/module/vcomponent.scm @@ -18,15 +18,6 @@ (re-export-modules (vcomponent base)) -;; TODO rename function -(define (calculate-recurrence-set regular repeating) - (interleave-streams - ev-time<? - (cons (list->stream regular) - (map (@ (vcomponent recurrence) generate-recurrence-set) repeating) - ))) - - (define-method (init-app calendar-files) (setf 'calendars (load-calendars calendar-files)) @@ -51,9 +42,11 @@ (setf 'fixed-events (car (getf 'fixed-and-repeating-events))) (setf 'repeating-events (cadr (getf 'fixed-and-repeating-events))) - (setf 'event-set (calculate-recurrence-set - (getf 'fixed-events) - (getf 'repeating-events))) + (setf 'event-set + (interleave-streams + ev-time<? + (cons (list->stream (getf 'fixed-events)) + (map generate-recurrence-set (getf 'repeating-events))))) (setf 'uid-map (let ((ht (make-hash-table))) |