X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-dop.el;h=0286fc0a3681eb2072fc6a9bd33d55e570625bcc;hb=c2738fdc4e616fb55973a7e285432f60af6c1c57;hp=793e668e7ef7d4981d68141e7d4876a4e2fa87fc;hpb=27e6595843ab2906deb56d46a61f53f831a9455b;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-dop.el b/elmo/elmo-dop.el index 793e668..0286fc0 100644 --- a/elmo/elmo-dop.el +++ b/elmo/elmo-dop.el @@ -63,43 +63,51 @@ Automatically loaded/saved.") (setq elmo-dop-queue (nconc elmo-dop-queue (list queue))))) (defvar elmo-dop-queue-merge-method-list - '(elmo-folder-mark-as-read - elmo-folder-unmark-read - elmo-folder-mark-as-important - elmo-folder-unmark-important)) + '(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)) (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-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"))) (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 @@ -127,7 +135,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)) @@ -141,11 +149,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))) @@ -158,7 +169,7 @@ even an operation concerns the unplugged folder." (memq (elmo-dop-queue-method que) elmo-dop-queue-merge-method-list) (setq match-queue - (car (delete + (car (delete nil (mapcar (lambda (nqueue) @@ -223,10 +234,10 @@ FOLDER is the folder structure." (car (elmo-dop-queue-arguments queue))))))))) ;;; 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 + (list flag (elmo-dop-spool-folder-append-buffer folder) number))) @@ -255,37 +266,46 @@ 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-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-unmark-read-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-unmark-read (list numbers))) +(defsubst elmo-folder-unflag-important-dop (folder numbers) + (elmo-dop-queue-append folder 'elmo-folder-unflag-important (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-flag-as-answered-dop (folder numbers) + (elmo-dop-queue-append folder 'elmo-folder-flag-as-answered (list numbers))) -(defsubst elmo-folder-unmark-important-dop (folder numbers) - (elmo-dop-queue-append folder 'elmo-folder-unmark-important (list numbers))) +(defsubst elmo-folder-unflag-answered-dop (folder numbers) + (elmo-dop-queue-append folder 'elmo-folder-unflag-answered (list numbers))) ;;; 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 (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 (sort (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)) (cons (+ max-num spool-length) (+ (length number-list) 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)) + (flags (cond ((listp flag) + flag) + ;; for compatibility + ((eq flag t) + nil) + (t + (list flag)))) failure saved dequeued) (with-temp-buffer (if (elmo-message-fetch spool-folder number @@ -294,14 +314,17 @@ FOLDER is the folder structure." (condition-case nil (setq failure (not (elmo-folder-append-buffer - folder unread set-number))) + 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) - unread set-number))) + flags + set-number))) (if (and (not dequeued) ; if dequeued, no need to delete. (or (not failure) ; succeed saved)) ; in lost+found