X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-dop.el;h=fcd601542a834773c2039c2d1cbb64f3a49ca8bf;hb=4dee2f09b7c63b19e24942f13b2917addb2a6501;hp=ab3180a74df6387508c54efe98a9ef884674dc92;hpb=6ee2df2d9ba35b5961d631bee2d6133cf6c3746e;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el index ab3180a..fcd6015 100644 --- a/elmo/elmo-dop.el +++ b/elmo/elmo-dop.el @@ -28,6 +28,7 @@ ;;; Code: ;; +(eval-when-compile (require 'cl)) (require 'elmo) (require 'elmo-vars) @@ -62,38 +63,54 @@ Automatically loaded/saved.") method arguments))) (setq elmo-dop-queue (nconc elmo-dop-queue (list queue))))) +(defvar elmo-dop-queue-merge-method-list + '(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-mark-as-read . "Read") - (elmo-folder-unmark-read . "Unread") - (elmo-folder-mark-as-important . "Important") - (elmo-folder-unmark-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) elmo-dop-queue-method-name-alist))) -(defun elmo-dop-queue-flush (&optional force) - "Flush disconnected operations. -If optional argument FORCE is non-nil, try flushing all operation queues -even an operation concerns the unplugged folder." +(defun elmo-dop-queue-flush () + "Flush disconnected operations that consern plugged folders." + ;; obsolete + (unless (or (null elmo-dop-queue) + (vectorp (car elmo-dop-queue))) + (if (y-or-n-p "\ +Saved queue is old version(2.6). Clear all pending operations? ") + (progn + (setq elmo-dop-queue nil) + (message "All pending operations are cleared.") + (elmo-dop-queue-save)) + (error "Please use 2.6 or earlier"))) (elmo-dop-queue-merge) - (let ((queue elmo-dop-queue) + (let ((queue-all elmo-dop-queue) + queue (count 0) - folder len) - ;; obsolete - (unless (or (null queue) - (vectorp (car queue))) - (if (y-or-n-p "Saved queue is old version(2.6). Clear all pending operations? ") - (progn - (setq elmo-dop-queue nil) - (message "All pending operations are cleared.") - (elmo-dop-queue-save)) - (error "Please use 2.6 or earlier."))) + (while queue-all + (if (elmo-folder-plugged-p + (elmo-make-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)) (when (> count 0) (if (elmo-y-or-n-p @@ -121,7 +138,7 @@ even an operation concerns the unplugged folder." (elmo-dop-queue-fname (car queue)))) (elmo-folder-open folder) (unless (elmo-folder-plugged-p folder) - (error "Unplugged."))) + (error "Unplugged"))) (elmo-dop-queue-arguments (car queue))) (elmo-folder-close folder)) (quit (setq failure t)) @@ -135,11 +152,14 @@ even an operation concerns the unplugged folder." performed num) (sit-for 0) ; (elmo-dop-queue-save))) - (if (elmo-y-or-n-p "Clear all pending operations? " + ;; when answer=NO against performing dop + (if (elmo-y-or-n-p "Clear these pending operations? " (not elmo-dop-flush-confirm) t) (progn - (setq elmo-dop-queue nil) - (message "All pending operations are cleared.") + (while queue + (setq elmo-dop-queue (delq (car queue) elmo-dop-queue)) + (setq queue (cdr queue))) + (message "Pending operations are cleared.") (elmo-dop-queue-save)) (message ""))) count))) @@ -149,21 +169,23 @@ even an operation concerns the unplugged folder." new-queue match-queue que) (while (setq que (car queue)) (if (and - (assq (elmo-dop-queue-method que) - elmo-dop-queue-method-name-alist) + (memq (elmo-dop-queue-method que) + elmo-dop-queue-merge-method-list) (setq match-queue - (car (delete nil - (mapcar '(lambda (nqueue) - (if (and - (string= (elmo-dop-queue-fname que) - (elmo-dop-queue-fname nqueue)) - (string= (elmo-dop-queue-method que) - (elmo-dop-queue-method nqueue))) - nqueue)) - new-queue))))) - (setcar (elmo-dop-queue-arguments match-queue) - (append (car (elmo-dop-queue-arguments match-queue)) - (car (elmo-dop-queue-arguments que)))) + (car (delete + nil + (mapcar + (lambda (nqueue) + (if (and + (string= (elmo-dop-queue-fname que) + (elmo-dop-queue-fname nqueue)) + (string= (elmo-dop-queue-method que) + (elmo-dop-queue-method nqueue))) + nqueue)) + new-queue))))) + (setcar (elmo-dop-queue-arguments match-queue) + (append (car (elmo-dop-queue-arguments match-queue)) + (car (elmo-dop-queue-arguments que)))) (setq new-queue (nconc new-queue (list que)))) (setq queue (cdr queue)) ) (setq elmo-dop-queue new-queue))) @@ -176,21 +198,16 @@ which is corresponded to the FOLDER." (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) @@ -214,24 +231,34 @@ FOLDER is the folder structure." '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 unread &optional number) +(defsubst elmo-folder-append-buffer-dop (folder &optional flag number) (elmo-dop-queue-append folder 'elmo-folder-append-buffer-dop-delayed - (list unread - (elmo-dop-spool-folder-append-buffer - folder) + (list flag + (elmo-dop-spool-folder-append-buffer folder flag) number))) (defsubst elmo-folder-delete-messages-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-delete-messages-dop-delayed - (list - (mapcar - (lambda (number) - (cons number (elmo-message-field - folder number 'message-id))) - numbers))) - t) + (let ((spool-folder (elmo-dop-spool-folder folder)) + queue) + (dolist (number numbers) + (if (< number 0) + (elmo-folder-delete-messages spool-folder + (list (abs number))) ; delete from queue + (setq queue (cons number queue)))) + (when queue + (elmo-dop-queue-append folder 'elmo-folder-delete-messages-dop-delayed + (list + (mapcar + (lambda (number) + (cons number (elmo-message-field + folder number 'message-id))) + queue)))) + t)) (defsubst elmo-message-encache-dop (folder number &optional read) (elmo-dop-queue-append folder 'elmo-message-encache (list number read))) @@ -239,91 +266,145 @@ FOLDER is the folder structure." (defsubst elmo-folder-create-dop (folder) (elmo-dop-queue-append folder 'elmo-folder-create-dop-delayed nil)) -(defsubst elmo-folder-mark-as-read-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-mark-as-read (list numbers))) - -(defsubst elmo-folder-unmark-read-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-unmark-read (list numbers))) - -(defsubst elmo-folder-mark-as-important-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-mark-as-important (list numbers))) - -(defsubst elmo-folder-unmark-important-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-unmark-important (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-alist (elmo-msgdb-number-load - (elmo-folder-msgdb-path folder))) - (number-list (mapcar 'car number-alist)) - (spool-folder (elmo-dop-spool-folder folder)) - spool-length - (i 0) - max-num) - (setq spool-length (length (car (if (elmo-folder-exists-p spool-folder) - (elmo-folder-status spool-folder))))) - (setq max-num - (or (nth (max (- (length number-list) 1) 0) number-list) - 0)) + (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)) (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))) + ;;; Delayed operation (executed at online status). -(defun elmo-folder-append-buffer-dop-delayed (folder unread number set-number) +(defun elmo-folder-append-buffer-dop-delayed (folder flag number set-number) (let ((spool-folder (elmo-dop-spool-folder folder)) - failure saved) + flags) (with-temp-buffer - (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 unread set-number))) - (error (setq failure t))) - (when failure - ;; Append failed... - (setq saved (elmo-folder-append-buffer - (elmo-make-folder elmo-lost+found-folder) - unread set-number))) - (if (or (not failure) - saved) - (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 + (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) - (elmo-folder-delete-messages - folder - ;; messages are deleted only if message-id is not changed. - (mapcar 'car - (elmo-delete-if - (lambda (pair) - (not (string= - (cdr pair) - (elmo-message-fetch-field folder (car pair) - 'message-id)))) - number-alist)))) + (ignore-errors + (elmo-folder-delete-messages + folder + ;; messages are deleted only if message-id is not changed. + (mapcar 'car + (elmo-delete-if + (lambda (pair) + (not (string= + (cdr pair) + (elmo-message-fetch-field folder (car pair) + 'message-id)))) + number-alist))) + t)) ; Always success (If failure, just remain) (defun elmo-folder-create-dop-delayed (folder) (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) - (list (mapcar (function - (lambda (x) - (elmo-msgdb-overview-entity-set-number - x - (* -1 - (elmo-msgdb-overview-entity-get-number x))))) - (nth 0 msgdb)) - (mapcar (function - (lambda (x) (cons - (* -1 (car x)) - (cdr x)))) - (nth 1 msgdb)) - (mapcar (function - (lambda (x) (cons - (* -1 (car x)) - (cdr x)))) (nth 2 msgdb)))) + (let ((new-db (elmo-make-msgdb)) + entity) + (dolist (dop-entity (mapcar + (lambda (number) + (setq entity (elmo-msgdb-message-entity + msgdb number)) + (elmo-message-entity-set-number + entity + (* -1 (elmo-message-entity-number entity))) + entity) + (elmo-msgdb-list-messages msgdb))) + (elmo-msgdb-append-entity new-db + dop-entity + (elmo-msgdb-flags + msgdb + (abs (elmo-message-entity-number + dop-entity))))) + new-db)) (require 'product) (product-provide (provide 'elmo-dop) (require 'elmo-version))