* elmo-msgdb.el (elmo-msgdb-get-message-id-from-buffer): Added

[elisp/wanderlust.git] / elmo / elmo-localdir.el

diff --git a/elmo/elmo-localdir.el b/elmo/elmo-localdir.el
index cd571ea..4907de0 100644 (file)
--- a/elmo/elmo-localdir.el
+++ b/elmo/elmo-localdir.el
@@ -140,10 +140,6 @@
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-localdir-folder)
                                              numbers
-                                             new-mark
-                                             already-mark
-                                             seen-mark
-                                             important-mark
                                              seen-list)
   (when numbers
     (let ((dir (elmo-localdir-folder-directory-internal folder))
@@ -172,10 +168,10 @@
                              (if (elmo-file-cache-exists-p message-id) ; XXX
                                  (if seen
                                      nil
-                                   already-mark)
+                                   elmo-msgdb-unread-cached-mark)
                                (if seen
                                    nil ;;seen-mark
-                                 new-mark))))
+                                 elmo-msgdb-new-mark))))
              (setq mark-alist
                    (elmo-msgdb-mark-append
                     mark-alist
@@ -227,7 +223,7 @@
 
 (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))
            (succeeds numbers)
@@ -295,11 +291,11 @@
        (elmo-make-directory dir))
       t)))
 
-(luna-define-method elmo-folder-delete ((folder elmo-localdir-folder))
+(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-directory dir t)
+      (elmo-delete-match-files dir "[0-9]+" t)
       t)))
 
 (luna-define-method elmo-folder-rename-internal ((folder elmo-localdir-folder)
@@ -323,46 +319,6 @@
                     (elmo-localdir-folder-directory-internal folder))
    condition number number-list))
 
-(luna-define-method elmo-folder-search ((folder elmo-localdir-folder)
-                                       condition &optional numbers)
-  (let* ((msgs (or numbers (elmo-folder-list-messages folder)))
-        (num (length msgs))
-        (i 0)
-        last cur number-list case-fold-search ret-val)
-    (cond
-     ;; short cut.
-     ((and (vectorp condition)
-          (not (eq (elmo-filter-type condition) 'unmatch))
-          (string= (elmo-filter-key condition) "last"))
-      (nthcdr (max (- (length msgs)
-                     (string-to-int (elmo-filter-value condition)))
-                  0)
-             msgs))
-     ((and (vectorp condition)
-          (not (eq (elmo-filter-type condition) 'unmatch))
-          (string= (elmo-filter-key condition) "first"))
-      (let ((rest (nthcdr (string-to-int (elmo-filter-value condition) )
-                         msgs)))
-       (mapcar '(lambda (x)
-                  (delete x msgs)) rest))
-      msgs)
-     (t
-      (setq number-list msgs)
-      (while msgs
-       (if (elmo-localdir-field-condition-match folder condition
-                                                (car msgs) number-list)
-           (setq ret-val (cons (car msgs) ret-val)))
-       (when (> num elmo-display-progress-threshold)
-         (setq i (1+ i))
-         (setq cur (/ (* i 100) num))
-         (unless (eq cur last)
-           (elmo-display-progress
-            'elmo-localdir-search "Searching..."
-            cur)
-           (setq last cur)))
-       (setq msgs (cdr msgs)))
-      (nreverse ret-val)))))
-
 (luna-define-method elmo-folder-pack-numbers ((folder elmo-localdir-folder))
   (let* ((dir (elmo-localdir-folder-directory-internal folder))
         (msgdb (elmo-folder-msgdb folder))
@@ -403,12 +359,10 @@
     (message "Packing...done")
     (elmo-folder-set-msgdb-internal
      folder
-     (list (elmo-msgdb-get-overview msgdb)
-          onum-alist
-          new-mark-alist
-          ;; remake hash table
-          (elmo-msgdb-make-overview-hashtb
-           (elmo-msgdb-get-overview msgdb))))))
+     (elmo-make-msgdb
+      (elmo-msgdb-get-overview msgdb)
+      onum-alist
+      new-mark-alist))))
 
 (luna-define-method elmo-folder-message-file-p ((folder elmo-localdir-folder))
   t)