X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=elmo%2Felmo-localdir.el;h=7deaf26dceb5652f88a1fe4bc9ecd531a86195e7;hb=cc2476c59df7c01510dff6fb30c8e981183f2ccc;hp=f030437c24e1102f2a11a0d75cbdc03839514bad;hpb=d4f713cac1ddd94f6ae17b0ab20c5c34df651839;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index f030437..7deaf26 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -144,15 +144,11 @@
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
 					      numbers
-					      new-mark
-					      already-mark
-					      seen-mark
-					      important-mark
-					      seen-list)
+					      flag-table)
   (when numbers
     (let ((dir (elmo-localdir-folder-directory-internal folder))
 	  overview number-alist mark-alist entity message-id
-	  num seen gmark
+	  num gmark
 	  (i 0)
 	  (len (length numbers)))
       (message "Creating msgdb...")
@@ -171,15 +167,14 @@
 		(elmo-msgdb-number-add number-alist
 				       num
 				       message-id))
-	  (setq seen (member message-id seen-list))
 	  (if (setq gmark (or (elmo-msgdb-global-mark-get message-id)
-			      (if (elmo-file-cache-exists-p message-id) ; XXX
-				  (if seen
-				      nil
-				    already-mark)
-				(if seen
-				    nil ;;seen-mark
-				  new-mark))))
+			      (unless (eq 'read (elmo-flag-table-get 
+						 flag-table message-id))
+				(elmo-msgdb-mark
+				 (elmo-flag-table-get flag-table message-id)
+				 (elmo-file-cache-status
+				  (elmo-file-cache-get message-id))
+				 'new))))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
@@ -231,18 +226,35 @@
 
 (luna-define-method elmo-folder-append-messages :around
   ((folder elmo-localdir-folder)
-   src-folder numbers unread-marks &optional same-number)
+   src-folder numbers &optional same-number)
   (if (elmo-folder-message-file-p src-folder)
-      (let ((dir (elmo-localdir-folder-directory-internal folder))
+      (let ((src-msgdb-exists (not (zerop (elmo-folder-length src-folder))))
+	    (dir (elmo-localdir-folder-directory-internal folder))
+	    (table (elmo-flag-table-load (elmo-folder-msgdb-path folder)))
 	    (succeeds numbers)
-	    (next-num (1+ (car (elmo-folder-status folder)))))
+	    (next-num (1+ (car (elmo-folder-status folder))))
+	    mark flag id)
 	(while numbers
+	  (setq mark (and src-msgdb-exists
+			  (elmo-message-mark src-folder (car numbers)))
+		flag (cond
+		      ((null mark) 'read)
+		      ((member mark (elmo-msgdb-answered-marks))
+		       'answered)
+		      ;;
+		      ((not (member mark (elmo-msgdb-unread-marks)))
+		       'read)))
 	  (elmo-copy-file
 	   (elmo-message-file-name src-folder (car numbers))
 	   (expand-file-name
 	    (int-to-string
 	     (if same-number (car numbers) next-num))
 	    dir))
+	  ;; save flag-table only when src folder's msgdb is loaded.
+	  (when (setq id (and src-msgdb-exists
+			      (elmo-message-field src-folder (car numbers)
+						  'message-id)))
+	    (elmo-flag-table-set table id flag))
 	  (elmo-progress-notify 'elmo-folder-move-messages)
 	  (if (and (setq numbers (cdr numbers))
 		   (not same-number))
@@ -251,6 +263,8 @@
 			;; MDA is running.
 			(1+ (car (elmo-folder-status folder)))
 		      (1+ next-num)))))
+	(when (elmo-folder-persistent-p folder)
+	  (elmo-flag-table-save (elmo-folder-msgdb-path folder) table))
 	succeeds)
     (luna-call-next-method)))
 
@@ -299,11 +313,19 @@
 	(elmo-make-directory dir))
       t)))
 
-(luna-define-method elmo-folder-delete :before ((folder elmo-localdir-folder))
-  (let ((dir (elmo-localdir-folder-directory-internal folder)))
-    (if (not (file-directory-p dir))
-	(error "No such directory: %s" dir)
-      (elmo-delete-match-files dir "[0-9]+" t)
+(luna-define-method elmo-folder-delete ((folder elmo-localdir-folder))
+  (let ((msgs (and (elmo-folder-exists-p folder)
+		   (elmo-folder-list-messages folder))))
+    (when (yes-or-no-p (format "%sDelete msgdb and substance of \"%s\"? "
+			       (if (> (length msgs) 0)
+				   (format "%d msg(s) exists. " (length msgs))
+				 "")
+			       (elmo-folder-name-internal folder)))
+      (let ((dir (elmo-localdir-folder-directory-internal folder)))
+	(if (not (file-directory-p dir))
+	    (error "No such directory: %s" dir)
+	  (elmo-delete-match-files dir "[0-9]+" t)))
+      (elmo-msgdb-delete-path folder)
       t)))
 
 (luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder)