X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=23209e52ccb5068ed764cee0a73059271665b073;hb=51f9787799e1f8a5ad1f9cde0fd99489dae071c3;hp=dcc1d33195872e2ab087eae223cd244e07dc613d;hpb=ba73c38820510691bbd7e51526d9c8dc30263545;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index dcc1d33..23209e5 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 <teranisi@gohome.org>
 
@@ -24,28 +24,30 @@
 ;;
 
 ;;; Commentary:
-;; 
+;;
 
 ;;; Code:
-;; 
+;;
 
 (require 'elmo)
 
 ;;; 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))
@@ -95,32 +97,47 @@
 
 (defvar elmo-pipe-drained-hook nil "A hook called when the pipe is flushed.")
 
-(defun elmo-pipe-drain (src dst)
+(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
 	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)
+    (elmo-folder-set-killed-list-internal
+     src
+     (elmo-msgdb-killed-list-load (elmo-folder-msgdb-path src)))
     (setq msgs (elmo-folder-list-messages src)
 	  len (length msgs))
     (when (> len elmo-display-progress-threshold)
       (elmo-progress-set 'elmo-folder-move-messages
 			 len "Moving messages..."))
     (unwind-protect
-	(elmo-folder-move-messages src msgs dst)
-      (elmo-progress-clear 'elmo-folder-move-messages)))
+	(elmo-folder-move-messages src msgs dst
+				   nil nil copy)
+      (elmo-progress-clear 'elmo-folder-move-messages))
+    (if (and copy msgs)
+	(progn
+	  (elmo-msgdb-append-to-killed-list src msgs)
+	  ;; for save killed-list instead of elmo-folder-close-internal
+	  (elmo-msgdb-killed-list-save
+	   (elmo-folder-msgdb-path src)
+	   (elmo-folder-killed-list-internal src)))))
   ;; Don't save msgdb here.
   ;; Because summary view of original folder is not updated yet.
   (elmo-folder-close-internal src)
+  (elmo-folder-set-killed-list-internal src nil)
   (run-hooks 'elmo-pipe-drained-hook))
 
 (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)))
+	(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))))
+      (elmo-pipe-drain src-folder dst-folder copy))))
 
 (luna-define-method elmo-folder-close-internal ((folder elmo-pipe-folder))
   (elmo-folder-close-internal(elmo-pipe-folder-dst-internal folder)))
@@ -164,7 +181,7 @@
   (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))
@@ -212,7 +229,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