X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmail-source.el;h=8d73bc669ac62ea05494bf272fd5d91e762ab03e;hb=282cd2b8d909a2c50b8b0b02efe8c8f3acc3e065;hp=bb7590df861785e01f51cf2f7f7d658ed8425879;hpb=9b2fb1b90d4ff43730e19ffbfd10f5f91f98a2e9;p=elisp%2Fgnus.git-

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index bb7590d..8d73bc6 100644
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -34,6 +34,12 @@
   "The mail-fetching library."
   :group 'gnus)
 
+(defcustom mail-sources nil
+  "*Where the mail backends will look for incoming mail.
+This variable is a list of mail source specifiers."
+  :group 'mail-source
+  :type 'sexp)
+
 (defcustom mail-source-crash-box "~/.emacs-mail-crash-box"
   "File where mail will be stored while processing it."
   :group 'mail-source
@@ -49,7 +55,7 @@
   :group 'mail-source
   :type 'integer)
 
-(defcustom mail-source-delete-incoming nil
+(defcustom mail-source-delete-incoming t
   "*If non-nil, delete incoming files after handling."
   :group 'mail-source
   :type 'boolean)
@@ -60,8 +66,16 @@
   "A dynamically bound string that says what the current mail source is.")
 
 (eval-and-compile
+  (defvar mail-source-common-keyword-map
+    '((:plugged))
+    "Mapping from keywords to default values.
+Common keywords should be listed here.")
+
   (defvar mail-source-keyword-map
     '((file
+       (:prescript)
+       (:prescript-delay)
+       (:postscript)
        (:path (or (getenv "MAIL")
 		  (concat "/usr/spool/mail/" (user-login-name)))))
       (directory
@@ -70,6 +84,7 @@
        (:predicate identity))
       (pop
        (:prescript)
+       (:prescript-delay)
        (:postscript)
        (:server (getenv "MAILHOST"))
        (:port 110)
@@ -79,7 +94,24 @@
        (:password)
        (:authentication password))
       (maildir
-       (:path "~/Maildir/new/")))
+       (:path "~/Maildir/new/")
+       (:function))
+      (imap
+       (:server (getenv "MAILHOST"))
+       (:port)
+       (:stream)
+       (:authentication)
+       (:user (or (user-login-name) (getenv "LOGNAME") (getenv "USER")))
+       (:password)
+       (:mailbox "INBOX")
+       (:predicate "UNSEEN UNDELETED")
+       (:fetchflag "\\Deleted")
+       (:dontexpunge))
+      (webmail
+       (:subtype hotmail)
+       (:user (or (user-login-name) (getenv "LOGNAME") (getenv "USER")))
+       (:password)
+       (:authentication password)))
     "Mapping from keywords to default values.
 All keywords that can be used must be listed here."))
 
@@ -87,11 +119,15 @@ All keywords that can be used must be listed here."))
   '((file mail-source-fetch-file)
     (directory mail-source-fetch-directory)
     (pop mail-source-fetch-pop)
-    (maildir mail-source-fetch-maildir))
+    (maildir mail-source-fetch-maildir)
+    (imap mail-source-fetch-imap)
+    (webmail mail-source-fetch-webmail))
   "A mapping from source type to fetcher function.")
 
 (defvar mail-source-password-cache nil)
 
+(defvar mail-source-plugged t)
+
 ;;; Functions
 
 (eval-and-compile
@@ -139,6 +175,39 @@ the `mail-source-keyword-map' variable."
 	       (mail-source-value value)
 	     (mail-source-value (cadr default)))))))
 
+(eval-and-compile
+  (defun mail-source-bind-common-1 ()
+    (let* ((defaults mail-source-common-keyword-map)
+	   default bind)
+      (while (setq default (pop defaults))
+	(push (list (mail-source-strip-keyword (car default))
+		    nil)
+	      bind))
+      bind)))
+
+(defun mail-source-set-common-1 (source)
+  (let* ((type (pop source))
+	 (defaults mail-source-common-keyword-map)
+	 (defaults-1 (cdr (assq type mail-source-keyword-map)))
+	 default value keyword)
+    (while (setq default (pop defaults))
+      (set (mail-source-strip-keyword (setq keyword (car default)))
+	   (if (setq value (plist-get source keyword))
+	       (mail-source-value value)
+	     (if (setq value (assq  keyword defaults-1))
+		 (mail-source-value (cadr value))
+	       (mail-source-value (cadr default))))))))
+
+(defmacro mail-source-bind-common (source &rest body)
+  "Return a `let' form that binds all common variables.
+See `mail-source-bind'."
+  `(let ,(mail-source-bind-common-1)
+     (mail-source-set-common-1 source)
+     ,@body))
+
+(put 'mail-source-bind-common 'lisp-indent-function 1)
+(put 'mail-source-bind-common 'edebug-form-spec '(form body))
+
 (defun mail-source-value (value)
   "Return the value of VALUE."
   (cond
@@ -158,17 +227,26 @@ the `mail-source-keyword-map' variable."
 CALLBACK will be called with the name of the file where (some of)
 the mail from SOURCE is put.
 Return the number of files that were found."
-  (save-excursion
-    (let ((function (cadr (assq (car source) mail-source-fetcher-alist)))
-	  (found 0))
-      (unless function
-	(error "%S is an invalid mail source specification" source))
-      ;; If there's anything in the crash box, we do it first.
-      (when (file-exists-p mail-source-crash-box)
-	(message "Processing mail from %s..." mail-source-crash-box)
-	(setq found (mail-source-callback
-		     callback mail-source-crash-box)))
-      (+ found (funcall function source callback)))))
+  (mail-source-bind-common source
+    (if (or mail-source-plugged plugged)
+	(save-excursion
+	  (let ((function (cadr (assq (car source) mail-source-fetcher-alist)))
+		(found 0))
+	    (unless function
+	      (error "%S is an invalid mail source specification" source))
+	    ;; If there's anything in the crash box, we do it first.
+	    (when (file-exists-p mail-source-crash-box)
+	      (message "Processing mail from %s..." mail-source-crash-box)
+	      (setq found (mail-source-callback
+			   callback mail-source-crash-box)))
+	    (+ found
+	       (condition-case err
+		   (funcall function source callback)
+		 (error
+		  (unless (yes-or-no-p
+			   (format "Mail source error (%s).  Continue? " err))
+		    (error "Cannot get new mail."))
+		  0))))))))
 
 (defun mail-source-make-complex-temp-name (prefix)
   (let ((newname (make-temp-name prefix))
@@ -187,19 +265,19 @@ Pass INFO on to CALLBACK."
 	(when (file-exists-p mail-source-crash-box)
 	  (delete-file mail-source-crash-box))
 	0)
-    (funcall callback mail-source-crash-box info)
-    (when (file-exists-p mail-source-crash-box)
-      ;; Delete or move the incoming mail out of the way.
-      (if mail-source-delete-incoming
-	  (delete-file mail-source-crash-box)
-	(let ((incoming
-	       (mail-source-make-complex-temp-name
-		(expand-file-name
-		 "Incoming" mail-source-directory))))
-	  (unless (file-exists-p (file-name-directory incoming))
-	    (make-directory (file-name-directory incoming) t))
-	  (rename-file mail-source-crash-box incoming t))))
-    1))
+    (prog1
+	(funcall callback mail-source-crash-box info)
+      (when (file-exists-p mail-source-crash-box)
+	;; Delete or move the incoming mail out of the way.
+	(if mail-source-delete-incoming
+	    (delete-file mail-source-crash-box)
+	  (let ((incoming
+		 (mail-source-make-complex-temp-name
+		  (expand-file-name
+		   "Incoming" mail-source-directory))))
+	    (unless (file-exists-p (file-name-directory incoming))
+	      (make-directory (file-name-directory incoming) t))
+	    (rename-file mail-source-crash-box incoming t)))))))
 
 (defun mail-source-movemail (from to)
   "Move FROM to TO using movemail."
@@ -267,6 +345,12 @@ Pass INFO on to CALLBACK."
       ;; Return whether we moved successfully or not.
       to)))
 
+(defun mail-source-movemail-and-remove (from to)
+  "Move FROM to TO using movemail, then remove FROM if empty."
+  (or (not (mail-source-movemail from to))
+      (not (zerop (nth 7 (file-attributes from))))
+      (delete-file from)))
+
 (defvar mail-source-read-passwd nil)
 (defun mail-source-read-passwd (prompt &rest args)
   "Read a password using PROMPT.
@@ -287,6 +371,23 @@ If ARGS, PROMPT is used as an argument to `format'."
   (zerop (call-process shell-file-name nil nil nil
 		       shell-command-switch program)))
 
+(defun mail-source-run-script (script spec &optional delay)
+  (when script
+    (if (and (symbolp script) (fboundp script))
+	(funcall script)
+      (mail-source-call-script
+       (format-spec script spec))))
+  (when delay
+    (sleep-for delay)))
+
+(defun mail-source-call-script (script)
+  (let ((background nil))
+    (when (string-match "& *$" script)
+      (setq script (substring script 0 (match-beginning 0))
+	    background 0))
+    (call-process shell-file-name nil background nil
+		  shell-command-switch script)))
+
 ;;;
 ;;; Different fetchers
 ;;;
@@ -294,9 +395,15 @@ If ARGS, PROMPT is used as an argument to `format'."
 (defun mail-source-fetch-file (source callback)
   "Fetcher for single-file sources."
   (mail-source-bind (file source)
+    (mail-source-run-script
+     prescript (format-spec-make ?t mail-source-crash-box)
+     prescript-delay)
     (let ((mail-source-string (format "file:%s" path)))
       (if (mail-source-movemail path mail-source-crash-box)
-	  (mail-source-callback callback path)
+	  (prog1
+	      (mail-source-callback callback path)
+	    (mail-source-run-script
+	     postscript (format-spec-make ?t mail-source-crash-box)))
 	0))))
 
 (defun mail-source-fetch-directory (source callback)
@@ -315,26 +422,20 @@ If ARGS, PROMPT is used as an argument to `format'."
 (defun mail-source-fetch-pop (source callback)
   "Fetcher for single-file sources."
   (mail-source-bind (pop source)
-    (when prescript
-      (if (fboundp prescript)
-	  (funcall prescript)
-	(call-process shell-file-name nil nil nil
-		      shell-command-switch 
-		      (format-spec
-		       prescript
-		       (format-spec-make ?p password ?t mail-source-crash-box
-					 ?s server ?P port ?u user)))))
+    (mail-source-run-script
+     prescript
+     (format-spec-make ?p password ?t mail-source-crash-box
+				      ?s server ?P port ?u user)
+     prescript-delay)
     (let ((from (format "%s:%s:%s" server user port))
 	  (mail-source-string (format "pop:%s@%s" user server))
 	  result)
-      (when (not (eq authentication 'apop))
+      (when (eq authentication 'password)
 	(setq password
 	      (or password
 		  (cdr (assoc from mail-source-password-cache))
 		  (mail-source-read-passwd
-		   (format "Password for %s at %s: " user server))))
-	(unless (assoc from mail-source-password-cache)
-	  (push (cons from password) mail-source-password-cache)))
+		   (format "Password for %s at %s: " user server)))))
       (when server
 	(setenv "MAILHOST" server))
       (setq result
@@ -357,18 +458,16 @@ If ARGS, PROMPT is used as an argument to `format'."
 		     (if (eq authentication 'apop) 'apop 'pass)))
 		(save-excursion (pop3-movemail mail-source-crash-box))))))
       (if result
-	  (prog1
-	      (mail-source-callback callback server)
-	    (when prescript
-	      (if (fboundp prescript)
-		  (funcall prescript)
-		(call-process shell-file-name nil nil nil
-			      shell-command-switch 
-			      (format-spec
-			       postscript
-			       (format-spec-make
-				?p password ?t mail-source-crash-box
-				?s server ?P port ?u user))))))
+	  (progn
+	    (when (eq authentication 'password)
+	      (unless (assoc from mail-source-password-cache)
+		(push (cons from password) mail-source-password-cache)))
+	    (prog1
+		(mail-source-callback callback server)
+	      (mail-source-run-script
+	       postscript
+	       (format-spec-make ?p password ?t mail-source-crash-box
+				 ?s server ?P port ?u user))))
 	;; We nix out the password in case the error
 	;; was because of a wrong password being given.
 	(setq mail-source-password-cache
@@ -382,11 +481,77 @@ If ARGS, PROMPT is used as an argument to `format'."
     (let ((found 0)
 	  (mail-source-string (format "maildir:%s" path)))
       (dolist (file (directory-files path t))
-	(when (and (file-regular-p file)
-		   (not (rename-file file mail-source-crash-box)))
+	(when (and (not (file-directory-p file))
+		   (not (if function
+			    (funcall function file mail-source-crash-box)
+			  (rename-file file mail-source-crash-box))))
 	  (incf found (mail-source-callback callback file))))
       found)))
 
+(eval-and-compile
+  (autoload 'imap-open "imap")
+  (autoload 'imap-authenticate "imap")
+  (autoload 'imap-mailbox-select "imap")
+  (autoload 'imap-mailbox-unselect "imap")
+  (autoload 'imap-mailbox-close "imap")
+  (autoload 'imap-search "imap")
+  (autoload 'imap-fetch "imap")
+  (autoload 'imap-close "imap")
+  (autoload 'imap-error-text "imap")
+  (autoload 'imap-message-flags-add "imap")
+  (autoload 'imap-list-to-message-set "imap")
+  (autoload 'nnheader-ms-strip-cr "nnheader"))
+
+(defun mail-source-fetch-imap (source callback)
+  "Fetcher for imap sources."
+  (mail-source-bind (imap source)
+    (let ((found 0)
+	  (buf (get-buffer-create (generate-new-buffer-name " *imap source*")))
+	  (mail-source-string (format "imap:%s:%s" server mailbox))
+	  remove)
+      (if (and (imap-open server port stream authentication buf)
+	       (imap-authenticate user password buf)
+	       (imap-mailbox-select mailbox nil buf))
+	  (let (str (coding-system-for-write 'binary))
+	    (with-temp-file mail-source-crash-box
+	      ;; if predicate is nil, use all uids
+	      (dolist (uid (imap-search (or predicate "1:*") buf))
+		(when (setq str (imap-fetch uid "RFC822.PEEK" 'RFC822 nil buf))
+		  (push uid remove)
+		  (insert "From imap " (current-time-string) "\n")
+		  (save-excursion
+		    (insert str "\n\n"))
+		  (while (re-search-forward "^From " nil t)
+		    (replace-match ">From "))
+		  (goto-char (point-max))))
+	      (nnheader-ms-strip-cr))
+	    (incf found (mail-source-callback callback server))
+	    (when (and remove fetchflag)
+	      (imap-message-flags-add
+	       (imap-list-to-message-set remove) fetchflag nil buf))
+	    (if dontexpunge
+		(imap-mailbox-unselect buf)
+	      (imap-mailbox-close buf))
+	    (imap-close buf))
+	(imap-close buf)
+	(error (imap-error-text buf)))
+      (kill-buffer buf)
+      found)))
+
+(eval-and-compile
+  (autoload 'webmail-fetch "webmail"))
+
+(defun mail-source-fetch-webmail (source callback)
+  "Fetch for webmail source."
+  (mail-source-bind (webmail source)
+    (when (eq authentication 'password)
+      (setq password
+	    (or password
+		(mail-source-read-passwd
+		 (format "Password for %s at %s: " user subtype)))))
+    (webmail-fetch mail-source-crash-box subtype user password)
+    (mail-source-callback callback (symbol-name subtype))))
+
 (provide 'mail-source)
 
 ;;; mail-source.el ends here