X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-sendlog.el;h=ef62fa91e7c95fb4e437a1728a3c788f4e941443;hb=fd6411ebf1a6cbab760fcf77514fc37e2ba3face;hp=4187f7f8d33234a021e920de534ba092cfe9b543;hpb=0aae3b9e4f92a7339511a9770eba3606f0dd6b12;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-sendlog.el b/elmo/elmo-sendlog.el
index 4187f7f..ef62fa9 100644
--- a/elmo/elmo-sendlog.el
+++ b/elmo/elmo-sendlog.el
@@ -37,7 +37,8 @@
 
 ;;; ELMO sendlog folder
 (eval-and-compile
-  (luna-define-class elmo-sendlog-folder (elmo-map-folder) (dir-name directory))
+  (luna-define-class elmo-sendlog-folder (elmo-map-folder elmo-file-tag)
+		     (dir-name directory))
   (luna-define-internal-accessors 'elmo-sendlog-folder))
 
 (luna-define-method elmo-folder-initialize ((folder elmo-sendlog-folder)
@@ -59,17 +60,17 @@
 	result)
     (if (not (file-readable-p filename))
 	nil
-      (elmo-set-work-buf
-       (as-binary-input-file
-	(insert-file-contents filename))
-       (goto-char (point-min))
-       (catch 'done
-	 (while t
-	   (re-search-forward "id=\\([^@]+@[^@]+\\)$" (point-at-eol) t)
-	   (setq result (append result (list (match-string 1))))
-	   (if (eq (1+ (point-at-eol)) (point-max))
-	       (throw 'done nil)
-	     (beginning-of-line 2))))))
+      (with-temp-buffer
+	(as-binary-input-file
+	 (insert-file-contents filename))
+	(goto-char (point-min))
+	(catch 'done
+	  (while t
+	    (re-search-forward "id=\\([^@]+@[^@]+\\)$" (point-at-eol) t)
+	    (setq result (append result (list (match-string 1))))
+	    (if (eq (1+ (point-at-eol)) (point-max))
+		(throw 'done nil)
+	      (beginning-of-line 2))))))
     result))
 
 (luna-define-method elmo-folder-message-file-p ((folder elmo-sendlog-folder))
@@ -82,33 +83,26 @@
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-sendlog-folder)
 					      numbers flag-table)
-  (let ((i 0)
-	(len (length numbers))
-	(new-msgdb (elmo-make-msgdb))
+  (let ((new-msgdb (elmo-make-msgdb))
 	entity message-id flags)
-    (message "Creating msgdb...")
-    (while numbers
-      (setq entity
-	    (elmo-msgdb-create-message-entity-from-file
-	     (elmo-msgdb-message-entity-handler new-msgdb) (car numbers)
-	     (elmo-message-file-name folder (car numbers))))
-      (if (null entity)
-	  (elmo-folder-set-killed-list-internal
-	   folder
-	   (nconc
-	    (elmo-folder-killed-list-internal folder)
-	    (list (car numbers))))
-	(setq message-id (elmo-message-entity-field entity 'message-id)
-	      flags (elmo-flag-table-get flag-table message-id))
-	(elmo-global-flags-set flags folder (car numbers) message-id)
-	(elmo-msgdb-append-entity new-msgdb entity flags))
-      (when (> len elmo-display-progress-threshold)
-	(setq i (1+ i))
-	(elmo-display-progress
-	 'elmo-sendlog-folder-msgdb-create "Creating msgdb..."
-	 (/ (* i 100) len)))
-      (setq numbers (cdr numbers)))
-    (message "Creating msgdb...done")
+    (elmo-with-progress-display (elmo-folder-msgdb-create (length numbers))
+	"Creating msgdb"
+      (dolist (number numbers)
+	(setq entity
+	      (elmo-msgdb-create-message-entity-from-file
+	       (elmo-msgdb-message-entity-handler new-msgdb) number
+	       (elmo-message-file-name folder number)))
+	(if (null entity)
+	    (elmo-folder-set-killed-list-internal
+	     folder
+	     (nconc
+	      (elmo-folder-killed-list-internal folder)
+	      (list number)))
+	  (setq message-id (elmo-message-entity-field entity 'message-id)
+		flags (elmo-flag-table-get flag-table message-id))
+	  (elmo-global-flags-set flags folder number message-id)
+	  (elmo-msgdb-append-entity new-msgdb entity flags))
+	(elmo-progress-notify 'elmo-folder-msgdb-create)))
     new-msgdb))
 
 (luna-define-method elmo-message-fetch