Merge branch 'restruct'

1 files changed, 6 insertions, 2 deletions

diff --git a/module/output/terminal.scm b/module/output/terminal.scm
index 67548537..16ba31e9 100644
--- a/module/output/terminal.scm
+++ b/module/output/terminal.scm
@@ -62,11 +62,14 @@
 
   (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
              (if (stream-null? groups)
                  '() (group->event-list (stream-car groups)))))
@@ -135,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<? ev event-stream)))))))
@@ -156,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))))))