From 77791305d6e1483fa5ae46f26616242c00f99989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Fri, 4 Oct 2019 21:02:17 +0200 Subject: HTML output seems to work in full now. --- module/output/terminal.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'module/output/terminal.scm') diff --git a/module/output/terminal.scm b/module/output/terminal.scm index 67548537..a2c5486e 100644 --- a/module/output/terminal.scm +++ b/module/output/terminal.scm @@ -67,6 +67,7 @@ ;; I currently have no idea why, but it's BAD. (let ((groups (get-groups-between (group-stream event-stream) (time-utc->date time) (time-utc->date time)))) + (format (current-error-port) "len(groups) = ~a~%" (stream-length groups)) (let ((events (if (stream-null? groups) '() (group->event-list (stream-car groups))))) -- cgit v1.2.3 From 1bc8f0c31fd94b3936fc13ed325ecd8308d73f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sat, 5 Oct 2019 23:51:50 +0200 Subject: Fix day-stream, and in effect terminal output. --- module/output/terminal.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'module/output/terminal.scm') diff --git a/module/output/terminal.scm b/module/output/terminal.scm index a2c5486e..37fe1b86 100644 --- a/module/output/terminal.scm +++ b/module/output/terminal.scm @@ -62,10 +62,12 @@ (define-values (height width) (get-terminal-size)) + (define grouped-stream (group-stream event-stream)) + (while #t ;; TODO reusing the same grouping causes it to lose events. ;; I currently have no idea why, but it's BAD. - (let ((groups (get-groups-between (group-stream event-stream) + (let ((groups (get-groups-between grouped-stream (time-utc->date time) (time-utc->date time)))) (format (current-error-port) "len(groups) = ~a~%" (stream-length groups)) (let ((events @@ -157,5 +159,6 @@ (let ((time (date->time-utc (drop-time (or (and=> (option-ref opts 'date #f) parse-freeform-date) (current-date)))))) + ;; (format (current-error-port) "len(events) = ~a~%" (stream-length events)) (with-vulgar (lambda () (main-loop time events)))))) -- cgit v1.2.3 From feefb97cf9118c8e5d7018e33887a371dadc5eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 6 Oct 2019 13:35:20 +0200 Subject: Minor cleanup in scheme code. --- module/output/terminal.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/output/terminal.scm') diff --git a/module/output/terminal.scm b/module/output/terminal.scm index 37fe1b86..16ba31e9 100644 --- a/module/output/terminal.scm +++ b/module/output/terminal.scm @@ -138,7 +138,7 @@ (let ((ev ((@ (vcomponent primitive) %vcomponent-make) fname))) (serialize-vcomponent ev (current-error-port)) - (push-child! (parent (list-ref events cur-event)) ev) + (add-child! (parent (list-ref events cur-event)) ev) (format (current-error-port) "Children: ~a~%start: ~a~%" (children ev) (attr ev 'DTSTART)) (set! event-stream (stream-insert ev-time