X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-shimbun.el;h=889280ae20291b7a6a1489e8d42bce2fb2ea573f;hb=697dc1db8069eea6fa28386c2271ccbeb3618898;hp=b7d989f32d007ec8a1ca734b8c831a244d5a561f;hpb=982e4771c9b26f71d3c0d765ccff8e8914ac3127;p=elisp%2Fwanderlust.git diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el index b7d989f..889280a 100644 --- a/elmo/elmo-shimbun.el +++ b/elmo/elmo-shimbun.el @@ -33,6 +33,10 @@ (require 'elmo-dop) (require 'shimbun) +(eval-when-compile + (require 'cl) + (defun-maybe shimbun-servers-list ())) + (defcustom elmo-shimbun-check-interval 60 "*Check interval for shimbun." :type 'integer @@ -61,11 +65,13 @@ See `shimbun-headers' for more detail about RANGE." (integer :tag "number")))) :group 'elmo) -(defcustom elmo-shimbun-update-overview-folder-list nil +(defcustom elmo-shimbun-update-overview-folder-list 'all "*List of FOLDER-REGEXP. FOLDER-REGEXP is the regexp of shimbun folder name which should be -update overview when message is fetched." - :type '(repeat (regexp :tag "Folder Regexp")) +update overview when message is fetched. +If it is the symbol `all', update overview for all shimbun folders." + :type '(choice (const :tag "All shimbun folders" all) + (repeat (regexp :tag "Folder Regexp"))) :group 'elmo) ;; Shimbun header. @@ -89,9 +95,7 @@ update overview when message is fetched." (luna-define-internal-accessors 'shimbun-elmo-mua)) (luna-define-method shimbun-mua-search-id ((mua shimbun-elmo-mua) id) - (elmo-msgdb-overview-get-entity id - (elmo-folder-msgdb - (shimbun-elmo-mua-folder-internal mua)))) + (elmo-message-entity (shimbun-elmo-mua-folder-internal mua) id)) (eval-and-compile (luna-define-class elmo-shimbun-folder @@ -102,24 +106,21 @@ update overview when message is fetched." (defun elmo-shimbun-folder-entity-hash (folder) (or (elmo-shimbun-folder-entity-hash-internal folder) - (let ((overviews (elmo-msgdb-get-overview (elmo-folder-msgdb folder))) + (let ((overviews (elmo-folder-list-message-entities folder)) hash id) (when overviews (setq hash (elmo-make-hash (length overviews))) (dolist (entity overviews) - (elmo-set-hash-val (elmo-msgdb-overview-entity-get-id entity) + (elmo-set-hash-val (elmo-message-entity-field entity 'message-id) entity hash) - (when (setq id (elmo-msgdb-overview-entity-get-extra-field - entity "x-original-id")) + (when (setq id (elmo-message-entity-field entity 'x-original-id)) (elmo-set-hash-val id entity hash))) (elmo-shimbun-folder-set-entity-hash-internal folder hash))))) (defsubst elmo-shimbun-folder-shimbun-header (folder location) (let ((hash (elmo-shimbun-folder-header-hash-internal folder))) (or (and hash (elmo-get-hash-val location hash)) - (let ((entity (elmo-msgdb-overview-get-entity - location - (elmo-folder-msgdb folder))) + (let ((entity (elmo-message-entity folder location)) (elmo-hash-minimum-size 63) header) (when entity @@ -128,7 +129,7 @@ update overview when message is fetched." (elmo-shimbun-folder-set-header-hash-internal folder (setq hash (elmo-make-hash)))) - (elmo-set-hash-val (elmo-msgdb-overview-entity-get-id entity) + (elmo-set-hash-val (elmo-message-entity-field entity 'message-id) header hash) header))))) @@ -138,14 +139,6 @@ update overview when message is fetched." (+ (* (- (car now) (car time)) 65536) (- (nth 1 now) (nth 1 time))))) -(defun elmo-shimbun-parse-time-string (string) - "Parse the time-string STRING and return its time as Emacs style." - (ignore-errors - (let ((x (timezone-fix-time string nil nil))) - (encode-time (aref x 5) (aref x 4) (aref x 3) - (aref x 2) (aref x 1) (aref x 0) - (aref x 6))))) - (defsubst elmo-shimbun-headers-check-p (folder) (or (null (elmo-shimbun-folder-last-check-internal folder)) (and (elmo-shimbun-folder-last-check-internal folder) @@ -155,31 +148,24 @@ update overview when message is fetched." (defun elmo-shimbun-entity-to-header (entity) (let (message-id shimbun-id) - (if (setq message-id (elmo-msgdb-overview-entity-get-extra-field - entity "x-original-id")) - (setq shimbun-id (elmo-msgdb-overview-entity-get-id entity)) - (setq message-id (elmo-msgdb-overview-entity-get-id entity) + (if (setq message-id (elmo-message-entity-field entity 'x-original-id)) + (setq shimbun-id (elmo-message-entity-field entity 'message-id)) + (setq message-id (elmo-message-entity-field entity 'message-id) shimbun-id nil)) - (elmo-set-work-buf - (set-buffer-multibyte t) - (shimbun-make-header - (elmo-msgdb-overview-entity-get-number entity) - (shimbun-mime-encode-string - (decode-mime-charset-string - (elmo-msgdb-overview-entity-get-subject-no-decode entity) - elmo-mime-charset)) - (shimbun-mime-encode-string - (decode-mime-charset-string - (elmo-msgdb-overview-entity-get-from-no-decode entity) - elmo-mime-charset)) - (elmo-msgdb-overview-entity-get-date entity) - message-id - (elmo-msgdb-overview-entity-get-references entity) - 0 - 0 - (elmo-msgdb-overview-entity-get-extra-field entity "xref") - (and shimbun-id - (list (cons "x-shimbun-id" shimbun-id))))))) + (elmo-with-enable-multibyte + (shimbun-create-header + (elmo-message-entity-number entity) + (elmo-message-entity-field entity 'subject) + (elmo-message-entity-field entity 'from) + (elmo-time-make-date-string + (elmo-message-entity-field entity 'date)) + message-id + (elmo-message-entity-field entity 'references) + (elmo-message-entity-field entity 'size) + 0 + (elmo-message-entity-field entity 'xref) + (and shimbun-id + (list (cons "x-shimbun-id" shimbun-id))))))) (defsubst elmo-shimbun-folder-header-hash-setup (folder headers) (let ((hash (or (elmo-shimbun-folder-header-hash-internal folder) @@ -190,8 +176,8 @@ update overview when message is fetched." (defun elmo-shimbun-get-headers (folder) (let* ((shimbun (elmo-shimbun-folder-shimbun-internal folder)) - (key (concat (shimbun-server-internal shimbun) - "." (shimbun-current-group-internal shimbun))) + (key (concat (shimbun-server shimbun) + "." (shimbun-current-group shimbun))) (elmo-hash-minimum-size 63) headers) ;; new headers. @@ -199,9 +185,7 @@ update overview when message is fetched." (delq nil (mapcar (lambda (x) - (unless (elmo-msgdb-overview-get-entity - (shimbun-header-id x) - (elmo-folder-msgdb folder)) + (unless (elmo-message-entity folder (shimbun-header-id x)) x)) ;; This takes much time. (shimbun-headers @@ -224,8 +208,11 @@ update overview when message is fetched." (when (nth 0 server-group) ; server (elmo-shimbun-folder-set-shimbun-internal folder - (shimbun-open (nth 0 server-group) - (luna-make-entity 'shimbun-elmo-mua :folder folder)))) + (condition-case nil + (shimbun-open (nth 0 server-group) + (luna-make-entity 'shimbun-elmo-mua :folder folder)) + (file-error + (luna-make-entity 'shimbun :server (nth 0 server-group)))))) (when (nth 1 server-group) (elmo-shimbun-folder-set-group-internal folder @@ -243,14 +230,14 @@ update overview when message is fetched." (elmo-shimbun-folder-shimbun-internal folder) (elmo-shimbun-folder-group-internal folder)) (let ((inhibit-quit t)) - (unless (elmo-map-folder-location-alist-internal folder) - (elmo-map-folder-location-setup + (unless (elmo-location-map-alist folder) + (elmo-location-map-setup folder (elmo-msgdb-location-load (elmo-folder-msgdb-path folder)))) (when (and (elmo-folder-plugged-p folder) (elmo-shimbun-headers-check-p folder)) (elmo-shimbun-get-headers folder) - (elmo-map-folder-update-locations + (elmo-location-map-update folder (elmo-map-folder-list-message-locations folder)))))) @@ -278,33 +265,33 @@ update overview when message is fetched." folder nil)) (luna-define-method elmo-folder-plugged-p ((folder elmo-shimbun-folder)) - (elmo-plugged-p - "shimbun" - (and (elmo-shimbun-folder-shimbun-internal folder) - (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder))) - nil nil - (and (elmo-shimbun-folder-shimbun-internal folder) - (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder))))) + (if (elmo-shimbun-folder-shimbun-internal folder) + (elmo-plugged-p + "shimbun" + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) + nil nil + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder))) + t)) (luna-define-method elmo-folder-set-plugged ((folder elmo-shimbun-folder) plugged &optional add) (elmo-set-plugged plugged "shimbun" - (shimbun-server-internal + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) nil nil nil - (shimbun-server-internal + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) add)) (luna-define-method elmo-net-port-info ((folder elmo-shimbun-folder)) (list "shimbun" - (shimbun-server-internal + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) nil)) (luna-define-method elmo-folder-check :around ((folder elmo-shimbun-folder)) - (when (shimbun-current-group-internal + (when (shimbun-current-group (elmo-shimbun-folder-shimbun-internal folder)) (when (and (elmo-folder-plugged-p folder) (elmo-shimbun-headers-check-p folder)) @@ -322,7 +309,7 @@ update overview when message is fetched." (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-shimbun-folder)) (expand-file-name - (concat (shimbun-server-internal + (concat (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) "/" (elmo-shimbun-folder-group-internal folder)) @@ -338,98 +325,58 @@ update overview when message is fetched." (shimbun-header-insert (elmo-shimbun-folder-shimbun-internal folder) header) - (setq ov (elmo-msgdb-create-overview-from-buffer number)) - (elmo-msgdb-overview-entity-set-extra + (setq ov (elmo-msgdb-create-message-entity-from-buffer + (elmo-msgdb-message-entity-handler + (elmo-folder-msgdb-internal folder)) number)) + (elmo-message-entity-set-field ov - (nconc - (elmo-msgdb-overview-entity-get-extra ov) - (list (cons "xref" (shimbun-header-xref header))))))))) + 'xref (shimbun-header-xref header))) + ov))) (luna-define-method elmo-folder-msgdb-create ((folder elmo-shimbun-folder) - numlist new-mark - already-mark seen-mark - important-mark - seen-list) - (let* (overview number-alist mark-alist entity - i percent number length pair msgid gmark seen) - (setq length (length numlist)) - (setq i 0) - (message "Creating msgdb...") - (while numlist - (setq entity - (elmo-shimbun-msgdb-create-entity - folder (car numlist))) - (when entity - (setq overview - (elmo-msgdb-append-element - overview entity)) - (setq number (elmo-msgdb-overview-entity-get-number entity)) - (setq msgid (elmo-msgdb-overview-entity-get-id entity)) - (setq number-alist - (elmo-msgdb-number-add number-alist - number msgid)) - (setq seen (member msgid seen-list)) - (if (setq gmark (or (elmo-msgdb-global-mark-get msgid) - (if (elmo-file-cache-status - (elmo-file-cache-get msgid)) - (if seen nil already-mark) - (if seen - (if elmo-shimbun-use-cache - seen-mark) - new-mark)))) - (setq mark-alist - (elmo-msgdb-mark-append mark-alist - number gmark)))) - (when (> length elmo-display-progress-threshold) - (setq i (1+ i)) - (setq percent (/ (* i 100) length)) - (elmo-display-progress - 'elmo-folder-msgdb-create "Creating msgdb..." - percent)) - (setq numlist (cdr numlist))) - (message "Creating msgdb...done") - (elmo-msgdb-sort-by-date - (list overview number-alist mark-alist)))) + numlist flag-table) + (let ((new-msgdb (elmo-make-msgdb)) + entity msgid flags) + (elmo-with-progress-display (elmo-folder-msgdb-create (length numlist)) + "Creating msgdb" + (dolist (number numlist) + (setq entity (elmo-shimbun-msgdb-create-entity folder number)) + (when entity + (setq msgid (elmo-message-entity-field entity 'message-id) + flags (elmo-flag-table-get flag-table msgid)) + (elmo-global-flags-set flags folder number msgid) + (elmo-msgdb-append-entity new-msgdb entity flags)) + (elmo-progress-notify 'elmo-folder-msgdb-create))) + new-msgdb)) (luna-define-method elmo-folder-message-file-p ((folder elmo-shimbun-folder)) nil) -(defsubst elmo-shimbun-update-overview (folder shimbun-id header) - (let ((entity (elmo-msgdb-overview-get-entity shimbun-id - (elmo-folder-msgdb folder))) - (message-id (shimbun-header-id header)) +(defsubst elmo-shimbun-update-overview (folder entity shimbun-id header) + (let ((message-id (shimbun-header-id header)) references) - (unless (string= shimbun-id message-id) - (elmo-msgdb-overview-entity-set-extra-field - entity "x-original-id" message-id) - (elmo-shimbun-header-set-extra-field - header "x-shimbun-id" shimbun-id) - (elmo-set-hash-val message-id - entity - (elmo-shimbun-folder-entity-hash folder)) - (elmo-set-hash-val shimbun-id - entity - (elmo-shimbun-folder-entity-hash folder))) - (elmo-msgdb-overview-entity-set-from - entity - (elmo-mime-string (shimbun-header-from header))) - (elmo-msgdb-overview-entity-set-subject - entity - (elmo-mime-string (shimbun-header-subject header))) - (elmo-msgdb-overview-entity-set-date - entity (shimbun-header-date header)) - (when (setq references - (or (elmo-msgdb-get-last-message-id - (elmo-field-body "in-reply-to")) - (elmo-msgdb-get-last-message-id - (elmo-field-body "references")))) - (elmo-msgdb-overview-entity-set-references - entity - (or (elmo-msgdb-overview-entity-get-id - (elmo-get-hash-val - references - (elmo-shimbun-folder-entity-hash folder))) - references))))) + (when (elmo-msgdb-update-entity + (elmo-folder-msgdb folder) + entity + (nconc + (unless (string= shimbun-id message-id) + (elmo-shimbun-header-set-extra-field + header "x-shimbun-id" shimbun-id) + (elmo-set-hash-val message-id + entity + (elmo-shimbun-folder-entity-hash folder)) + (elmo-set-hash-val shimbun-id + entity + (elmo-shimbun-folder-entity-hash folder)) + (list (cons 'x-original-id message-id))) + (list + (cons 'from (shimbun-header-from header 'no-encode)) + (cons 'subject (shimbun-header-subject header 'no-encode)) + (cons 'date (shimbun-header-date header)) + (cons 'references + (elmo-msgdb-get-references-from-buffer))))) + (elmo-emit-signal 'update-overview folder + (elmo-message-entity-number entity))))) (luna-define-method elmo-map-message-fetch ((folder elmo-shimbun-folder) location strategy @@ -441,10 +388,13 @@ update overview when message is fetched." shimbun-id) (shimbun-article (elmo-shimbun-folder-shimbun-internal folder) header) - (when (elmo-string-match-member - (elmo-folder-name-internal folder) - elmo-shimbun-update-overview-folder-list) - (elmo-shimbun-update-overview folder location header)) + (when (or (eq elmo-shimbun-update-overview-folder-list 'all) + (elmo-string-match-member + (elmo-folder-name-internal folder) + elmo-shimbun-update-overview-folder-list)) + (let ((entity (elmo-message-entity folder location))) + (when entity + (elmo-shimbun-update-overview folder entity location header)))) (when (setq shimbun-id (elmo-shimbun-header-extra-field header "x-shimbun-id")) (goto-char (point-min)) @@ -476,17 +426,15 @@ update overview when message is fetched." (delq nil (mapcar (lambda (ov) - (when (and (elmo-msgdb-overview-entity-get-extra-field - ov "xref") + (when (and (elmo-message-entity-field ov 'xref) (if expire-days (< (elmo-shimbun-lapse-seconds - (elmo-shimbun-parse-time-string - (elmo-msgdb-overview-entity-get-date ov))) + (elmo-message-entity-field ov 'date)) (* expire-days 86400 ; seconds per day )) t)) - (elmo-msgdb-overview-entity-get-id ov))) - (elmo-msgdb-get-overview (elmo-folder-msgdb folder)))) + (elmo-message-entity-field ov 'message-id))) + (elmo-folder-list-message-entities folder))) (mapcar (lambda (header) (or (elmo-shimbun-header-extra-field header "x-shimbun-id") @@ -501,7 +449,7 @@ update overview when message is fetched." (mapcar (lambda (fld) (concat prefix - (shimbun-server-internal + (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)) "." fld)) (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder))))) @@ -516,46 +464,33 @@ update overview when message is fetched." (setq folders (append folders (mapcar - (lambda (fld) (concat prefix server "." fld)) + (lambda (group) (concat prefix server "." group)) (shimbun-groups - (shimbun-open server - (let ((fld - (elmo-make-folder - (concat prefix server)))) - (luna-make-entity - 'shimbun-elmo-mua - :folder fld)))))))) + (elmo-shimbun-folder-shimbun-internal + (elmo-get-folder (concat prefix server)))))))) folders))))) (luna-define-method elmo-folder-exists-p ((folder elmo-shimbun-folder)) (if (elmo-shimbun-folder-group-internal folder) - (progn + (if (fboundp 'shimbun-group-p) + (shimbun-group-p (elmo-shimbun-folder-shimbun-internal folder) + (elmo-shimbun-folder-group-internal folder)) (member (elmo-shimbun-folder-group-internal folder) - (shimbun-groups (elmo-shimbun-folder-shimbun-internal - folder)))) + (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder)))) t)) -;;; To override elmo-map-folder methods. -(luna-define-method elmo-folder-list-unreads-internal - ((folder elmo-shimbun-folder) unread-marks &optional mark-alist) - t) - -(luna-define-method elmo-folder-unmark-important ((folder elmo-shimbun-folder) - numbers) +(luna-define-method elmo-folder-delete-messages ((folder elmo-shimbun-folder) + numbers) + (elmo-folder-kill-messages folder numbers) t) -(luna-define-method elmo-folder-mark-as-important ((folder elmo-shimbun-folder) - numbers) - t) - -(luna-define-method elmo-folder-unmark-read ((folder elmo-shimbun-folder) - numbers) - t) - -(luna-define-method elmo-folder-mark-as-read ((folder elmo-shimbun-folder) - numbers) - t) +(luna-define-method elmo-message-entity-parent ((folder elmo-shimbun-folder) + entity) + (let ((references (elmo-message-entity-field entity 'references))) + (and references + (elmo-get-hash-val references + (elmo-shimbun-folder-entity-hash folder))))) (require 'product) (product-provide (provide 'elmo-shimbun) (require 'elmo-version))