Fix known bugs, yay safety 0 (thanks cl-ppcre)

mailfilter-parse.lisp

@@ -98,15 +98,16 @@
 (defun get-regex (line)
   (second (split-sequence:split-sequence #\/ line)))
 
-(defun make-regex-hash (regex)
+(defun make-regex-hash (regex scanner)
   (let ((regex-hash (make-hash-table :test 'equal)))
-    (setf (gethash "regex" regex-hash) regex)
+    (setf (gethash "regex" regex-hash) (list regex scanner))
     regex-hash))
 
 (defun parse-if-line (line hash)
   (if (test-for-if line)
-      (let* ((regex (cl-ppcre:create-scanner (get-regex line)))
-             (regex-hash (make-regex-hash regex)))
+      (let* ((regex (get-regex line))
+             (scanner (cl-ppcre:create-scanner regex))
+             (regex-hash (make-regex-hash regex scanner)))
         (setf (gethash "patterns" hash) (append (gethash "patterns" hash) (list regex-hash)))
         regex-hash)))
 
@@ -126,27 +127,23 @@
     hash))
 
 (defun message-match (message pattern)
-  (let* ((scanner (gethash "regex" pattern))
+  (let* ((scanner (cadr (gethash "regex" pattern)))
+         (regex (car (gethash "regex" pattern)))
          (sb-impl::*default-external-format* :latin-1)
          (test))
     (with-open-stream (message-stream (mel:message-header-stream message))
       (loop for line = (read-line message-stream nil)
             while (and line (not test))
             do
-               (with-open-file (*standard-output*
-                                "/tmp/debug_data"
-                                :direction :output
-                                :if-exists :supersede)
-                 (princ line))
-               (setf test (funcall scanner line))))
-    pattern))
+               (setf test (cl-ppcre:scan scanner line))))
+    test))
 
 (defun handle-command (command args message)
   (when (string= command "to")
     (let* ((pathname (pathname (concatenate 'string (remove #\" (car args)) "/")))
-           (new-folder (mel:make-maildir-folder pathname))
+           (new-folder (mel:make-maildir-folder pathname :if-does-not-exist :create))
            (sb-impl::*default-external-format* :latin-1))
-      (mel:copy-message message new-folder))))
+      (mel:move-message message new-folder))))
 
 (defun handle-message (message patterns)
   (labels ((my-message-match (pattern) (message-match message pattern)))