X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-localdir.el;h=780031bd8e2a9885300357de620bf21deaced075;hb=fb40159a1fc3d4fb1400f8fe3befb1056bc75b8c;hp=787ce67fa02cff628f41bf965b235330142b511f;hpb=9f8461b1d4b90f5204c5703c9295779fdecf744b;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index 787ce67..780031b 100644
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -144,11 +144,11 @@
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
 					      numbers
-					      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...")
@@ -167,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
-				    elmo-msgdb-unread-cached-mark)
-				(if seen
-				    nil ;;seen-mark
-				  elmo-msgdb-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
@@ -230,15 +229,30 @@
    src-folder numbers &optional same-number)
   (if (elmo-folder-message-file-p src-folder)
       (let ((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)
 	(while numbers
+	  (setq mark (elmo-message-mark src-folder (car numbers))
+		flag (cond
+		      ((null mark) nil)
+		      ((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))
+	  (elmo-flag-table-set table
+			       (elmo-message-field
+				src-folder (car numbers)
+				'message-id)
+			       flag)
 	  (elmo-progress-notify 'elmo-folder-move-messages)
 	  (if (and (setq numbers (cdr numbers))
 		   (not same-number))
@@ -247,6 +261,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)))
 
@@ -295,11 +311,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)
@@ -307,14 +331,14 @@
   (let* ((old (elmo-localdir-folder-directory-internal folder))
 	 (new (elmo-localdir-folder-directory-internal new-folder))
 	 (new-dir (directory-file-name (file-name-directory new))))
-    (if (not (file-directory-p old))
-	(error "No such directory: %s" old)
-      (if (file-exists-p new)
-	  (error "Already exists directory: %s" new)
-	(if (not (file-directory-p new-dir))
-	    (elmo-make-directory new-dir))
-	(rename-file old new)
-	t))))
+    (unless (file-directory-p old)
+      (error "No such directory: %s" old))
+    (when (file-exists-p new)
+      (error "Already exists directory: %s" new))
+    (unless (file-directory-p new-dir)
+      (elmo-make-directory new-dir))
+    (rename-file old new)
+    t))
 
 (defsubst elmo-localdir-field-condition-match (folder condition
 						      number number-list)
@@ -351,7 +375,8 @@
 	 (elmo-msgdb-overview-get-entity onum msgdb)
 	 new-number)
 	;; update number-alist
-	(setcar (assq onum onum-alist) new-number))
+	(and (assq onum onum-alist)
+	     (setcar (assq onum onum-alist) new-number)))
       ;; update mark-alist
       (when (setq mark (cadr (assq onum omark-alist)))
 	(setq new-mark-alist