From 785f70a3d16e549e36b8ef17f081829fe492a193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@hornquist.se>
Date: Thu, 3 Oct 2019 22:02:03 +0200
Subject: Locate bug with DTEND.

---
 module/main.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'module/main.scm')

diff --git a/module/main.scm b/module/main.scm
index 4e75bbf9..2b0fde23 100755
--- a/module/main.scm
+++ b/module/main.scm
@@ -46,7 +46,9 @@ exec guile -e main -s $0 "$@"
 ;; Given as a sepparate function from main to ease debugging.
 (define* (init proc #:key (calendar-files (calendar-files)))
   (define calendars (map make-vcomponent calendar-files))
-  (define events (concatenate (map (cut children <> 'VEVENT) calendars)))
+  (define events (concatenate (map (lambda (cal) (filter (lambda (o) (eq? 'VEVENT (type o)))
+                                                    (children cal)))
+                                   calendars)))
 
   (let* ((repeating regular (partition repeating? events)))
 
-- 
cgit v1.2.3


From 77791305d6e1483fa5ae46f26616242c00f99989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@hornquist.se>
Date: Fri, 4 Oct 2019 21:02:17 +0200
Subject: HTML output seems to work in full now.

---
 module/main.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'module/main.scm')

diff --git a/module/main.scm b/module/main.scm
index 2b0fde23..ce327f39 100755
--- a/module/main.scm
+++ b/module/main.scm
@@ -46,9 +46,11 @@ exec guile -e main -s $0 "$@"
 ;; Given as a sepparate function from main to ease debugging.
 (define* (init proc #:key (calendar-files (calendar-files)))
   (define calendars (map make-vcomponent calendar-files))
-  (define events (concatenate (map (lambda (cal) (filter (lambda (o) (eq? 'VEVENT (type o)))
-                                                    (children cal)))
-                                   calendars)))
+  (define events (concatenate
+                  ;; TODO does this drop events?
+                  (map (lambda (cal) (filter (lambda (o) (eq? 'VEVENT (type o)))
+                                        (children cal)))
+                       calendars)))
 
   (let* ((repeating regular (partition repeating? events)))
 
-- 
cgit v1.2.3


From f6823f7c06cda1e27f374e6b10bc9fccd9e855d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@hornquist.se>
Date: Tue, 29 Oct 2019 17:40:51 +0100
Subject: Move env init out from main.scm.

---
 module/main.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'module/main.scm')

diff --git a/module/main.scm b/module/main.scm
index ce327f39..dbd8ae35 100755
--- a/module/main.scm
+++ b/module/main.scm
@@ -1,14 +1,7 @@
 #!/bin/bash
 # -*- mode: scheme -*-
 
-root=$(dirname $(dirname $(realpath $0)))
-
-GUILE_LOAD_PATH="$root/module:$GUILE_LOAD_PATH"
-GUILE_LOAD_COMPILED_PATH="$root/obj/module:$GUILE_LOAD_COMPILED_PATH"
-LD_LIBRARY_PATH="$root/lib:$LD_LIBRARY_PATH"
-
-export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH LD_LIBRARY_PATH
-export GUILE_AUTO_COMPILE=0
+. $(dirname $(dirname $(realpath $0)))/env
 
 exec guile -e main -s $0 "$@"
 !#
-- 
cgit v1.2.3


From c852afb7efd07c6d414d0904be68c29a2bd20e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@hornquist.se>
Date: Tue, 29 Oct 2019 18:50:56 +0100
Subject: Start work on ical output.

---
 module/main.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'module/main.scm')

diff --git a/module/main.scm b/module/main.scm
index dbd8ae35..f765496f 100755
--- a/module/main.scm
+++ b/module/main.scm
@@ -23,6 +23,7 @@ exec guile -e main -s $0 "$@"
              (output text)
              (output import)
              (output info)
+             (output ical)
              (server)
 
              (ice-9 getopt-long)
@@ -93,6 +94,7 @@ exec guile -e main -s $0 "$@"
                   ((term) terminal-main)
                   ((import) import-main)
                   ((info) info-main)
+                  ((ical) ical-main)
                   ((server) server-main))
                 c e ropt)))
            calendar-files: (or (and=> (option-ref opts 'file #f)
-- 
cgit v1.2.3


From 275dfc4b4fc7bd8ad3244dbd6c9053fe1ceb7f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@hornquist.se>
Date: Sun, 3 Nov 2019 13:39:57 +0100
Subject: Remove make-vcomponent.

---
 module/main.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/main.scm')

diff --git a/module/main.scm b/module/main.scm
index f765496f..423daeb9 100755
--- a/module/main.scm
+++ b/module/main.scm
@@ -39,7 +39,7 @@ exec guile -e main -s $0 "$@"
 ;;
 ;; Given as a sepparate function from main to ease debugging.
 (define* (init proc #:key (calendar-files (calendar-files)))
-  (define calendars (map make-vcomponent calendar-files))
+  (define calendars (map parse-calendar calendar-files))
   (define events (concatenate
                   ;; TODO does this drop events?
                   (map (lambda (cal) (filter (lambda (o) (eq? 'VEVENT (type o)))
-- 
cgit v1.2.3