X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=feae2dfa475b7e44a868cedcd2223cb1106e639e;hb=a5bcb1f0eb41b558a6b4ed277047adc6b8676a2a;hp=dcc1d33195872e2ab087eae223cd244e07dc613d;hpb=ba73c38820510691bbd7e51526d9c8dc30263545;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index dcc1d33..feae2df 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 @@ -24,28 +24,34 @@ ;; ;;; Commentary: -;; +;; ;;; Code: -;; +;; (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) - (src dst)) + (src dst copy)) (luna-define-internal-accessors 'elmo-pipe-folder)) (luna-define-method elmo-folder-initialize ((folder elmo-pipe-folder) name) - (when (string-match "^\\([^|]*\\)|\\(.*\\)$" name) + (when (string-match "^\\([^|]*\\)|\\(:?\\)\\(.*\\)$" name) (elmo-pipe-folder-set-src-internal folder (elmo-make-folder (elmo-match-string 1 name))) (elmo-pipe-folder-set-dst-internal folder (elmo-make-folder - (elmo-match-string 2 name)))) + (elmo-match-string 3 name))) + (elmo-pipe-folder-set-copy-internal folder + (string= ":" + (elmo-match-string 2 name)))) folder) (luna-define-method elmo-folder-get-primitive-list ((folder elmo-pipe-folder)) @@ -61,26 +67,21 @@ (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) + numlist flag-table) (elmo-folder-msgdb-create (elmo-pipe-folder-dst-internal folder) - numlist new-mark already-mark - seen-mark important-mark seen-list)) + numlist flag-table)) (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 @@ -88,6 +89,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) @@ -95,24 +101,59 @@ (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.") -(defun elmo-pipe-drain (src dst) - "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)) + (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 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) - (elmo-progress-clear 'elmo-folder-move-messages))) - ;; 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)) + (elmo-folder-move-messages src msgs dst + nil nil copy) + (elmo-progress-clear 'elmo-folder-move-messages)) + (when (and copy msgs) + (setq ignore-list (elmo-number-set-append-list ignore-list + msgs))) + ;; 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) + 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-open-internal ((folder elmo-pipe-folder)) (elmo-folder-open-internal (elmo-pipe-folder-dst-internal folder)) @@ -120,7 +161,14 @@ (dst-folder (elmo-pipe-folder-dst-internal folder))) (when (and (elmo-folder-plugged-p src-folder) (elmo-folder-plugged-p dst-folder)) - (elmo-pipe-drain src-folder 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))))) (luna-define-method elmo-folder-close-internal ((folder elmo-pipe-folder)) (elmo-folder-close-internal(elmo-pipe-folder-dst-internal folder))) @@ -130,22 +178,23 @@ (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-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-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-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)) (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)))) + (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-list (elmo-folder-list-messages (elmo-pipe-folder-dst-internal folder)))) (prog1 (cons (+ src-length (elmo-max-of-list dst-list)) @@ -164,11 +213,15 @@ (elmo-folder-expand-msgdb-path (elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-newsgroups ((folder elmo-pipe-folder)) - (elmo-folder-newsgroups (elmo-pipe-folder-target-internal folder))) + (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))) @@ -212,7 +265,7 @@ (luna-define-method elmo-folder-message-file-directory ((folder elmo-pipe-folder)) - (elmo-folder-message-file-directory + (elmo-folder-message-file-directory (elmo-pipe-folder-dst-internal folder))) (luna-define-method elmo-folder-message-make-temp-file-p @@ -229,28 +282,53 @@ (elmo-pipe-folder-dst-internal folder) numbers start-number)) (luna-define-method elmo-folder-mark-as-read ((folder elmo-pipe-folder) - numbers) + numbers &optional ignore-flag) (elmo-folder-mark-as-read (elmo-pipe-folder-dst-internal folder) - numbers)) + numbers ignore-flag)) (luna-define-method elmo-folder-unmark-read ((folder elmo-pipe-folder) - numbers) + numbers + &optional ignore-flag) (elmo-folder-unmark-read (elmo-pipe-folder-dst-internal folder) - numbers)) + numbers ignore-flag)) (luna-define-method elmo-folder-unmark-important ((folder elmo-pipe-folder) - numbers) + numbers + &optional ignore-flag) (elmo-folder-unmark-important (elmo-pipe-folder-dst-internal folder) - numbers)) + numbers ignore-flag)) (luna-define-method elmo-folder-mark-as-important ((folder elmo-pipe-folder) - numbers) + numbers + &optional ignore-flag) (elmo-folder-mark-as-important (elmo-pipe-folder-dst-internal folder) - numbers)) + numbers ignore-flag)) (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))) + (require 'product) (product-provide (provide 'elmo-pipe) (require 'elmo-version))