diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-01 21:01:17 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-01 21:01:17 +0200 |
commit | 6c37a4c00cd420e50d0cd2ad088268bcbb3d9155 (patch) | |
tree | f5c0052c1cfa1c2a9019f83f7d93d04418379d7a /module/vcomponent/load.scm | |
parent | Add set-config! and get-config, along with print for debug. (diff) | |
download | calp-6c37a4c00cd420e50d0cd2ad088268bcbb3d9155.tar.gz calp-6c37a4c00cd420e50d0cd2ad088268bcbb3d9155.tar.xz |
Update remaining code to use new config scheme.
Diffstat (limited to '')
-rw-r--r-- | module/vcomponent/load.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/module/vcomponent/load.scm b/module/vcomponent/load.scm index d4324437..8e11c9b2 100644 --- a/module/vcomponent/load.scm +++ b/module/vcomponent/load.scm @@ -2,6 +2,7 @@ :export (load-calendars load-calendars*) :use-module (util) :use-module (util time) + :use-module (util config) :use-module (srfi srfi-1) :use-module (datetime) :use-module (datetime util) @@ -14,11 +15,11 @@ :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?)) :use-module ((vcomponent datetime) :select (ev-time<?))) -(register-config! calendar-files '() (ensure list?)) +(define-config calendar-files '() "" (ensure list?)) ;; Reads all calendar files from disk, generate recurence-sets for all repeating events, ;; and returns a list of calendars, and a stream of all events "ready" for display. -(define* (load-calendars #:key (calendar-files (calendar-files))) +(define* (load-calendars #:optional (calendar-files (get-config 'calendar-files))) (report-time! "Parsing ~a calendars" (length calendar-files)) (let* ((calendars regular repeating (load-calendars* #:calendar-files calendar-files))) (report-time! "Calendars loaded, interleaving and reccurring") @@ -34,7 +35,7 @@ ;; regular and repeating events separated from each other. ;; ;; (list string) → (list calendar), (list event), (list event) -(define* (load-calendars* #:key (calendar-files (calendar-files))) +(define* (load-calendars* #:key (calendar-files (get-config 'calendar-files))) (define calendars (map parse-cal-path calendar-files)) (define events (concatenate |