diff --git a/cl/khal-notify.lisp b/cl/khal-notify.lisp index 649e19a..b3df98b 100644 --- a/cl/khal-notify.lisp +++ b/cl/khal-notify.lisp @@ -1,6 +1,5 @@ (eval-when (:compile-toplevel :load-toplevel :execute) - (ql:quickload '(with-user-abort chronicity - cl-ppcre adopt uiop) :silent t)) + (ql:quickload '(with-user-abort chronicity cl-ppcre adopt uiop) :silent t)) (defpackage :khal-notify (:use :cl) @@ -25,8 +24,9 @@ (defun get-calendar-dir-hash-table () (let ((output (make-hash-table :test 'equal))) - (dolist (dir (directory #P"~/.local/share/vdirsyncer/*.*/*.*") output) - (unless (pathname-match-p dir #P"~/.local/share/vdirsyncer/status/*.*/") + (dolist (dir (directory #P"~/.local/share/vdirsyncer/*/*.*") output) + (unless (uiop:subpathp dir (uiop:truename* + #P"~/.local/share/vdirsyncer/status/")) (let ((dir-name (car (last (pathname-directory dir))))) (setf (gethash dir-name output) dir)))))) @@ -72,16 +72,16 @@ current-notice "")) ((and in-valarm (uiop:string-prefix-p "TRIGGER:" line)) (ppcre:register-groups-bind - (negative (#'parse-integer num) unit) - (pattern (subseq line 8)) - (setq current-offset - (* (if (equal negative "-") -1 1) - (cond - ((equal unit "S") num) - ((equal unit "M") (* num 60)) - ((equal unit "H") (* num 60 60)) - ((equal unit "D") (* num 60 60 24)) - (t 0)))))) + (negative (#'parse-integer num) unit) + (pattern (subseq line 8)) + (setq current-offset + (* (if (equal negative "-") -1 1) + (cond + ((equal unit "S") num) + ((equal unit "M") (* num 60)) + ((equal unit "H") (* num 60 60)) + ((equal unit "D") (* num 60 60 24)) + (t 0)))))) ((and in-valarm (uiop:string-prefix-p "DESCRIPTION:" line)) (setq current-notice (subseq (process-escape-sequences (remove-trailing-return line)) @@ -181,4 +181,4 @@ (defun toplevel () (sb-ext:disable-debugger) (exit-on-ctrl-c - (main))) + (main)))