diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 18:06:18 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 18:06:18 +0200 |
commit | b157c326fa2139529eee14781f39c9d3ab65668a (patch) | |
tree | 4b632256fd1689600cb7ca3e8322efab251eadd5 | |
parent | Move a bunch of files into calp module. (diff) | |
download | calp-b157c326fa2139529eee14781f39c9d3ab65668a.tar.gz calp-b157c326fa2139529eee14781f39c9d3ab65668a.tar.xz |
Start moving stuff out from output.
Diffstat (limited to '')
-rw-r--r-- | module/calp/entry-points/ical.scm | 2 | ||||
-rw-r--r-- | module/html/vcomponent.scm | 4 | ||||
-rw-r--r-- | module/output/html.scm | 0 | ||||
-rw-r--r-- | module/output/vdir.scm | 2 | ||||
-rw-r--r-- | module/server/routes.scm | 7 | ||||
-rw-r--r-- | module/vcomponent/ical/output.scm (renamed from module/output/ical.scm) | 2 | ||||
-rw-r--r-- | module/vcomponent/ical/parse.scm (renamed from module/vcomponent/parse/ical.scm) | 2 | ||||
-rw-r--r-- | module/vcomponent/parse.scm | 2 | ||||
-rw-r--r-- | module/vcomponent/xcal/output.scm (renamed from module/output/xcal.scm) | 2 | ||||
-rw-r--r-- | module/vcomponent/xcal/parse.scm (renamed from module/vcomponent/parse/xcal.scm) | 2 | ||||
-rw-r--r-- | tests/xcal.scm | 4 |
11 files changed, 14 insertions, 15 deletions
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm index 3bf211df..0b6a0535 100644 --- a/module/calp/entry-points/ical.scm +++ b/module/calp/entry-points/ical.scm @@ -2,7 +2,7 @@ :export (main) :use-module (util) :use-module (util options) - :use-module (output ical) + :use-module (vcomponent ical output) :use-module (ice-9 getopt-long) :use-module (datetime) ) diff --git a/module/html/vcomponent.scm b/module/html/vcomponent.scm index 6836e777..559b11c5 100644 --- a/module/html/vcomponent.scm +++ b/module/html/vcomponent.scm @@ -181,8 +181,8 @@ ,(string-map (lambda (c) (if (char=? c #\,) #\newline c)) (prop ev 'LOCATION))))) (div (@ (style "display:none !important;")) - ,((@ (output xcal) ns-wrap) - ((@ (output xcal) vcomponent->sxcal) + ,((@ (vcomponent xcal output) ns-wrap) + ((@ (vcomponent xcal output) vcomponent->sxcal) ev))))))) diff --git a/module/output/html.scm b/module/output/html.scm deleted file mode 100644 index e69de29b..00000000 --- a/module/output/html.scm +++ /dev/null diff --git a/module/output/vdir.scm b/module/output/vdir.scm index bd21fb24..2541f0f9 100644 --- a/module/output/vdir.scm +++ b/module/output/vdir.scm @@ -11,7 +11,7 @@ (define-module (output vdir) :use-module (util) - :use-module (output ical) + :use-module (vcomponent ical output) :use-module (vcomponent) :use-module ((util io) :select (with-atomic-output-to-file)) ) diff --git a/module/server/routes.scm b/module/server/routes.scm index 6c1d1fcd..142e0477 100644 --- a/module/server/routes.scm +++ b/module/server/routes.scm @@ -25,8 +25,7 @@ :use-module (vcomponent) :use-module (vcomponent search) :use-module (datetime) - ;; :use-module (output html) - :use-module (output ical) + :use-module (vcomponent ical output) :autoload (vcomponent instance) (global-event-object) @@ -194,7 +193,7 @@ ;; *TOP* node is a required part of the sxml. (let ((event - ((@ (vcomponent parse xcal) sxcal->vcomponent) + ((@ (vcomponent xcal parse) sxcal->vcomponent) (catch 'parser-error (lambda () (move-to-namespace @@ -336,7 +335,7 @@ ;; Look into changing how events carry around their ;; parent information, possibly splitting "source parent" ;; and "program parent" into different fields. - (lambda () (sxml->xml ((@ (output xcal) vcomponent->sxcal) it))))) + (lambda () (sxml->xml ((@ (vcomponent xcal output) vcomponent->sxcal) it))))) (return (build-response code: 404) (format #f "No component with UID=~a found." uid)))) diff --git a/module/output/ical.scm b/module/vcomponent/ical/output.scm index 45918be0..530203e6 100644 --- a/module/output/ical.scm +++ b/module/vcomponent/ical/output.scm @@ -1,4 +1,4 @@ -(define-module (output ical) +(define-module (vcomponent ical output) :use-module (ice-9 format) :use-module (ice-9 match) :use-module (util) diff --git a/module/vcomponent/parse/ical.scm b/module/vcomponent/ical/parse.scm index c4bb059f..2c01927b 100644 --- a/module/vcomponent/parse/ical.scm +++ b/module/vcomponent/ical/parse.scm @@ -1,4 +1,4 @@ -(define-module (vcomponent parse ical) +(define-module (vcomponent ical parse) :use-module (util) :use-module (util exceptions) :use-module ((ice-9 rdelim) :select (read-line)) diff --git a/module/vcomponent/parse.scm b/module/vcomponent/parse.scm index 56e62dad..67d66b02 100644 --- a/module/vcomponent/parse.scm +++ b/module/vcomponent/parse.scm @@ -16,7 +16,7 @@ :use-module (util exceptions) :use-module (vcomponent base) - :use-module (vcomponent parse ical) + :use-module (vcomponent ical parse) :re-export (parse-calendar) ) diff --git a/module/output/xcal.scm b/module/vcomponent/xcal/output.scm index b2c3f899..a689b2cf 100644 --- a/module/output/xcal.scm +++ b/module/vcomponent/xcal/output.scm @@ -1,4 +1,4 @@ -(define-module (output xcal) +(define-module (vcomponent xcal output) :use-module (util) :use-module (util exceptions) :use-module (vcomponent) diff --git a/module/vcomponent/parse/xcal.scm b/module/vcomponent/xcal/parse.scm index 2c8b7fe8..16e47e6f 100644 --- a/module/vcomponent/parse/xcal.scm +++ b/module/vcomponent/xcal/parse.scm @@ -1,4 +1,4 @@ -(define-module (vcomponent parse xcal) +(define-module (vcomponent xcal parse) :use-module (util) :use-module (util exceptions) :use-module (util base64) diff --git a/tests/xcal.scm b/tests/xcal.scm index f11ca1aa..33699016 100644 --- a/tests/xcal.scm +++ b/tests/xcal.scm @@ -1,5 +1,5 @@ -(((vcomponent parse xcal) sxcal->vcomponent) - ((vcomponent parse ical) parse-calendar) +(((vcomponent xcal parse) sxcal->vcomponent) + ((vcomponent ical parse) parse-calendar) ((output xcal) vcomponent->sxcal) ((util) ->) ((vcomponent base) |