If server doesn't accept asynchronous commands, this variable should be
set as non-nil.")
-(defvar elmo-pop3-exists-exactly t)
+(defcustom elmo-pop3-exists-exactly nil
+ "If non-nil, POP3 folder existence is checked everytime before the session."
+ :type 'boolean
+ :group 'elmo)
+
(defvar sasl-mechanism-alist)
(defvar elmo-pop3-total-size nil)
nil
(elmo-pop3-folder-use-uidl-internal
folder))))
- (if (eq if-exists 'any-exists)
- (or (elmo-network-get-session 'elmo-pop3-session
- "POP3"
- folder if-exists)
- (elmo-network-get-session 'elmo-pop3-session
- "BIFF-POP3"
- folder if-exists))
- (elmo-network-get-session 'elmo-pop3-session
- (concat
- (if (elmo-folder-biff-internal folder)
- "BIFF-")
- "POP3")
- folder if-exists))))
+ (prog1
+ (if (eq if-exists 'any-exists)
+ (or (elmo-network-get-session 'elmo-pop3-session
+ "POP3"
+ folder if-exists)
+ (elmo-network-get-session 'elmo-pop3-session
+ "BIFF-POP3"
+ folder if-exists))
+ (elmo-network-get-session 'elmo-pop3-session
+ (concat
+ (if (elmo-folder-biff-internal folder)
+ "BIFF-")
+ "POP3")
+ folder if-exists))
+ ;; For saving existency.
+ (unless (file-exists-p (elmo-folder-msgdb-path folder))
+ (elmo-make-directory (elmo-folder-msgdb-path folder))))))
(defun elmo-pop3-send-command (process command &optional no-erase no-log)
(with-current-buffer (process-buffer process)
(setq session (elmo-pop3-get-session folder))
(if session
(elmo-network-close-session session)))))
- (file-directory-p (elmo-folder-msgdb-path folder))))
+ (or (file-directory-p (elmo-folder-msgdb-path folder))
+ ;; First time.
+ (when (elmo-folder-plugged-p folder)
+ (let ((elmo-pop3-exists-exactly t))
+ (elmo-folder-exists-p folder))))))
(defun elmo-pop3-parse-uidl-response (string)
(let ((buffer (current-buffer))
(copy-to-buffer tobuffer (point-min) (point-max)))))
(luna-define-method elmo-folder-msgdb-create ((folder elmo-pop3-folder)
- numlist new-mark
- already-mark seen-mark
- important-mark seen-list)
+ numlist flag-table)
(let ((process (elmo-network-session-process-internal
(elmo-pop3-get-session folder))))
(with-current-buffer (process-buffer process)
(elmo-pop3-sort-msgdb-by-original-number
folder
(elmo-pop3-msgdb-create-by-header
+ folder
process
numlist
- new-mark already-mark
- seen-mark seen-list
+ flag-table
(if (elmo-pop3-folder-use-uidl-internal folder)
(elmo-pop3-folder-location-alist-internal folder)))))))
-(defun elmo-pop3-sort-overview-by-original-number (overview loc-alist)
- (if loc-alist
- (sort overview
- (lambda (ent1 ent2)
- (< (elmo-pop3-uidl-to-number
- (cdr (assq (elmo-msgdb-overview-entity-get-number ent1)
- loc-alist)))
- (elmo-pop3-uidl-to-number
- (cdr (assq (elmo-msgdb-overview-entity-get-number ent2)
- loc-alist))))))
- overview))
-
(defun elmo-pop3-sort-msgdb-by-original-number (folder msgdb)
- (message "Sorting...")
- (let ((overview (elmo-msgdb-get-overview msgdb)))
- (setq overview (elmo-pop3-sort-overview-by-original-number
- overview
- (elmo-pop3-folder-location-alist-internal folder)))
- (message "Sorting...done")
- (list overview (nth 1 msgdb)(nth 2 msgdb)(nth 3 msgdb))))
+ (let ((location-alist (elmo-pop3-folder-location-alist-internal folder)))
+ (when location-alist
+ (elmo-msgdb-sort-entities
+ msgdb
+ (lambda (ent1 ent2 loc-alist)
+ (< (elmo-pop3-uidl-to-number
+ (cdr (assq (elmo-message-entity-number ent1)
+ loc-alist)))
+ (elmo-pop3-uidl-to-number
+ (cdr (assq (elmo-message-entity-number ent2)
+ loc-alist)))))
+ location-alist))
+ msgdb))
(defun elmo-pop3-uidl-to-number (uidl)
(string-to-number (elmo-get-hash-val uidl
(elmo-get-hash-val (format "#%d" number)
elmo-pop3-size-hash))
-(defun elmo-pop3-msgdb-create-by-header (process numlist
- new-mark already-mark
- seen-mark
- seen-list
- loc-alist)
+(defun elmo-pop3-msgdb-create-by-header (folder process numlist
+ flag-table
+ loc-alist)
(let ((tmp-buffer (get-buffer-create " *ELMO Overview TMP*")))
(with-current-buffer (process-buffer process)
(if loc-alist ; use uidl.
tmp-buffer process numlist)
(prog1
(elmo-pop3-msgdb-create-message
+ folder
tmp-buffer
process
(length numlist)
numlist
- new-mark already-mark seen-mark seen-list loc-alist)
+ flag-table loc-alist)
(kill-buffer tmp-buffer)))))
-(defun elmo-pop3-msgdb-create-message (buffer
+(defun elmo-pop3-msgdb-create-message (folder
+ buffer
process
num
- numlist new-mark already-mark
- seen-mark
- seen-list
+ numlist
+ flag-table
loc-alist)
(save-excursion
- (let (beg overview number-alist mark-alist
- entity i number message-id gmark seen size)
+ (let ((new-msgdb (elmo-make-msgdb))
+ beg entity i number message-id flags)
(set-buffer buffer)
(elmo-set-buffer-multibyte default-enable-multibyte-characters)
(goto-char (point-min))
(save-restriction
(narrow-to-region beg (point))
(setq entity
- (elmo-msgdb-create-overview-from-buffer
- (car numlist)))
+ (elmo-msgdb-create-message-entity-from-buffer
+ new-msgdb (car numlist)))
(setq numlist (cdr numlist))
(when entity
- (setq overview
- (elmo-msgdb-append-element
- overview entity))
(with-current-buffer (process-buffer process)
- (elmo-msgdb-overview-entity-set-size
+ (elmo-message-entity-set-field
entity
+ 'size
(string-to-number
(elmo-pop3-number-to-size
- (elmo-msgdb-overview-entity-get-number entity))))
+ (elmo-message-entity-number entity))))
(if (setq number
(car
(rassoc
(elmo-pop3-number-to-uidl
- (elmo-msgdb-overview-entity-get-number entity))
+ (elmo-message-entity-number entity))
loc-alist)))
- (elmo-msgdb-overview-entity-set-number entity number)))
- (setq number-alist
- (elmo-msgdb-number-add
- number-alist
- (elmo-msgdb-overview-entity-get-number entity)
- (car entity)))
- (setq message-id (car entity))
- (setq seen (member message-id seen-list))
- (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
- (if (elmo-file-cache-status
- (elmo-file-cache-get message-id))
- (if seen
- nil
- already-mark)
- (if seen
- (if elmo-pop3-use-cache
- seen-mark)
- new-mark))))
- (setq mark-alist
- (elmo-msgdb-mark-append
- mark-alist
- (elmo-msgdb-overview-entity-get-number entity)
- gmark))))))
+ (elmo-message-entity-set-number entity number)))
+ (setq message-id (elmo-message-entity-field entity 'message-id)
+ flags (elmo-flag-table-get flag-table message-id))
+ (elmo-global-flags-set flags folder number message-id)
+ (elmo-msgdb-append-entity new-msgdb entity flags))))
(when (> num elmo-display-progress-threshold)
(setq i (1+ i))
(if (or (zerop (% i 5)) (= i num))
(elmo-display-progress
'elmo-pop3-msgdb-create-message "Creating msgdb..."
(/ (* i 100) num)))))
- (list overview number-alist mark-alist))))
+ new-msgdb)))
(defun elmo-pop3-read-body (process outbuf)
(with-current-buffer (process-buffer process)
(error "Deleting message failed")))
(error "Deleting message failed")))))
-(luna-define-method elmo-folder-delete-messages-plugged
- ((folder elmo-pop3-folder) msgs)
+(luna-define-method elmo-folder-delete-messages-plugged ((folder
+ elmo-pop3-folder)
+ msgs)
(let ((loc-alist (elmo-pop3-folder-location-alist-internal folder))
(process (elmo-network-session-process-internal
(elmo-pop3-get-session folder))))
- (mapcar '(lambda (msg) (elmo-pop3-delete-msg
- process msg loc-alist))
+ (mapcar '(lambda (msg) (elmo-pop3-delete-msg process msg loc-alist))
msgs)))
(luna-define-method elmo-message-use-cache-p ((folder elmo-pop3-folder) number)