X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=fd8b9a4f898b79d2888344b757ab203060dcf8f3;hb=8b23f9bc0e0441913b8847900a73bd7a51833d30;hp=5844bf03b9f38177697769999a0d681d720c12c5;hpb=dcd5052ef1ed1f3ca5b5631e7af5b7e24b5bede8;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 5844bf0..fd8b9a4 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -1,4 +1,4 @@ -;;; elmo-pipe.el -- PIPE Interface for ELMO. +;;; elmo-pipe.el --- PIPE Interface for ELMO. ;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi @@ -31,6 +31,9 @@ (require 'elmo) +(defvar elmo-pipe-folder-copied-filename "copied" + "Copied messages number set.") + ;;; ELMO pipe folder (eval-and-compile (luna-define-class elmo-pipe-folder (elmo-folder) @@ -47,42 +50,31 @@ (elmo-make-folder (elmo-match-string 3 name))) (elmo-pipe-folder-set-copy-internal folder - (string= ":" (elmo-match-string 2 name)))) + (string= ":" + (elmo-match-string 2 name)))) 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) (or (elmo-folder-contains-type (elmo-pipe-folder-src-internal folder) type) (elmo-folder-contains-type (elmo-pipe-folder-dst-internal folder) type))) -(luna-define-method elmo-folder-msgdb-create ((folder elmo-pipe-folder) - numlist new-mark already-mark - seen-mark important-mark - seen-list) - (elmo-folder-msgdb-create (elmo-pipe-folder-dst-internal folder) - numlist new-mark already-mark - seen-mark important-mark seen-list)) - (luna-define-method elmo-folder-append-messages ((folder elmo-pipe-folder) src-folder numbers - unread-marks &optional same-number) (elmo-folder-append-messages (elmo-pipe-folder-dst-internal folder) src-folder numbers - unread-marks same-number)) (luna-define-method elmo-folder-append-buffer ((folder elmo-pipe-folder) - unread &optional number) + &optional flag number) (elmo-folder-append-buffer (elmo-pipe-folder-dst-internal folder) - unread number)) + flag number)) (luna-define-method elmo-message-fetch ((folder elmo-pipe-folder) number strategy @@ -90,6 +82,11 @@ (elmo-message-fetch (elmo-pipe-folder-dst-internal folder) number strategy section outbuf unseen)) +(luna-define-method elmo-folder-clear :after ((folder elmo-pipe-folder) + &optional keep-killed) + (unless keep-killed + (elmo-pipe-folder-copied-list-save folder nil))) + (luna-define-method elmo-folder-delete-messages ((folder elmo-pipe-folder) numbers) (elmo-folder-delete-messages (elmo-pipe-folder-dst-internal folder) @@ -97,69 +94,90 @@ (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.") -(defun elmo-pipe-drain (src dst copy) - "Move all messages of SRC to DST." - (let ((elmo-inhibit-number-mapping t) ; No need to use UIDL +(defsubst elmo-pipe-folder-list-target-messages (src &optional ignore-list) + (unwind-protect + (progn + (elmo-folder-set-killed-list-internal src ignore-list) + (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 (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. (elmo-folder-open-internal src) - (setq msgs (elmo-folder-list-messages src) + (setq msgs (elmo-pipe-folder-list-target-messages src ignore-list) len (length msgs)) (when (> len elmo-display-progress-threshold) (elmo-progress-set 'elmo-folder-move-messages - len "Moving messages...")) + len + (if copy + "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)) - (if (and copy msgs) - (progn - (elmo-msgdb-append-to-killed-list src msgs) - (elmo-msgdb-killed-list-save - (elmo-folder-msgdb-path folder) - (elmo-folder-killed-list-internal folder))))) - ;; Don't save msgdb here. - ;; Because summary view of original folder is not updated yet. - (elmo-folder-close-internal src) - (run-hooks 'elmo-pipe-drained-hook)) + (when (and copy msgs) + (setq ignore-list (elmo-number-set-append-list ignore-list + msgs))) + (elmo-folder-close-internal src) + (run-hooks 'elmo-pipe-drained-hook) + ignore-list)) + +(defun elmo-pipe-folder-copied-list-load (folder) + (elmo-object-load + (expand-file-name elmo-pipe-folder-copied-filename + (expand-file-name + (elmo-replace-string-as-filename + (elmo-folder-name-internal folder)) + (expand-file-name "pipe" elmo-msgdb-directory))) + nil t)) + +(defun elmo-pipe-folder-copied-list-save (folder copied-list) + (elmo-object-save + (expand-file-name elmo-pipe-folder-copied-filename + (expand-file-name + (elmo-replace-string-as-filename + (elmo-folder-name-internal folder)) + (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)) - (let ((src-folder (elmo-pipe-folder-src-internal folder)) - (dst-folder (elmo-pipe-folder-dst-internal folder)) - (copy (elmo-pipe-folder-copy-internal folder))) - (when (and (elmo-folder-plugged-p src-folder) - (elmo-folder-plugged-p dst-folder)) - (elmo-pipe-drain src-folder dst-folder copy)))) + (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-close-internal ((folder elmo-pipe-folder)) (elmo-folder-close-internal(elmo-pipe-folder-dst-internal folder))) -(luna-define-method elmo-folder-list-messages-internal - ((folder elmo-pipe-folder) &optional nohide) - (elmo-folder-list-messages-internal (elmo-pipe-folder-dst-internal - folder) nohide)) - -(luna-define-method elmo-folder-list-unreads-internal - ((folder elmo-pipe-folder) unread-marks &optional mark-alist) - (elmo-folder-list-unreads-internal (elmo-pipe-folder-dst-internal folder) - unread-marks mark-alist)) +(luna-define-method elmo-folder-list-messages ((folder elmo-pipe-folder) + &optional visible-only in-msgdb) + ;; Use target folder's killed-list in the pipe folder. + (elmo-folder-list-messages (elmo-pipe-folder-dst-internal + folder) visible-only in-msgdb)) -(luna-define-method elmo-folder-list-importants-internal - ((folder elmo-pipe-folder) important-mark) - (elmo-folder-list-importants-internal (elmo-pipe-folder-dst-internal folder) - important-mark)) - -(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 t) - (src-length (length (elmo-folder-list-messages - (elmo-pipe-folder-src-internal 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))) + (let* ((elmo-inhibit-number-mapping + (not (elmo-pipe-folder-copy-internal folder))) + (src-length (length (elmo-pipe-folder-list-target-messages + (elmo-pipe-folder-src-internal folder) + (elmo-pipe-folder-copied-list-load folder)))) + (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))))) @@ -177,8 +195,12 @@ (elmo-folder-newsgroups (elmo-pipe-folder-src-internal folder))) (luna-define-method elmo-folder-creatable-p ((folder elmo-pipe-folder)) - (and (elmo-folder-creatable-p (elmo-pipe-folder-src-internal folder)) - (elmo-folder-creatable-p (elmo-pipe-folder-dst-internal folder)))) + (and (or + (elmo-folder-exists-p (elmo-pipe-folder-src-internal folder)) + (elmo-folder-creatable-p (elmo-pipe-folder-src-internal folder))) + (or + (elmo-folder-exists-p (elmo-pipe-folder-dst-internal folder)) + (elmo-folder-creatable-p (elmo-pipe-folder-dst-internal folder))))) (luna-define-method elmo-folder-writable-p ((folder elmo-pipe-folder)) (elmo-folder-writable-p (elmo-pipe-folder-dst-internal folder))) @@ -200,8 +222,7 @@ (elmo-message-use-cache-p (elmo-pipe-folder-dst-internal folder) number)) (luna-define-method elmo-folder-check ((folder elmo-pipe-folder)) - (elmo-folder-close-internal folder) - (elmo-folder-open-internal folder)) + (elmo-folder-check (elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-plugged-p ((folder elmo-pipe-folder)) (and (elmo-folder-plugged-p (elmo-pipe-folder-src-internal folder)) @@ -238,29 +259,112 @@ (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) - (elmo-folder-mark-as-read (elmo-pipe-folder-dst-internal folder) - numbers)) - -(luna-define-method elmo-folder-unmark-read ((folder elmo-pipe-folder) - numbers) - (elmo-folder-unmark-read (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)) -(luna-define-method elmo-folder-unmark-important ((folder elmo-pipe-folder) - numbers) - (elmo-folder-unmark-important (elmo-pipe-folder-dst-internal folder) - numbers)) - -(luna-define-method elmo-folder-mark-as-important ((folder elmo-pipe-folder) - numbers) - (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder) - 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)) (luna-define-method elmo-folder-pack-numbers ((folder elmo-pipe-folder)) (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder))) +(luna-define-method elmo-folder-rename ((folder elmo-pipe-folder) new-name) + (let* ((new-folder (elmo-make-folder new-name))) + (unless (string= (elmo-folder-name-internal + (elmo-pipe-folder-src-internal folder)) + (elmo-folder-name-internal + (elmo-pipe-folder-src-internal new-folder))) + (error "Source folder differ")) + (unless (eq (elmo-folder-type-internal + (elmo-pipe-folder-dst-internal folder)) + (elmo-folder-type-internal + (elmo-pipe-folder-dst-internal new-folder))) + (error "Not same folder type")) + (if (or (file-exists-p (elmo-folder-msgdb-path + (elmo-pipe-folder-dst-internal new-folder))) + (elmo-folder-exists-p + (elmo-pipe-folder-dst-internal new-folder))) + (error "Already exists folder: %s" new-name)) + (elmo-folder-send (elmo-pipe-folder-dst-internal folder) + 'elmo-folder-rename-internal + (elmo-pipe-folder-dst-internal new-folder)) + (elmo-msgdb-rename-path folder new-folder))) + +(luna-define-method elmo-folder-synchronize ((folder elmo-pipe-folder) + &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) + (elmo-folder-plugged-p dst-folder)) + (if (elmo-pipe-folder-copy-internal folder) + (elmo-pipe-folder-copied-list-save + folder + (elmo-pipe-drain src-folder + dst-folder + 'copy + (elmo-pipe-folder-copied-list-load folder))) + (elmo-pipe-drain src-folder dst-folder)))) + (elmo-folder-synchronize + (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 + &optional in-msgdb) + (elmo-folder-list-flagged + (elmo-pipe-folder-dst-internal folder) flag in-msgdb)) + +(luna-define-method elmo-folder-commit ((folder elmo-pipe-folder)) + (elmo-folder-commit (elmo-pipe-folder-dst-internal folder))) + +(luna-define-method elmo-folder-length ((folder elmo-pipe-folder)) + (elmo-folder-length (elmo-pipe-folder-dst-internal folder))) + +(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-flags ((folder elmo-pipe-folder) number + &optional msgid) + (elmo-message-flags (elmo-pipe-folder-dst-internal folder) number msgid)) + +(luna-define-method elmo-message-field ((folder elmo-pipe-folder) + number field) + (elmo-message-field (elmo-pipe-folder-dst-internal folder) + 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)) + +(luna-define-method elmo-message-folder ((folder elmo-pipe-folder) + number) + (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number)) + (require 'product) (product-provide (provide 'elmo-pipe) (require 'elmo-version))