From 02cb5364bb441dc8265c32ad4042559e4f3be118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 26 Apr 2020 17:25:02 +0200 Subject: Move events-between. --- module/output/html.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/module/output/html.scm b/module/output/html.scm index 4d8ebc05..c5915723 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -113,6 +113,17 @@ (tablify rest width proc: proc))))) +;; date, date, [sorted-stream events] → [list events] +(define (events-between start-date end-date events) + (define (overlaps e) + (timespan-overlaps? start-date (date+ end-date (date day: 1)) + (attr e 'DTSTART) (attr e 'DTEND))) + + (stream-filter overlaps + (get-stream-interval + overlaps + (lambda (e) (not (date< end-date (as-date (attr e 'DTSTART))))) + events))) @@ -307,17 +318,6 @@ ,time ":00"))) (iota 12 0 2))))) -;; date, date, [sorted-stream events] → [list events] -(define (events-between start-date end-date events) - (define (overlaps e) - (timespan-overlaps? start-date (date+ end-date (date day: 1)) - (attr e 'DTSTART) (attr e 'DTEND))) - - (stream-filter overlaps - (get-stream-interval - overlaps - (lambda (e) (not (date< end-date (as-date (attr e 'DTSTART))))) - events))) (define*-public (render-calendar key: events start-date end-date #:allow-other-keys) -- cgit v1.2.3