;;; Code:
;;
+(eval-when-compile (require 'cl))
(require 'elmo)
(require 'elmo-vars)
(defmacro elmo-make-dop-queue (fname method arguments)
"Make a dop queue."
- (` (vector (, fname) (, method) (, arguments))))
+ `(vector ,fname ,method ,arguments))
(defmacro elmo-dop-queue-fname (queue)
"Return the folder name string of the QUEUE."
- (` (aref (, queue) 0)))
+ `(aref ,queue 0))
(defmacro elmo-dop-queue-method (queue)
"Return the method symbol of the QUEUE."
- (` (aref (, queue) 1)))
+ `(aref ,queue 1))
(defmacro elmo-dop-queue-arguments (queue)
"Return the arguments of the QUEUE."
- (` (aref (, queue) 2)))
+ `(aref ,queue 2))
(defun elmo-dop-queue-append (folder method arguments)
"Append to disconnected operation queue."
len)
(while queue-all
(if (elmo-folder-plugged-p
- (elmo-make-folder (elmo-dop-queue-fname (car queue-all))))
+ (elmo-get-folder (elmo-dop-queue-fname (car queue-all))))
(setq queue (append queue (list (car queue-all)))))
(setq queue-all (cdr queue-all)))
(setq count (length queue))
(apply (elmo-dop-queue-method (car queue))
(prog1
(setq folder
- (elmo-make-folder
+ (elmo-get-folder
(elmo-dop-queue-fname (car queue))))
(elmo-folder-open folder)
(unless (elmo-folder-plugged-p folder)
(not elmo-dop-flush-confirm) t)
(progn
(while queue
+ (when (eq (elmo-dop-queue-method (car queue))
+ 'elmo-folder-append-buffer-dop-delayed)
+ (elmo-folder-delete-messages
+ (elmo-dop-spool-folder
+ (elmo-get-folder (elmo-dop-queue-fname (car queue))))
+ (list (nth 1 (elmo-dop-queue-arguments (car queue))))))
(setq elmo-dop-queue (delq (car queue) elmo-dop-queue))
(setq queue (cdr queue)))
(message "Pending operations are cleared.")
(setq elmo-dop-queue new-queue)))
;;; dop spool folder
-(defmacro elmo-dop-spool-folder (folder)
+(defun elmo-dop-spool-folder (folder)
"Return a spool folder for disconnected operations
which is corresponded to the FOLDER."
- (` (elmo-make-folder
- (concat "+" (expand-file-name "spool" (elmo-folder-msgdb-path
- (, folder)))))))
+ (elmo-make-folder
+ (concat "+" (expand-file-name "spool" (elmo-folder-msgdb-path folder)))
+ nil
+ (elmo-folder-mime-charset-internal 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)
queue)
(dolist (number numbers)
(if (< number 0)
- (elmo-folder-delete-messages spool-folder
- (list (abs number))) ; delete from queue
+ (progn
+ ;; delete from queue
+ (elmo-folder-delete-messages spool-folder
+ (list (abs number)))
+ (dolist (queue elmo-dop-queue)
+ (when (and (eq (elmo-dop-queue-fname queue)
+ (elmo-folder-name-internal folder))
+ (eq (elmo-dop-queue-method queue)
+ 'elmo-folder-append-buffer-dop-delayed)
+ (eq (abs number)
+ (nth 1 (elmo-dop-queue-arguments queue))))
+ (setq elmo-dop-queue (delq queue elmo-dop-queue)))))
(setq queue (cons number queue))))
(when queue
(elmo-dop-queue-append folder 'elmo-folder-delete-messages-dop-delayed
(elmo-dop-queue-append folder 'elmo-folder-create-dop-delayed nil))
(defsubst elmo-folder-set-flag-dop (folder numbers flag)
- (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)))))
+ (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)
- (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)))))
+ (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)
(cons (+ max-num spool-length) (+ (length number-list) spool-length))))
(defun elmo-folder-next-message-number-dop (folder)
- (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 (if number-list (apply #'max number-list) 0))
- (+ max-num spool-length)))
+ (let ((spool-folder (elmo-dop-spool-folder folder)))
+ (- (+ 1 (elmo-max-of-list (or (elmo-folder-list-messages
+ spool-folder)
+ '(0)))))))
;;; 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)
+ '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
+ (let ((new-num (elmo-folder-next-message-number folder)))
+ (prog1
+ (elmo-folder-append-buffer folder flags set-number)
+ (elmo-emit-signal 'message-number-changed
+ folder (- number) new-num)))
+ (error))
+ ;; Append failed...
+ (elmo-folder-append-buffer
+ (elmo-get-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
(elmo-folder-unset-flag folder numbers 'important))
(defun elmo-folder-set-read-delayed (folder numbers)
- (elmo-folder-set-flag folder numbers 'read))
+ (elmo-folder-unset-flag folder numbers 'unread))
(defun elmo-folder-unset-read-delayed (folder numbers)
- (elmo-folder-unset-flag folder numbers 'read))
+ (elmo-folder-set-flag folder numbers 'unread))
(defun elmo-folder-set-answered-delayed (folder numbers)
(elmo-folder-set-flag folder numbers 'answered))
projects / elisp / wanderlust.git / blobdiff