diff options
Diffstat (limited to 'module')
| -rwxr-xr-x | module/main.scm | 6 | ||||
| -rw-r--r-- | module/output/html.scm | 2 | ||||
| -rw-r--r-- | module/output/none.scm | 16 |
3 files changed, 3 insertions, 21 deletions
diff --git a/module/main.scm b/module/main.scm index 423daeb9..242883ea 100755 --- a/module/main.scm +++ b/module/main.scm @@ -19,7 +19,6 @@ exec guile -e main -s $0 "$@" (output html) (output terminal) - (output none) (output text) (output import) (output info) @@ -63,6 +62,7 @@ exec guile -e main -s $0 "$@" (file (value #t) (single-char #\f)) (output (value #t) (single-char #\o)) (format (value #f)) + (width (value #t) (single-char #\w)) (statprof (value optional)))) (define (ornull a b) @@ -82,14 +82,14 @@ exec guile -e main -s $0 "$@" (for-each (lambda (l) (display l) (newline)) (flow-text (with-input-from-port (open-input-port (option-ref opts 'file "-")) - (@ (ice-9 rdelim) read-string)))) + (@ (ice-9 rdelim) read-string)) + #:width (or (string->number (option-ref opts 'width "")) 70))) (init (lambda (c e) (let ((ropt (ornull (option-ref opts '() '()) '("term")))) ((case (string->symbol (car ropt)) - ((none) none-main) ((html) html-main) ((term) terminal-main) ((import) import-main) diff --git a/module/output/html.scm b/module/output/html.scm index cb3d07a5..adbea85e 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -270,5 +270,3 @@ (define end (parse-freeform-date (option-ref opts 'to "2019-05-10"))) (html-generate calendars events start end)) - - diff --git a/module/output/none.scm b/module/output/none.scm deleted file mode 100644 index e6fedd2d..00000000 --- a/module/output/none.scm +++ /dev/null @@ -1,16 +0,0 @@ -(define-module (output none) - #:use-module (vcomponent group) - #:use-module (srfi srfi-41) - #:use-module (srfi srfi-19) - #:use-module (srfi srfi-19 setters) - #:use-module (srfi srfi-19 util) - #:use-module (util) - #:export (none-main)) - -(define (none-main calendars events args) - (define date (drop-time (current-date))) - (let ((groups (get-groups-between (group-stream events) - date date))) - (unless (stream-null? groups) - (group->event-list - (stream-car groups))))) |