X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-pipe.el;h=f3c7ffcb68172fe36187e8d4536d673f144aaf33;hb=824fe18b2ad090f609041a4af11de484bdb7e3a8;hp=62a8358f3bb31bb4ed1c8c50a492f437e90ee886;hpb=3160fce920e3d3e67b55805ac16bac65f442d1c3;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 62a8358..f3c7ffc 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>
 
@@ -30,6 +30,10 @@
 ;;
 
 (require 'elmo)
+(require 'elmo-signal)
+
+(defvar elmo-pipe-folder-copied-filename "copied"
+  "Copied messages number set.")
 
 ;;; ELMO pipe folder
 (eval-and-compile
@@ -41,127 +45,169 @@
 					    name)
   (when (string-match "^\\([^|]*\\)|\\(:?\\)\\(.*\\)$" name)
     (elmo-pipe-folder-set-src-internal folder
-				       (elmo-make-folder
+				       (elmo-get-folder
 					(elmo-match-string 1 name)))
     (elmo-pipe-folder-set-dst-internal folder
-				       (elmo-make-folder
+				       (elmo-get-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))))
+  (elmo-pipe-connect-signals folder (elmo-pipe-folder-dst-internal folder))
   folder)
 
+(defun elmo-pipe-connect-signals (folder destination)
+  (elmo-connect-signal
+   destination 'flag-changing folder
+   (elmo-define-signal-handler (folder dst number old-flags new-flags)
+     (elmo-emit-signal 'flag-changing folder number old-flags new-flags)))
+  (elmo-connect-signal
+   destination 'flag-changed folder
+   (elmo-define-signal-handler (folder dst numbers)
+     (elmo-emit-signal 'flag-changed folder numbers)))
+  (elmo-connect-signal
+   destination 'status-changed folder
+   (elmo-define-signal-handler (folder dst numbers)
+     (elmo-emit-signal 'status-changed folder numbers)))
+  (elmo-connect-signal
+   destination 'update-overview folder
+   (elmo-define-signal-handler (folder dst number)
+     (elmo-emit-signal 'update-overview folder number))))
+
 (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
+(defun elmo-folder-append-messages-pipe-* (dst-folder
+					   src-folder
+					   numbers
+					   same-number)
+  (elmo-folder-append-messages dst-folder
+			       (elmo-pipe-folder-dst-internal src-folder)
+			       numbers
+			       same-number))
+
+(defun elmo-folder-append-messages-*-pipe (dst-folder
+					   src-folder
+					   numbers
+					   same-number)
+  (elmo-folder-append-messages (elmo-pipe-folder-dst-internal dst-folder)
+			       src-folder
+			       numbers
 			       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
-					&optional section outbuf unseen)
+					&optional unseen section)
   (elmo-message-fetch (elmo-pipe-folder-dst-internal folder)
-		      number strategy section outbuf unseen))
+		      number strategy unseen section))
+
+(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)
 			       numbers))
 
+(luna-define-method elmo-folder-detach-messages ((folder elmo-pipe-folder)
+						 numbers)
+  (elmo-folder-detach-messages (elmo-pipe-folder-dst-internal folder)
+			       numbers))
+
 (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
-	msgs len)
+(defsubst elmo-pipe-folder-list-target-messages (src &optional ignore-list)
+  (let ((killed (elmo-folder-killed-list-internal src)))
+    (elmo-folder-set-killed-list-internal src ignore-list)
+    (unwind-protect
+	(elmo-folder-list-messages src t)
+      (elmo-folder-set-killed-list-internal src killed))))
+
+(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
     (message "Checking %s..." (elmo-folder-name-internal src))
-    ;; for load killed-list
     (elmo-folder-open 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
-				   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)
-  (run-hooks 'elmo-pipe-drained-hook))
+	(let ((msgs (elmo-pipe-folder-list-target-messages src ignore-list)))
+	  (elmo-with-progress-display (elmo-folder-move-messages (length msgs))
+	      (if copy "Copying messages" "Moving messages")
+	    (elmo-folder-move-messages src msgs dst copy))
+	  (when (and copy msgs)
+	    (setq ignore-list (elmo-number-set-append-list ignore-list msgs))))
+      (elmo-folder-close 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))
+  (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))
 
-(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-close ((folder elmo-pipe-folder))
+  (elmo-generic-folder-close folder)
+  (elmo-folder-close (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-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-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)))))
@@ -179,12 +225,21 @@
   (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)))
 
+(luna-define-method elmo-folder-recover-messages ((folder elmo-pipe-folder)
+						  numbers)
+  (elmo-folder-recover-messages
+   (elmo-pipe-folder-dst-internal folder) numbers))
+
 (luna-define-method elmo-folder-create ((folder elmo-pipe-folder))
   (if (and (not (elmo-folder-exists-p (elmo-pipe-folder-src-internal folder)))
 	   (elmo-folder-creatable-p (elmo-pipe-folder-src-internal folder)))
@@ -202,13 +257,19 @@
   (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))
        (elmo-folder-plugged-p (elmo-pipe-folder-dst-internal folder))))
 
+(luna-define-method elmo-folder-set-plugged ((folder elmo-pipe-folder)
+					     plugged &optional add)
+  (elmo-folder-set-plugged (elmo-pipe-folder-src-internal folder)
+			   plugged add)
+  (elmo-folder-set-plugged (elmo-pipe-folder-dst-internal folder)
+			   plugged add))
+
 (luna-define-method elmo-folder-message-file-p ((folder elmo-pipe-folder))
   (elmo-folder-message-file-p (elmo-pipe-folder-dst-internal folder)))
 
@@ -240,29 +301,125 @@
   (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-get-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"))
+    (elmo-folder-rename (elmo-pipe-folder-dst-internal folder)
+			(elmo-folder-name-internal
+			 (elmo-pipe-folder-dst-internal new-folder)))
+    (elmo-global-flag-replace-referrer (elmo-folder-name-internal folder)
+				       new-name)
+    (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-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-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 &optional type)
+  (elmo-message-field (elmo-pipe-folder-dst-internal folder)
+		      number
+		      field
+		      type))
+
+(luna-define-method elmo-message-killed-p ((folder elmo-pipe-folder) number)
+  (elmo-message-killed-p (elmo-pipe-folder-dst-internal folder) number))
+
+(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)
+					      number
+					      &optional
+					      ignore-cache
+					      require-entireness)
+  (elmo-find-fetch-strategy (elmo-pipe-folder-dst-internal folder)
+			    number
+			    ignore-cache
+			    require-entireness))
+
+(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-pipe-folder)
+					 number)
+  (elmo-message-folder (elmo-pipe-folder-dst-internal folder) number))
+
 (require 'product)
 (product-provide (provide 'elmo-pipe) (require 'elmo-version))