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

diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el
index 5d6c15e..23209e5 100644
--- a/elmo/elmo-pipe.el
+++ b/elmo/elmo-pipe.el
@@ -1,6 +1,6 @@
-;;; elmo-pipe.el -- PIPE Interface for ELMO.
+;;; elmo-pipe.el --- PIPE Interface for ELMO.
 
-;; Copyright 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Yuuichi Teranishi <teranisi@gohome.org>
 ;; Keywords: mail, net news
@@ -24,130 +24,249 @@
 ;;
 
 ;;; Commentary:
-;; 
+;;
 
 ;;; Code:
-;; 
-
-(require 'elmo-msgdb)
-
-(defsubst elmo-pipe-spec-src (spec)
-  (nth 1 spec))
-
-(defsubst elmo-pipe-spec-dst (spec)
-  (nth 2 spec))
-
-(defalias 'elmo-pipe-msgdb-create 'elmo-pipe-msgdb-create-as-numlist)
-
-(defun elmo-pipe-msgdb-create-as-numlist (spec numlist new-mark already-mark
-					       seen-mark important-mark
-					       seen-list)
-  (elmo-msgdb-create-as-numlist (elmo-pipe-spec-dst spec)
-				numlist new-mark already-mark
-				seen-mark important-mark seen-list))
-
-(defun elmo-pipe-list-folders (spec &optional hierarchy)
-  nil)
-
-(defun elmo-pipe-append-msg (spec string &optional msg no-see)
-  (elmo-append-msg (elmo-pipe-spec-dst spec) string))
-
-(defun elmo-pipe-read-msg (spec number outbuf)
-  (elmo-call-func (elmo-pipe-spec-dst spec)
-		  "read-msg"
-		  number outbuf))
+;;
 
-(defun elmo-pipe-delete-msgs (spec msgs)
-  (elmo-delete-msgs (elmo-pipe-spec-dst spec) msgs))
+(require 'elmo)
+
+;;; ELMO pipe folder
+(eval-and-compile
+  (luna-define-class elmo-pipe-folder (elmo-folder)
+		     (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)
+    (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 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))
+  (elmo-flatten
+   (mapcar
+    'elmo-folder-get-primitive-list
+    (list (elmo-pipe-folder-src-internal folder)
+	  (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)
+  (elmo-folder-append-buffer (elmo-pipe-folder-dst-internal folder)
+			     unread number))
+
+(luna-define-method elmo-message-fetch ((folder elmo-pipe-folder)
+					number strategy
+					&optional section outbuf unseen)
+  (elmo-message-fetch (elmo-pipe-folder-dst-internal folder)
+		      number strategy section outbuf unseen))
+
+(luna-define-method elmo-folder-delete-messages ((folder elmo-pipe-folder)
+						 numbers)
+  (elmo-folder-delete-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)
-  (let ((msgdb (elmo-msgdb-load src))
-	elmo-nntp-use-cache
-	elmo-imap4-use-cache
-	elmo-pop3-use-cache ; Inhibit caching while moving messages.
-	elmo-pop3-use-uidl) ; No need to use UIDL
-    (message "Checking %s..." src)
-    (elmo-move-msgs src (elmo-list-folder src) dst msgdb)
-    ;; Don't save msgdb here.
-    ;; Because summary view of original folder is not updated yet.
-    ;; (elmo-msgdb-save src msgdb)
-    (elmo-commit src)
-    (run-hooks 'elmo-pipe-drained-hook)))
-
-(defun elmo-pipe-list-folder (spec)
-  (elmo-pipe-drain (elmo-pipe-spec-src spec)
-		   (elmo-pipe-spec-dst spec))
-  (let ((killed (and elmo-use-killed-list
-		     (elmo-msgdb-killed-list-load
-		      (elmo-msgdb-expand-path spec))))
-	numbers)
-    (setq numbers (elmo-list-folder (elmo-pipe-spec-dst spec)))
-    (elmo-living-messages numbers killed)))
-
-(defun elmo-pipe-list-folder-unread (spec number-alist mark-alist unread-marks)
-  (elmo-list-folder-unread (elmo-pipe-spec-dst spec)
-			   number-alist mark-alist unread-marks))
-  
-(defun elmo-pipe-list-folder-important (spec number-alist)
-  (elmo-list-folder-important (elmo-pipe-spec-dst spec) number-alist))
-
-(defun elmo-pipe-max-of-folder (spec)
-  (let* (elmo-pop3-use-uidl
-	 (src-length (length (elmo-list-folder (elmo-pipe-spec-src spec))))
-	 (dst-list (elmo-list-folder (elmo-pipe-spec-dst spec))))
-    (cons (+ src-length (elmo-max-of-list dst-list))
-	  (+ src-length (length dst-list)))))
-
-(defun elmo-pipe-folder-exists-p (spec)
-  (and (elmo-folder-exists-p (elmo-pipe-spec-src spec))
-       (elmo-folder-exists-p (elmo-pipe-spec-dst spec))))
-
-(defun elmo-pipe-folder-creatable-p (spec)
-  (or (elmo-folder-creatable-p (elmo-pipe-spec-src spec))
-      (elmo-folder-creatable-p (elmo-pipe-spec-dst spec))))
-
-(defun elmo-pipe-create-folder (spec)
-  (if (and (not (elmo-folder-exists-p (elmo-pipe-spec-src spec)))
-	   (elmo-folder-creatable-p (elmo-pipe-spec-src spec)))
-      (elmo-create-folder (elmo-pipe-spec-src spec)))
-  (if (and (not (elmo-folder-exists-p (elmo-pipe-spec-dst spec)))
-	   (elmo-folder-creatable-p (elmo-pipe-spec-dst spec)))
-      (elmo-create-folder (elmo-pipe-spec-dst spec))))
-
-(defun elmo-pipe-search (spec condition &optional numlist)
-  (elmo-search (elmo-pipe-spec-dst spec) condition numlist))
-
-(defun elmo-pipe-use-cache-p (spec number)
-  (elmo-use-cache-p (elmo-pipe-spec-dst spec) number))
-
-(defun elmo-pipe-commit (spec)
-  (elmo-commit (elmo-pipe-spec-src spec))
-  (elmo-commit (elmo-pipe-spec-dst spec)))
-
-(defun elmo-pipe-plugged-p (spec)
-  (and (elmo-folder-plugged-p (elmo-pipe-spec-src spec))
-       (elmo-folder-plugged-p (elmo-pipe-spec-dst spec))))
-
-(defun elmo-pipe-set-plugged (spec plugged add)
-  (elmo-folder-set-plugged (elmo-pipe-spec-src spec) plugged add)
-  (elmo-folder-set-plugged (elmo-pipe-spec-dst spec) plugged add))
-
-(defun elmo-pipe-local-file-p (spec number)
-  (elmo-local-file-p (elmo-pipe-spec-dst spec) number))
-
-(defun elmo-pipe-get-msg-filename (spec number &optional loc-alist)
-  (elmo-get-msg-filename (elmo-pipe-spec-dst spec) number loc-alist))
-
-(defun elmo-pipe-sync-number-alist (spec number-alist)
-  (elmo-call-func (elmo-pipe-spec-src spec)
-		  "sync-number-alist" number-alist)) ; ??
-
-(defun elmo-pipe-server-diff (spec)
-  nil)
-
-(defalias 'elmo-pipe-folder-diff 'elmo-generic-folder-diff)
+(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
+				   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))
+	(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))))
+
+(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-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))
+  (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)))
+      ;; No save.
+      (elmo-folder-close-internal (elmo-pipe-folder-src-internal folder))
+      (elmo-folder-close-internal (elmo-pipe-folder-dst-internal folder)))))
+
+(luna-define-method elmo-folder-exists-p ((folder elmo-pipe-folder))
+  (and (elmo-folder-exists-p (elmo-pipe-folder-src-internal folder))
+       (elmo-folder-exists-p (elmo-pipe-folder-dst-internal folder))))
+
+(luna-define-method elmo-folder-expand-msgdb-path ((folder
+						    elmo-pipe-folder))
+  ;; Share with destination...OK?
+  (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-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))))
+
+(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-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)))
+      (elmo-folder-create (elmo-pipe-folder-src-internal folder)))
+  (if (and (not (elmo-folder-exists-p (elmo-pipe-folder-dst-internal folder)))
+	   (elmo-folder-creatable-p (elmo-pipe-folder-dst-internal folder)))
+      (elmo-folder-create (elmo-pipe-folder-dst-internal folder))))
+
+(luna-define-method elmo-folder-search ((folder elmo-pipe-folder)
+					condition &optional numlist)
+  (elmo-folder-search (elmo-pipe-folder-dst-internal folder)
+		      condition numlist))
+
+(luna-define-method elmo-message-use-cache-p ((folder elmo-pipe-folder) number)
+  (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))
+
+(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-message-file-p ((folder elmo-pipe-folder))
+  (elmo-folder-message-file-p (elmo-pipe-folder-dst-internal folder)))
+
+(luna-define-method elmo-message-file-p ((folder elmo-pipe-folder) number)
+  (elmo-message-file-p (elmo-pipe-folder-dst-internal folder) number))
+
+(luna-define-method elmo-message-file-name ((folder elmo-pipe-folder) number)
+  (elmo-message-file-name (elmo-pipe-folder-dst-internal folder) number))
+
+(luna-define-method elmo-folder-message-file-number-p ((folder
+							elmo-pipe-folder))
+  (elmo-folder-message-file-number-p (elmo-pipe-folder-dst-internal folder)))
+
+(luna-define-method elmo-folder-message-file-directory ((folder
+							 elmo-pipe-folder))
+  (elmo-folder-message-file-directory
+   (elmo-pipe-folder-dst-internal folder)))
+
+(luna-define-method elmo-folder-message-make-temp-file-p
+  ((folder elmo-pipe-folder))
+  (elmo-folder-message-make-temp-file-p
+   (elmo-pipe-folder-dst-internal folder)))
+
+(luna-define-method elmo-folder-message-make-temp-files ((folder
+							  elmo-pipe-folder)
+							 numbers
+							 &optional
+							 start-number)
+  (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-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-pack-numbers ((folder elmo-pipe-folder))
+  (elmo-folder-pack-numbers (elmo-pipe-folder-dst-internal folder)))
 
 (require 'product)
 (product-provide (provide 'elmo-pipe) (require 'elmo-version))