(defvar elmo-pop3-total-size nil)
+;; For debugging.
+(defvar elmo-pop3-debug nil
+ "Non-nil forces POP3 folder as debug mode.
+Debug information is inserted in the buffer \"*POP3 DEBUG*\"")
+
+(defvar elmo-pop3-debug-inhibit-logging nil)
+
+;;; Debug
+(defsubst elmo-pop3-debug (message &rest args)
+ (if elmo-pop3-debug
+ (with-current-buffer (get-buffer-create "*POP3 DEBUG*")
+ (goto-char (point-max))
+ (if elmo-pop3-debug-inhibit-logging
+ (insert "NO LOGGING\n")
+ (insert (apply 'format message args) "\n")))))
+
(luna-define-class elmo-pop3-session (elmo-network-session))
;; buffer-local
(erase-buffer))
(goto-char (point-min))
(setq elmo-pop3-read-point (point))
+ (elmo-pop3-debug "SEND: %s\n" command)
(process-send-string process command)
(process-send-string process "\r\n")))
(set-buffer (process-buffer process))
(goto-char (point-max))
(insert output)
+ (elmo-pop3-debug "RECEIVED: %s\n" output)
(if elmo-pop3-total-size
(message "Retrieving...(%d/%d bytes)."
(buffer-size) elmo-pop3-total-size))))
(with-current-buffer (process-buffer
(elmo-network-session-process-internal session))
(let* ((process (elmo-network-session-process-internal session))
+ (elmo-pop3-debug-inhibit-logging t)
(auth (elmo-network-session-auth-internal session))
(auth (mapcar '(lambda (mechanism) (upcase (symbol-name mechanism)))
(if (listp auth) auth (list auth))))
(elmo-pop3-parse-uidl-response response)))))
(defun elmo-pop3-read-contents (buffer process)
- (save-excursion
- (set-buffer buffer)
+ (with-current-buffer buffer
(let ((case-fold-search nil)
match-end)
(goto-char elmo-pop3-read-point)
(let (number uid list)
(insert string)
(goto-char (point-min))
- (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([^ \n]+\\)$" nil t)
+ (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([^ \n]+\\)$" nil t)
(setq number (elmo-match-buffer 1))
(setq uid (elmo-match-buffer 2))
(with-current-buffer buffer
(with-temp-buffer
(insert string)
(goto-char (point-min))
- (while (re-search-forward "^\\([0-9]+\\)[\t ]\\([0-9]+\\)$" nil t)
+ (while (re-search-forward "^\\([0-9]+\\)[\t ]+\\([0-9]+\\)$" nil t)
(setq alist
(cons
(cons (elmo-match-buffer 1)
(defun elmo-pop3-max-of-folder (spec)
(elmo-pop3-commit spec)
(if elmo-pop3-use-uidl
- (elmo-pop3-list-by-uidl-subr spec 'nonsort)
+ (prog1
+ (elmo-pop3-list-by-uidl-subr spec 'nonsort)
+ (elmo-pop3-commit spec))
(let* ((process
(elmo-network-session-process-internal
(elmo-pop3-get-session spec)))
(setq total
(string-to-int
(substring response (match-beginning 1)(match-end 1 ))))
+ (elmo-pop3-commit spec)
(cons total total))))))
(defvar elmo-pop3-header-fetch-chop-length 200)
nil))
(t
nil)))
-
+
(defun elmo-pop3-retrieve-headers (buffer tobuffer process articles)
(save-excursion
(set-buffer buffer)
(elmo-pop3-send-command process
(format "retr %s" number))
(setq elmo-pop3-total-size size)
+ (unless elmo-inhibit-display-retrieval-progress
+ (setq elmo-pop3-total-size size)
+ (elmo-display-progress
+ 'elmo-pop3-display-retrieval-progress
+ (format "Retrieving (0/%d bytes)..." elmo-pop3-total-size)
+ 0))
(unwind-protect
(progn
(when (null (setq response (elmo-pop3-read-response
(error "Fetching message failed"))
(setq response (elmo-pop3-read-body process outbuf)))
(setq elmo-pop3-total-size nil))
+ (unless elmo-inhibit-display-retrieval-progress
+ (elmo-display-progress
+ 'elmo-display-retrieval-progress "" 100) ; remove progress bar.
+ (message "Retrieving...done."))
(set-buffer outbuf)
(goto-char (point-min))
(while (re-search-forward "^\\." nil t)
(defun elmo-pop3-commit (spec)
(if (elmo-pop3-plugged-p spec)
(let ((session (elmo-pop3-get-session spec 'if-exists)))
- (and session
- (elmo-network-close-session session)))))
-
+ (when session
+ (elmo-network-close-session session)))))
(require 'product)
(product-provide (provide 'elmo-pop3) (require 'elmo-version))