X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-cache.el;h=37f506cda8af1a231f106915af9dd72b7e2bab66;hb=refs%2Fheads%2Fmaster;hp=08fe192fb234ee3d6018a5da4719d77b14dd8606;hpb=2a659b71a404e7c9ccb6aea8f44c5513eddadfd5;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el index 08fe192..37f506c 100644 --- a/elmo/elmo-cache.el +++ b/elmo/elmo-cache.el @@ -36,7 +36,8 @@ (require 'elmo-map) (eval-and-compile - (luna-define-class elmo-cache-folder (elmo-map-folder) (dir-name directory)) + (luna-define-class elmo-cache-folder (elmo-map-folder elmo-file-tag) + (dir-name directory)) (luna-define-internal-accessors 'elmo-cache-folder)) (luna-define-method elmo-folder-initialize ((folder elmo-cache-folder) @@ -75,7 +76,7 @@ "cache/" (file-name-nondirectory f)))) (directory-files (elmo-cache-folder-directory-internal folder) - t "^[^.].*+")))) + t "^[01][0-9A-F]$")))) (luna-define-method elmo-folder-message-file-p ((folder elmo-cache-folder)) t) @@ -87,70 +88,60 @@ (elmo-cache-folder-directory-internal folder))) (luna-define-method elmo-folder-msgdb-create ((folder elmo-cache-folder) - numbers new-mark - already-mark seen-mark - important-mark - seen-list) - (let ((i 0) - (len (length numbers)) - overview number-alist mark-alist entity message-id - num mark) - (message "Creating msgdb...") - (while numbers - (setq entity - (elmo-msgdb-create-overview-entity-from-file - (car numbers) (elmo-message-file-name folder (car numbers)))) - (if (null entity) - () - (setq num (elmo-msgdb-overview-entity-get-number entity)) - (setq overview - (elmo-msgdb-append-element - overview entity)) - (setq message-id (elmo-msgdb-overview-entity-get-id entity)) - (setq number-alist - (elmo-msgdb-number-add number-alist - num - message-id)) - (if (setq mark (or (elmo-msgdb-global-mark-get message-id) - (if (member message-id seen-list) nil new-mark))) - (setq mark-alist - (elmo-msgdb-mark-append - mark-alist - num mark))) - (when (> len elmo-display-progress-threshold) - (setq i (1+ i)) - (elmo-display-progress - 'elmo-cache-folder-msgdb-create "Creating msgdb..." - (/ (* i 100) len)))) - (setq numbers (cdr numbers))) - (message "Creating msgdb...done") - (list overview number-alist mark-alist))) + numbers flag-table) + (let ((new-msgdb (elmo-make-msgdb)) + entity message-id flags) + (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))) + (when entity + (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-folder-append-buffer ((folder elmo-cache-folder) - unread - &optional number) + &optional flags number) ;; dir-name is changed according to msgid. (unless (elmo-cache-folder-dir-name-internal folder) - (let* ((file (elmo-file-cache-get-path (std11-field-body "message-id"))) - (dir (directory-file-name (file-name-directory file)))) - (unless (file-exists-p dir) - (elmo-make-directory dir)) - (when (file-writable-p file) - (write-region-as-binary - (point-min) (point-max) file nil 'no-msg)))) - t) + (let ((msgid (std11-field-body "message-id")) + file dir) + (when msgid + (setq file (elmo-file-cache-get-path msgid)) + (setq dir (directory-file-name (file-name-directory file))) + (unless (file-exists-p dir) + (elmo-make-directory dir)) + (when (and (file-writable-p file) + (not (file-exists-p file))) + (write-region-as-binary + (point-min) (point-max) file nil 'no-msg) + (elmo-folder-preserve-flags folder msgid flags) + t))))) (luna-define-method elmo-map-folder-delete-messages ((folder elmo-cache-folder) locations) (dolist (location locations) (elmo-file-cache-delete (expand-file-name location - (elmo-cache-folder-directory-internal folder))))) + (elmo-cache-folder-directory-internal folder)))) + t) -(luna-define-method elmo-message-fetch-with-cache-process - ((folder elmo-cache-folder) number strategy &optional section unseen) - ;; disbable cache process - (elmo-message-fetch-internal folder number strategy section unseen)) +(luna-define-method elmo-message-fetch + ((folder elmo-cache-folder) number strategy &optional unseen section) + ;; disable cache process + (erase-buffer) + (when (elmo-message-fetch-internal folder number strategy section unseen) + (when (and (not unseen) + (elmo-message-flagged-p folder number 'unread)) + (elmo-message-unset-flag folder number 'unread)) + t)) (luna-define-method elmo-map-message-fetch ((folder elmo-cache-folder) location strategy @@ -161,9 +152,6 @@ (when (file-exists-p file) (insert-file-contents-as-binary file)))) -(luna-define-method elmo-folder-creatable-p ((folder elmo-cache-folder)) - nil) - (luna-define-method elmo-folder-writable-p ((folder elmo-cache-folder)) t) @@ -173,27 +161,6 @@ (luna-define-method elmo-message-file-p ((folder elmo-cache-folder) number) t) -;;; To override elmo-map-folder methods. -(luna-define-method elmo-folder-list-unreads-internal - ((folder elmo-cache-folder) unread-marks &optional mark-alist) - t) - -(luna-define-method elmo-folder-unmark-important ((folder elmo-cache-folder) - numbers) - t) - -(luna-define-method elmo-folder-mark-as-important ((folder elmo-cache-folder) - numbers) - t) - -(luna-define-method elmo-folder-unmark-read ((folder elmo-cache-folder) - numbers) - t) - -(luna-define-method elmo-folder-mark-as-read ((folder elmo-cache-folder) - numbers) - t) - (require 'product) (product-provide (provide 'elmo-cache) (require 'elmo-version))