(setq elmo-dop-queue (nconc elmo-dop-queue (list queue)))))
(defvar elmo-dop-queue-merge-method-list
- '(elmo-folder-flag-as-read
- elmo-folder-unflag-read
- elmo-folder-flag-as-important
- elmo-folder-unflag-important
- elmo-folder-flag-as-answered
- elmo-folder-unflag-answered))
+ '(elmo-folder-set-read-delayed
+ elmo-folder-unset-read-delayed
+ elmo-folder-set-important-delayed
+ elmo-folder-unset-important-delayed
+ elmo-folder-set-answered-delayed
+ elmo-folder-unset-answered-delayed))
(defvar elmo-dop-queue-method-name-alist
'((elmo-folder-append-buffer-dop-delayed . "Append")
(elmo-folder-delete-messages-dop-delayed . "Delete")
(elmo-message-encache . "Encache")
(elmo-folder-create-dop-delayed . "Create")
- (elmo-folder-flag-as-read . "Read")
- (elmo-folder-unflag-read . "Unread")
- (elmo-folder-flag-as-answered . "Answered")
- (elmo-folder-unflag-answered . "Unanswered")
- (elmo-folder-flag-as-important . "Important")
- (elmo-folder-unflag-important . "Unimportant")))
+ (elmo-folder-set-read-delayed . "Read")
+ (elmo-folder-unset-read-delayed . "Unread")
+ (elmo-folder-set-answered-delayed . "Answered")
+ (elmo-folder-unset-answered-delayed . "Unanswered")
+ (elmo-folder-set-important-delayed . "Important")
+ (elmo-folder-unset-important-delayed . "Unimportant")
+ (elmo-folder-set-flag . "Set flag")
+ (elmo-folder-unset-flag . "Unset flag")))
(defmacro elmo-dop-queue-method-name (queue)
`(cdr (assq (elmo-dop-queue-method ,queue)
(concat "+" (expand-file-name "spool" (elmo-folder-msgdb-path
(, folder)))))))
-(defun elmo-dop-spool-folder-append-buffer (folder)
+(defun elmo-dop-spool-folder-append-buffer (folder flags)
"Append current buffer content to the dop spool folder.
FOLDER is the folder structure.
Return a message number."
- (setq folder (elmo-dop-spool-folder folder))
- (unless (elmo-folder-exists-p folder)
- (elmo-folder-create folder))
- (let ((new-number (1+ (car (elmo-folder-status folder)))))
- ;; dop folder is a localdir folder.
- (write-region-as-binary (point-min) (point-max)
- (expand-file-name
- (int-to-string new-number)
- (elmo-localdir-folder-directory-internal folder))
- nil 'no-msg)
- new-number))
+ (let ((spool (elmo-dop-spool-folder folder)))
+ (unless (elmo-folder-exists-p spool)
+ (elmo-folder-create spool))
+ (let ((new-number (1+ (car (elmo-folder-status spool)))))
+ (elmo-folder-append-buffer spool flags new-number)
+ new-number)))
(defun elmo-dop-spool-folder-list-messages (folder)
'car
(car (elmo-dop-queue-arguments queue)))))))))
+(defun elmo-dop-filter-pending-messages (numbers)
+ (elmo-delete-if (lambda (number) (< number 0)) numbers))
+
;;; DOP operations.
(defsubst elmo-folder-append-buffer-dop (folder &optional flag number)
(elmo-dop-queue-append
folder 'elmo-folder-append-buffer-dop-delayed
(list flag
- (elmo-dop-spool-folder-append-buffer
- folder)
+ (elmo-dop-spool-folder-append-buffer folder flag)
number)))
(defsubst elmo-folder-delete-messages-dop (folder numbers)
(defsubst elmo-folder-create-dop (folder)
(elmo-dop-queue-append folder 'elmo-folder-create-dop-delayed nil))
-(defsubst elmo-folder-flag-as-read-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-flag-as-read (list numbers)))
-
-(defsubst elmo-folder-unflag-read-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-unflag-read (list numbers)))
-
-(defsubst elmo-folder-flag-as-important-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-flag-as-important (list numbers)))
-
-(defsubst elmo-folder-unflag-important-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-unflag-important (list numbers)))
-
-(defsubst elmo-folder-flag-as-answered-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-flag-as-answered (list numbers)))
-
-(defsubst elmo-folder-unflag-answered-dop (folder numbers)
- (elmo-dop-queue-append folder 'elmo-folder-unflag-answered (list numbers)))
+(defsubst elmo-folder-set-flag-dop (folder numbers flag)
+ (when (setq numbers (elmo-dop-filter-pending-messages numbers))
+ (let ((method (case flag
+ (unread
+ 'elmo-folder-unset-read-delayed)
+ (read
+ 'elmo-folder-set-read-delayed)
+ (important
+ 'elmo-folder-set-important-delayed)
+ (answered
+ 'elmo-folder-set-answered-delayed))))
+ (if method
+ (elmo-dop-queue-append folder method (list numbers))
+ (elmo-dop-queue-append folder 'elmo-folder-set-flag
+ (list numbers flag))))))
+
+(defsubst elmo-folder-unset-flag-dop (folder numbers flag)
+ (when (setq numbers (elmo-dop-filter-pending-messages numbers))
+ (let ((method (case flag
+ (unread
+ 'elmo-folder-set-read-delayed)
+ (read
+ 'elmo-folder-unset-read-delayed)
+ (important
+ 'elmo-folder-unset-important-delayed)
+ (answered
+ 'elmo-folder-unset-answered-delayed))))
+ (if method
+ (elmo-dop-queue-append folder method (list numbers))
+ (elmo-dop-queue-append folder 'elmo-folder-unset-flag
+ (list numbers flag))))))
;;; Execute as subsutitute for plugged operation.
(defun elmo-folder-status-dop (folder)
- (let ((number-list (sort (elmo-folder-list-messages folder nil 'in-msgdb) '>))
+ (let ((number-list (elmo-folder-list-messages folder nil 'in-msgdb))
(spool-folder (elmo-dop-spool-folder folder))
spool-length
max-num)
(setq spool-length (or (if (elmo-folder-exists-p spool-folder)
(car (elmo-folder-status spool-folder)))
0))
- (setq max-num (or (car number-list) 0))
+ (setq max-num (if number-list (apply #'max number-list) 0))
(cons (+ max-num spool-length) (+ (length number-list) spool-length))))
(defun elmo-folder-next-message-number-dop (folder)
- (let ((number-list (sort (elmo-folder-list-messages folder nil 'in-msgdb) '>))
+ (let ((number-list (elmo-folder-list-messages folder nil 'in-msgdb))
(spool-folder (elmo-dop-spool-folder folder))
spool-length
max-num)
(setq spool-length (or (if (elmo-folder-exists-p spool-folder)
(car (elmo-folder-status spool-folder)))
0))
- (setq max-num (or (car number-list) 0))
+ (setq max-num (if number-list (apply #'max number-list) 0))
(+ max-num spool-length)))
;;; Delayed operation (executed at online status).
(defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number)
(let ((spool-folder (elmo-dop-spool-folder folder))
- (flags (cond ((listp flag)
- flag)
- ;; for compatibility
- ((eq flag t)
- nil)
- (t
- (list flag))))
- failure saved dequeued)
+ flags)
(with-temp-buffer
- (if (elmo-message-fetch spool-folder number
- (elmo-make-fetch-strategy 'entire)
- nil (current-buffer) 'unread)
- (condition-case nil
- (setq failure (not
- (elmo-folder-append-buffer
- folder
- flags
- set-number)))
- (error (setq failure t)))
- (setq dequeued t)) ; Already deletef from queue.
- (when failure
- ;; Append failed...
- (setq saved (elmo-folder-append-buffer
- (elmo-make-folder elmo-lost+found-folder)
- flags
- set-number)))
- (if (and (not dequeued) ; if dequeued, no need to delete.
- (or (not failure) ; succeed
- saved)) ; in lost+found
- (elmo-folder-delete-messages spool-folder (list number)))
- t)))
+ (when (elmo-message-fetch spool-folder number
+ (elmo-make-fetch-strategy 'entire)
+ nil (current-buffer) 'unread)
+ (setq flags (or (elmo-message-flags-for-append folder (* -1 number))
+ (cond ((listp flag)
+ flag)
+ ;; for compatibility with 2.11.12 or earlier
+ ((eq flag t)
+ nil)
+ (t
+ (list flag)))))
+ (when (or (condition-case nil
+ (elmo-folder-append-buffer folder flags set-number)
+ (error))
+ ;; Append failed...
+ (elmo-folder-append-buffer
+ (elmo-make-folder elmo-lost+found-folder)
+ flags))
+ (elmo-folder-delete-messages spool-folder (list number)))))
+ ;; ignore failure (already dequed)
+ t))
(defun elmo-folder-delete-messages-dop-delayed (folder number-alist)
(ignore-errors
(unless (elmo-folder-exists-p folder)
(elmo-folder-create folder)))
+(defun elmo-folder-set-important-delayed (folder numbers)
+ (elmo-folder-set-flag folder numbers 'important))
+
+(defun elmo-folder-unset-important-delayed (folder numbers)
+ (elmo-folder-unset-flag folder numbers 'important))
+
+(defun elmo-folder-set-read-delayed (folder numbers)
+ (elmo-folder-unset-flag folder numbers 'unread))
+
+(defun elmo-folder-unset-read-delayed (folder numbers)
+ (elmo-folder-set-flag folder numbers 'unread))
+
+(defun elmo-folder-set-answered-delayed (folder numbers)
+ (elmo-folder-set-flag folder numbers 'answered))
+
+(defun elmo-folder-unset-answered-delayed (folder numbers)
+ (elmo-folder-unset-flag folder numbers 'answered))
+
;;; Util
(defun elmo-dop-msgdb (msgdb)
(let ((new-db (elmo-make-msgdb))
projects / elisp / wanderlust.git / blobdiff