From 68647d3c1aa8130df878223638bc54c5d332cc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 3 Aug 2020 00:58:40 +0200
Subject: Move <events> methods to own module for easier loading.

---
 module/vcomponent/instance.scm         | 154 ++-------------------------------
 module/vcomponent/instance/methods.scm | 148 +++++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+), 148 deletions(-)
 create mode 100644 module/vcomponent/instance/methods.scm

(limited to 'module/vcomponent')

diff --git a/module/vcomponent/instance.scm b/module/vcomponent/instance.scm
index 575aeda0..a53cd3b3 100644
--- a/module/vcomponent/instance.scm
+++ b/module/vcomponent/instance.scm
@@ -1,158 +1,16 @@
 (define-module (vcomponent instance)
   :use-module (util)
-  :use-module (util config)
-  :use-module (srfi srfi-1)
-  :use-module (srfi srfi-41)
-  :use-module (srfi srfi-41 util)
-  :use-module (datetime)
-  :use-module (vcomponent base)
-  :use-module (vcomponent parse)
-  :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?))
-  :use-module ((vcomponent datetime) :select (ev-time<?))
-  :use-module (oop goops)
-  :export (add-event remove-event
+  :use-module ((util config) :select (get-config))
+  :use-module ((oop goops) :select (make))
+  :export (global-event-object)
+)
 
-                     global-event-object
-
-                     get-event-by-uid
-                     fixed-events-in-range
-
-                     get-event-set get-calendars
-                     get-fixed-events get-repeating-events
-                     ))
-
-(define-public (load-calendars calendar-files)
-  (map parse-cal-path calendar-files))
 
 
 
 
-;;; TODO both add- and remove-event sometimes crash with
-;;;;; Warning: Unwind-only `stack-overflow' exception; skipping pre-unwind handler.
-;;; I belive this is due to how getf and setf work.
-
-
-
-;; == vcomponent ==
-;; - calendar
-;; - events
-;; - repeating-events
-;; - fixed-events
-;; - event-set
-;; - uid-map
-
-
-
-(define-class <events> ()
-  (calendar-files init-keyword: calendar-files:)
-  (calendars getter: get-calendars)
-  (events getter: get-events)
-  (repeating-events getter: get-repeating-events)
-  (fixed-events getter: get-fixed-events)
-  (event-set getter: get-event-set)
-  uid-map
-  )
-
-
-(define (get-event-by-uid uid)
-  (hash-ref (slot-ref global-event-object 'uid-map) uid))
-
-
-
-(define-method (fixed-events-in-range (this <events>) start end)
-  (filter-sorted (lambda (ev) ((in-date-range? start end)
-                          (as-date (prop ev 'DTSTART))))
-                 (slot-ref this 'fixed-events)))
-
-
-(define-method (initialize (this <events>) args)
-  (next-method)
-
-  (format (current-error-port) "Building <events> from ~a~%"
-          (slot-ref this 'calendar-files))
-
-  (slot-set! this 'calendars (load-calendars (slot-ref this 'calendar-files)))
-
-  (slot-set! this 'events
-             (concatenate
-              (map (lambda (cal) (remove
-                             (extract 'X-HNH-REMOVED)
-                             (filter (lambda (o) (eq? 'VEVENT (type o)))
-                                     (children cal))))
-                   (slot-ref this 'calendars))))
-
-  (let* ((repeating regular (partition repeating? (slot-ref this 'events))))
-    (slot-set! this 'fixed-events     (sort*! regular   date/-time<? (extract 'DTSTART)))
-    (slot-set! this 'repeating-events (sort*! repeating date/-time<? (extract 'DTSTART))))
-
-
-  (slot-set! this 'event-set
-             (interleave-streams
-              ev-time<?
-              (cons (list->stream (slot-ref this 'fixed-events))
-                    (map generate-recurrence-set (slot-ref this 'repeating-events)))))
-
-  (slot-set! this 'uid-map
-             (let ((ht (make-hash-table)))
-               (for-each (lambda (event) (hash-set! ht (prop event 'UID) event))
-                         (slot-ref this 'events))
-               ht)))
-
-;;; TODO what should happen when an event with that UID already exists
-;;; in the calendar? Fail? Overwrite? Currently it adds a second element
-;;; with the same UID, which is BAD.
-(define-method (add-event (this <events>) calendar event)
-
-  (add-child! calendar event)
-  (unless (prop event 'UID)
-    (set! (prop event 'UID) (uuidgen)))
-
-
-
-
-  (slot-set! this 'events
-             (cons event (slot-ref this 'events)))
-
-  (let* ((slot-name (if (repeating? event) 'repeating-events 'fixed-events))
-         (events (slot-ref this slot-name)))
-    (slot-set! this slot-name (insert-ordered event events ev-time<?)))
-
-  (slot-set! this 'event-set
-             (interleave-streams
-              ev-time<?
-              (list (if (repeating? event)
-                        (generate-recurrence-set event)
-                        (stream event))
-                    (slot-ref this 'event-set))))
-
-  (hash-set! (slot-ref this 'uid-map) (prop event 'UID)
-             event)
-
-  (prop event 'UID))
-
-
-
-
-(define-method (remove-event (this <events>) event)
-  (slot-set! this 'events (delete event (slot-ref this 'events)))
-
-  (let ((slot-name (if (repeating? event) 'repeating-events 'fixed-events)))
-    (slot-set! this slot-name
-               (delete event (slot-ref this slot-name))))
-
-  (slot-set! this 'event-set
-             (stream-remove
-              (lambda (ev)
-                (equal? (prop ev 'UID)
-                        (prop event 'UID)))
-              (slot-ref this 'event-set)))
-
-  (hash-set! (slot-ref this 'uid-map) (prop event 'UID)
-             #f))
-
-
-
 ;; this is loaded on compile, meaning that Guile's auto-compiler may
 ;; evaluate this to early.
 (define-once global-event-object
-  (make <events> calendar-files: (get-config 'calendar-files)))
+  (make (@@ (vcomponent instance methods) <events>)
+    calendar-files: (get-config 'calendar-files)))
diff --git a/module/vcomponent/instance/methods.scm b/module/vcomponent/instance/methods.scm
new file mode 100644
index 00000000..49cc3ed2
--- /dev/null
+++ b/module/vcomponent/instance/methods.scm
@@ -0,0 +1,148 @@
+(define-module (vcomponent instance methods)
+  :use-module (util)
+  :use-module (srfi srfi-1)
+  :use-module (srfi srfi-41)
+  :use-module (srfi srfi-41 util)
+  :use-module (datetime)
+  :use-module (vcomponent base)
+  :use-module (vcomponent parse)
+  :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?))
+  :use-module ((vcomponent datetime) :select (ev-time<?))
+  :use-module (oop goops)
+
+  :export (add-event
+           remove-event
+
+           get-event-by-uid
+           fixed-events-in-range
+
+           get-event-set get-calendars
+           get-fixed-events get-repeating-events
+           ))
+
+(define-public (load-calendars calendar-files)
+  (map parse-cal-path calendar-files))
+
+;;; TODO both add- and remove-event sometimes crash with
+;;;;; Warning: Unwind-only `stack-overflow' exception; skipping pre-unwind handler.
+;;; I belive this is due to how getf and setf work.
+
+
+
+;; == vcomponent ==
+;; - calendar
+;; - events
+;; - repeating-events
+;; - fixed-events
+;; - event-set
+;; - uid-map
+
+
+
+(define-class <events> ()
+  (calendar-files init-keyword: calendar-files:)
+  (calendars getter: get-calendars)
+  (events getter: get-events)
+  (repeating-events getter: get-repeating-events)
+  (fixed-events getter: get-fixed-events)
+  (event-set getter: get-event-set)
+  uid-map
+  )
+
+
+(define-method (get-event-by-uid (this <events>) uid)
+  (hash-ref (slot-ref this 'uid-map) uid))
+
+
+
+(define-method (fixed-events-in-range (this <events>) start end)
+  (filter-sorted (lambda (ev) ((in-date-range? start end)
+                          (as-date (prop ev 'DTSTART))))
+                 (slot-ref this 'fixed-events)))
+
+
+(define-method (initialize (this <events>) args)
+  (next-method)
+
+  (format (current-error-port) "Building <events> from ~a~%"
+          (slot-ref this 'calendar-files))
+
+  (slot-set! this 'calendars (load-calendars (slot-ref this 'calendar-files)))
+
+  (slot-set! this 'events
+             (concatenate
+              (map (lambda (cal) (remove
+                             (extract 'X-HNH-REMOVED)
+                             (filter (lambda (o) (eq? 'VEVENT (type o)))
+                                     (children cal))))
+                   (slot-ref this 'calendars))))
+
+  (let* ((repeating regular (partition repeating? (slot-ref this 'events))))
+    (slot-set! this 'fixed-events     (sort*! regular   date/-time<? (extract 'DTSTART)))
+    (slot-set! this 'repeating-events (sort*! repeating date/-time<? (extract 'DTSTART))))
+
+
+  (slot-set! this 'event-set
+             (interleave-streams
+              ev-time<?
+              (cons (list->stream (slot-ref this 'fixed-events))
+                    (map generate-recurrence-set (slot-ref this 'repeating-events)))))
+
+  (slot-set! this 'uid-map
+             (let ((ht (make-hash-table)))
+               (for-each (lambda (event) (hash-set! ht (prop event 'UID) event))
+                         (slot-ref this 'events))
+               ht)))
+
+;;; TODO what should happen when an event with that UID already exists
+;;; in the calendar? Fail? Overwrite? Currently it adds a second element
+;;; with the same UID, which is BAD.
+(define-method (add-event (this <events>) calendar event)
+
+  (add-child! calendar event)
+  (unless (prop event 'UID)
+    (set! (prop event 'UID) (uuidgen)))
+
+
+
+
+  (slot-set! this 'events
+             (cons event (slot-ref this 'events)))
+
+  (let* ((slot-name (if (repeating? event) 'repeating-events 'fixed-events))
+         (events (slot-ref this slot-name)))
+    (slot-set! this slot-name (insert-ordered event events ev-time<?)))
+
+  (slot-set! this 'event-set
+             (interleave-streams
+              ev-time<?
+              (list (if (repeating? event)
+                        (generate-recurrence-set event)
+                        (stream event))
+                    (slot-ref this 'event-set))))
+
+  (hash-set! (slot-ref this 'uid-map) (prop event 'UID)
+             event)
+
+  (prop event 'UID))
+
+
+
+
+(define-method (remove-event (this <events>) event)
+  (slot-set! this 'events (delete event (slot-ref this 'events)))
+
+  (let ((slot-name (if (repeating? event) 'repeating-events 'fixed-events)))
+    (slot-set! this slot-name
+               (delete event (slot-ref this slot-name))))
+
+  (slot-set! this 'event-set
+             (stream-remove
+              (lambda (ev)
+                (equal? (prop ev 'UID)
+                        (prop event 'UID)))
+              (slot-ref this 'event-set)))
+
+  (hash-set! (slot-ref this 'uid-map) (prop event 'UID)
+             #f))
+
-- 
cgit v1.2.3