X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=d36314379c3f934b59cfecca832fe59b6aecd86f;hb=c1e70a9ddc4f3c6a051665cc9d6c0bb27c263bc2;hp=987fd44f61d11288ca7b892c0ea6c5865d6e1876;hpb=5e2cfb50e1427586a1cec2c60ec5ee6efe0bc7ef;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 987fd44..d363143 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -105,7 +105,9 @@ (defun elmo-pipe-drain (src dst &optional copy ignore-list) "Move or copy all messages of SRC to DST." - (let ((elmo-inhibit-number-mapping (not copy)) ; No need to use UIDL + (let ((elmo-inhibit-number-mapping (and (eq (elmo-folder-type-internal + src) 'pop3) + (not copy))) ; No need to use UIDL msgs len) (message "Checking %s..." (elmo-folder-name-internal src)) ;; Warnnig: some function requires msgdb @@ -120,8 +122,7 @@ "Copying messages..." "Moving messages..."))) (unwind-protect - (elmo-folder-move-messages src msgs dst - nil nil copy) + (elmo-folder-move-messages src msgs dst copy) (elmo-progress-clear 'elmo-folder-move-messages)) (when (and copy msgs) (setq ignore-list (elmo-number-set-append-list ignore-list @@ -148,6 +149,9 @@ (expand-file-name "pipe" elmo-msgdb-directory))) copied-list)) +(luna-define-method elmo-folder-msgdb ((folder elmo-pipe-folder)) + (elmo-folder-msgdb (elmo-pipe-folder-dst-internal folder))) + (luna-define-method elmo-folder-open-internal ((folder elmo-pipe-folder)) (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder))) @@ -169,7 +173,7 @@ (luna-define-method elmo-folder-list-answereds ((folder elmo-pipe-folder)) (elmo-folder-list-answereds (elmo-pipe-folder-dst-internal folder))) -(luna-define-method elmo-folder-status ((folder elmo-pipe-folder)) +(luna-define-method elmo-folder-diff ((folder elmo-pipe-folder)) (elmo-folder-open-internal (elmo-pipe-folder-src-internal folder)) (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder)) (let* ((elmo-inhibit-number-mapping @@ -177,10 +181,14 @@ (src-length (length (elmo-pipe-folder-list-target-messages (elmo-pipe-folder-src-internal folder) (elmo-pipe-folder-copied-list-load folder)))) - (dst-list (elmo-folder-list-messages - (elmo-pipe-folder-dst-internal folder)))) - (prog1 (cons (+ src-length (elmo-max-of-list dst-list)) - (+ src-length (length dst-list))) + (dst-diff (elmo-folder-diff (elmo-pipe-folder-dst-internal folder)))) + (prog1 + (cond + ((consp (cdr dst-diff)) ; new unread all + (mapcar (lambda (number) (+ number src-length)) dst-diff)) + (t + (cons (+ (car dst-diff) src-length) + (+ (cdr dst-diff) src-length)))) ;; No save. (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder)) (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder))))) @@ -262,38 +270,40 @@ (elmo-folder-message-make-temp-files (elmo-pipe-folder-dst-internal folder) numbers start-number)) -(luna-define-method elmo-folder-mark-as-read ((folder elmo-pipe-folder) - numbers &optional ignore-flag) - (elmo-folder-mark-as-read (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) +(luna-define-method elmo-folder-flag-as-read ((folder elmo-pipe-folder) + numbers &optional is-local) + (elmo-folder-flag-as-read (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-read ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-unflag-read ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-unmark-read (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-unflag-read (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-important ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-unflag-important ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-unmark-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-unflag-important (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-mark-as-important ((folder elmo-pipe-folder) +(luna-define-method elmo-folder-flag-as-important ((folder elmo-pipe-folder) numbers - &optional ignore-flag) - (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) + &optional is-local) + (elmo-folder-flag-as-important (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-unmark-answered ((folder elmo-pipe-folder) - numbers) - (elmo-folder-unmark-answered (elmo-pipe-folder-dst-internal folder) - numbers)) +(luna-define-method elmo-folder-unflag-answered ((folder elmo-pipe-folder) + numbers + &optional is-local) + (elmo-folder-unflag-answered (elmo-pipe-folder-dst-internal folder) + numbers is-local)) -(luna-define-method elmo-folder-mark-as-answered ((folder elmo-pipe-folder) - numbers) - (elmo-folder-mark-as-answered (elmo-pipe-folder-dst-internal folder) - numbers)) +(luna-define-method elmo-folder-flag-as-answered ((folder elmo-pipe-folder) + numbers + &optional is-local) + (elmo-folder-flag-as-answered (elmo-pipe-folder-dst-internal folder) + numbers is-local)) (luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder)) (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder))) @@ -320,12 +330,10 @@ (elmo-pipe-folder-dst-internal new-folder)) (elmo-msgdb-rename-path folder new-folder))) -(luna-define-method elmo-folder-commit ((folder elmo-pipe-folder)) - (elmo-folder-commit - (elmo-pipe-folder-dst-internal folder))) - (luna-define-method elmo-folder-synchronize ((folder elmo-pipe-folder) - &optional ignore-msgdb + &optional + disable-killed + ignore-msgdb no-check) (let ((src-folder (elmo-pipe-folder-src-internal folder)) (dst-folder (elmo-pipe-folder-dst-internal folder))) @@ -340,7 +348,8 @@ (elmo-pipe-folder-copied-list-load folder))) (elmo-pipe-drain src-folder dst-folder)))) (elmo-folder-synchronize - (elmo-pipe-folder-dst-internal folder) ignore-msgdb no-check)) + (elmo-pipe-folder-dst-internal folder) + disable-killed ignore-msgdb no-check)) (luna-define-method elmo-folder-list-flagged ((folder elmo-pipe-folder) flag @@ -357,8 +366,8 @@ (luna-define-method elmo-folder-count-flags ((folder elmo-pipe-folder)) (elmo-folder-count-flags (elmo-pipe-folder-dst-internal folder))) -(luna-define-method elmo-message-mark ((folder elmo-pipe-folder) number) - (elmo-message-mark (elmo-pipe-folder-dst-internal folder) number)) +(luna-define-method elmo-message-flags ((folder elmo-pipe-folder) number) + (elmo-message-flags (elmo-pipe-folder-dst-internal folder) number)) (luna-define-method elmo-message-field ((folder elmo-pipe-folder) number field) @@ -366,6 +375,19 @@ number field)) +(luna-define-method elmo-message-set-cached ((folder elmo-pipe-folder) + number cached) + (elmo-message-set-cached (elmo-pipe-folder-dst-internal folder) + number cached)) + +(luna-define-method elmo-find-fetch-strategy + ((folder elmo-pipe-folder) entity &optional ignore-cache) + (elmo-find-fetch-strategy (elmo-pipe-folder-dst-internal folder) + (elmo-message-entity + (elmo-pipe-folder-dst-internal folder) + (elmo-message-entity-number entity)) + ignore-cache)) + (luna-define-method elmo-message-entity ((folder elmo-pipe-folder) key) (elmo-message-entity (elmo-pipe-folder-dst-internal folder) key))