X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=d7e90dd398e5a9ffb8bd3e14d854e99016ac9a64;hb=298179ef92e7400bdab05f509725ebfb9672b038;hp=8c3aa2efd751f05606109a59971cca34ac0c9fbe;hpb=10c9f47884508cec3b96340be0b4118938633e51;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 8c3aa2e..d7e90dd 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -55,11 +55,9 @@ folder) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder)) - (elmo-flatten - (mapcar - 'elmo-folder-get-primitive-list - (list (elmo-pipe-folder-src-internal folder) - (elmo-pipe-folder-dst-internal folder))))) + (nconc + (elmo-folder-get-primitive-list (elmo-pipe-folder-src-internal folder)) + (elmo-folder-get-primitive-list (elmo-pipe-folder-dst-internal folder)))) (luna-define-method elmo-folder-contains-type ((folder elmo-pipe-folder) type) @@ -100,16 +98,18 @@ (unwind-protect (progn (elmo-folder-set-killed-list-internal src ignore-list) - (elmo-folder-list-messages src)) + (elmo-folder-list-messages src t)) (elmo-folder-set-killed-list-internal src nil))) (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 - ;; but elmo-folder-open-internal do not load msgdb. + ;; but elmo-folder-open-internal do not load msgdb. (elmo-folder-open-internal src) (setq msgs (elmo-pipe-folder-list-target-messages src ignore-list) len (length msgs)) @@ -120,8 +120,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 +147,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))) @@ -160,16 +162,7 @@ (elmo-folder-list-messages (elmo-pipe-folder-dst-internal folder) visible-only in-msgdb)) -(luna-define-method elmo-folder-list-unreads ((folder elmo-pipe-folder)) - (elmo-folder-list-unreads (elmo-pipe-folder-dst-internal folder))) - -(luna-define-method elmo-folder-list-importants ((folder elmo-pipe-folder)) - (elmo-folder-list-importants (elmo-pipe-folder-dst-internal folder))) - -(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 +170,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 (+ (or (car dst-diff) 0) src-length) + (+ (or (cdr dst-diff) 0) 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 +259,21 @@ (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-unmark-read ((folder elmo-pipe-folder) - numbers - &optional ignore-flag) - (elmo-folder-unmark-read (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) - -(luna-define-method elmo-folder-unmark-important ((folder elmo-pipe-folder) - numbers - &optional ignore-flag) - (elmo-folder-unmark-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) - -(luna-define-method elmo-folder-mark-as-important ((folder elmo-pipe-folder) - numbers - &optional ignore-flag) - (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder) - numbers ignore-flag)) - -(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-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-set-flag ((folder elmo-pipe-folder) + numbers + flag + &optional is-local) + (elmo-folder-set-flag (elmo-pipe-folder-dst-internal folder) + numbers flag is-local) + (elmo-folder-notify-event folder 'flag-changed numbers)) + +(luna-define-method elmo-folder-unset-flag ((folder elmo-pipe-folder) + numbers + flag + &optional is-local) + (elmo-folder-unset-flag (elmo-pipe-folder-dst-internal folder) + numbers flag is-local) + (elmo-folder-notify-event folder 'flag-changed numbers)) (luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder)) (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder))) @@ -320,13 +300,12 @@ (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 - no-check) + &optional + disable-killed + ignore-msgdb + no-check + mask) (let ((src-folder (elmo-pipe-folder-src-internal folder)) (dst-folder (elmo-pipe-folder-dst-internal folder))) (when (and (elmo-folder-plugged-p src-folder) @@ -340,7 +319,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 mask)) (luna-define-method elmo-folder-list-flagged ((folder elmo-pipe-folder) flag @@ -354,11 +334,17 @@ (luna-define-method elmo-folder-length ((folder elmo-pipe-folder)) (elmo-folder-length (elmo-pipe-folder-dst-internal folder))) +(luna-define-method elmo-message-flag-available-p ((folder elmo-pipe-folder) + number flag) + (elmo-message-flag-available-p + (elmo-pipe-folder-dst-internal folder) + number flag)) + (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,13 +352,31 @@ 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-number ((folder elmo-pipe-folder) + message-id) + (elmo-message-number (elmo-pipe-folder-dst-internal folder) + message-id)) + (luna-define-method elmo-message-entity ((folder elmo-pipe-folder) key) (elmo-message-entity (elmo-pipe-folder-dst-internal folder) key)) -(luna-define-method elmo-message-folder ((folder elmo-multi-folder) +(luna-define-method elmo-message-folder ((folder elmo-pipe-folder) number) - (elmo-pipe-folder-dst-internal folder)) - + (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number)) + (require 'product) (product-provide (provide 'elmo-pipe) (require 'elmo-version))