(require 'elmo-dop)
(require 'shimbun)
+(eval-when-compile
+ (defun-maybe shimbun-servers-list ()))
+
(defcustom elmo-shimbun-check-interval 60
"*Check interval for shimbun."
:type 'integer
(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-msgdb-message-entity (elmo-folder-msgdb
+ (shimbun-elmo-mua-folder-internal mua))
+ id))
(eval-and-compile
(luna-define-class elmo-shimbun-folder
(elmo-map-folder) (shimbun headers header-hash
+ entity-hash
group range last-check))
(luna-define-internal-accessors 'elmo-shimbun-folder))
+(defun elmo-shimbun-folder-entity-hash (folder)
+ (or (elmo-shimbun-folder-entity-hash-internal 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-message-entity-field entity 'message-id)
+ entity hash)
+ (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-message-entity
+ (elmo-folder-msgdb folder)
+ location))
+ (elmo-hash-minimum-size 63)
+ header)
+ (when entity
+ (setq header (elmo-shimbun-entity-to-header entity))
+ (unless hash
+ (elmo-shimbun-folder-set-header-hash-internal
+ folder
+ (setq hash (elmo-make-hash))))
+ (elmo-set-hash-val (elmo-message-entity-field entity
+ 'message-id)
+ header
+ hash)
+ header)))))
+
(defsubst elmo-shimbun-lapse-seconds (time)
(let ((now (current-time)))
(+ (* (- (car now) (car time)) 65536)
(elmo-shimbun-folder-last-check-internal folder))
elmo-shimbun-check-interval))))
-(defun elmo-shimbun-msgdb-to-headers (folder expire-days)
- (let (headers message-id shimbun-id)
- (dolist (ov (elmo-msgdb-get-overview (elmo-folder-msgdb folder)))
- (when (and (elmo-msgdb-overview-entity-get-extra-field ov "xref")
- (if expire-days
- (< (elmo-shimbun-lapse-seconds
- (elmo-shimbun-parse-time-string
- (elmo-msgdb-overview-entity-get-date ov)))
- (* expire-days 86400 ; seconds per day
- ))
- t))
- (if (setq message-id (elmo-msgdb-overview-entity-get-extra-field
- ov "x-original-id"))
- (setq shimbun-id (elmo-msgdb-overview-entity-get-id ov))
- (setq message-id (elmo-msgdb-overview-entity-get-id ov)
- shimbun-id nil))
- (setq headers
- (cons (shimbun-make-header
- (elmo-msgdb-overview-entity-get-number ov)
- (shimbun-mime-encode-string
- (elmo-msgdb-overview-entity-get-subject ov))
- (shimbun-mime-encode-string
- (elmo-msgdb-overview-entity-get-from ov))
- (elmo-msgdb-overview-entity-get-date ov)
- message-id
- (elmo-msgdb-overview-entity-get-references ov)
- 0
- 0
- (elmo-msgdb-overview-entity-get-extra-field ov "xref")
- (and shimbun-id
- (list (cons "x-shimbun-id" shimbun-id))))
- headers))))
- (nreverse headers)))
+(defun elmo-shimbun-entity-to-header (entity)
+ (let (message-id shimbun-id)
+ (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-message-entity-number entity)
+ (shimbun-mime-encode-string
+ (elmo-message-entity-field entity 'subject 'decode))
+ (shimbun-mime-encode-string
+ (elmo-message-entity-field entity 'from 'decode))
+ (elmo-message-entity-field entity 'date)
+ message-id
+ (elmo-message-entity-field entity 'references)
+ 0
+ 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 (elmo-make-hash (length headers)))
- shimbun-id)
+ (let ((hash (or (elmo-shimbun-folder-header-hash-internal folder)
+ (elmo-make-hash (length headers)))))
(dolist (header headers)
- (elmo-set-hash-val (shimbun-header-id header) header hash)
- (when (setq shimbun-id
- (elmo-shimbun-header-extra-field header "x-shimbun-id"))
- (elmo-set-hash-val shimbun-id header hash)))
+ (elmo-set-hash-val (shimbun-header-id header) header hash))
(elmo-shimbun-folder-set-header-hash-internal folder hash)))
-(defun elmo-shimbun-folder-setup (folder)
- ;; Resume headers from existing msgdb.
- (elmo-shimbun-folder-set-headers-internal
- folder
- (elmo-shimbun-msgdb-to-headers folder nil))
- (elmo-shimbun-folder-header-hash-setup
- folder
- (elmo-shimbun-folder-headers-internal folder)))
-
(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)))
- (elmo-hash-minimum-size 0)
- entry headers hash)
+ (key (concat (shimbun-server shimbun)
+ "." (shimbun-current-group shimbun)))
+ (elmo-hash-minimum-size 63)
+ headers)
;; new headers.
(setq headers
(delq nil
(mapcar
(lambda (x)
- (unless (elmo-msgdb-overview-get-entity
- (shimbun-header-id x)
- (elmo-folder-msgdb folder))
+ (unless (elmo-msgdb-message-entity
+ (elmo-folder-msgdb folder)
+ (shimbun-header-id x))
x))
;; This takes much time.
(shimbun-headers
(elmo-shimbun-folder-shimbun-internal folder)
(elmo-shimbun-folder-range-internal folder)))))
- (elmo-shimbun-folder-set-headers-internal
- folder
- (nconc (elmo-shimbun-msgdb-to-headers
- folder (shimbun-article-expiration-days
- (elmo-shimbun-folder-shimbun-internal folder)))
- headers))
- (elmo-shimbun-folder-header-hash-setup
- folder
- (elmo-shimbun-folder-headers-internal folder))
+ (elmo-shimbun-folder-set-headers-internal folder headers)
+ (when headers
+ (elmo-shimbun-folder-header-hash-setup folder headers))
(elmo-shimbun-folder-set-last-check-internal folder (current-time))))
(luna-define-method elmo-folder-initialize ((folder
elmo-shimbun-folder)
name)
- (let ((server-group (if (string-match "\\([^.]+\\)\\." name)
- (list (elmo-match-string 1 name)
- (substring name (match-end 0)))
- (list name))))
- (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))))
- (when (nth 1 server-group)
- (elmo-shimbun-folder-set-group-internal
+ (if (string= name "")
+ folder
+ (let ((server-group (if (string-match "\\([^.]+\\)\\." name)
+ (list (elmo-match-string 1 name)
+ (substring name (match-end 0)))
+ (list name))))
+ (when (nth 0 server-group) ; server
+ (elmo-shimbun-folder-set-shimbun-internal
+ 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
+ (nth 1 server-group)))
+ (elmo-shimbun-folder-set-range-internal
folder
- (nth 1 server-group)))
- (elmo-shimbun-folder-set-range-internal
- folder
- (or (cdr (elmo-string-matched-assoc (elmo-folder-name-internal folder)
- elmo-shimbun-index-range-alist))
- elmo-shimbun-default-index-range))
- folder))
+ (or (cdr (elmo-string-matched-assoc (elmo-folder-name-internal folder)
+ elmo-shimbun-index-range-alist))
+ elmo-shimbun-default-index-range))
+ folder)))
(luna-define-method elmo-folder-open-internal ((folder elmo-shimbun-folder))
- (shimbun-open-group
- (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
- folder
- (elmo-msgdb-location-load (elmo-folder-msgdb-path folder)))))
- (cond ((and (elmo-folder-plugged-p folder)
- (elmo-shimbun-headers-check-p folder))
- (elmo-shimbun-get-headers folder)
- (elmo-map-folder-update-locations
- folder
- (elmo-map-folder-list-message-locations folder)))
- ((null (elmo-shimbun-folder-headers-internal folder))
- ;; Resume headers from existing msgdb.
- (elmo-shimbun-folder-setup folder))))
+ (when (elmo-shimbun-folder-shimbun-internal folder)
+ (shimbun-open-group
+ (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
+ 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
+ folder
+ (elmo-map-folder-list-message-locations folder))))))
(luna-define-method elmo-folder-reserve-status-p ((folder elmo-shimbun-folder))
t)
+(luna-define-method elmo-folder-local-p ((folder elmo-shimbun-folder))
+ nil)
+
(luna-define-method elmo-message-use-cache-p ((folder elmo-shimbun-folder)
number)
elmo-shimbun-use-cache)
-(luna-define-method elmo-folder-creatable-p ((folder elmo-shimbun-folder))
- nil)
-
(luna-define-method elmo-folder-close-internal :after ((folder
elmo-shimbun-folder))
(shimbun-close-group
folder nil)
(elmo-shimbun-folder-set-header-hash-internal
folder nil)
+ (elmo-shimbun-folder-set-entity-hash-internal
+ folder nil)
(elmo-shimbun-folder-set-last-check-internal
folder nil))
(luna-define-method elmo-folder-plugged-p ((folder elmo-shimbun-folder))
(elmo-plugged-p
"shimbun"
- (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder))
+ (and (elmo-shimbun-folder-shimbun-internal folder)
+ (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))
nil nil
- (shimbun-server-internal (elmo-shimbun-folder-shimbun-internal folder))))
+ (and (elmo-shimbun-folder-shimbun-internal folder)
+ (shimbun-server (elmo-shimbun-folder-shimbun-internal folder)))))
(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))
&optional keep-killed)
(elmo-shimbun-folder-set-headers-internal folder nil)
(elmo-shimbun-folder-set-header-hash-internal folder nil)
+ (elmo-shimbun-folder-set-entity-hash-internal folder nil)
(elmo-shimbun-folder-set-last-check-internal folder nil)
(luna-call-next-method))
(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))
(expand-file-name "shimbun" elmo-msgdb-directory)))
(defun elmo-shimbun-msgdb-create-entity (folder number)
- (let ((header (elmo-get-hash-val
- (elmo-map-message-location folder number)
- (elmo-shimbun-folder-header-hash-internal folder)))
+ (let ((header (elmo-shimbun-folder-shimbun-header
+ folder
+ (elmo-map-message-location folder number)))
ov)
(when header
(with-temp-buffer
(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)
+ numlist flag-table)
+ (let ((new-msgdb (elmo-make-msgdb))
+ entity i percent length msgid flags)
(setq length (length numlist))
(setq i 0)
(message "Creating msgdb...")
(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))))
+ (setq msgid (elmo-message-entity-field entity 'message-id)
+ flags (elmo-flag-table-get flag-table msgid))
+ (elmo-global-flags-set flags folder (car numlist) msgid)
+ (elmo-msgdb-append-entity new-msgdb entity flags))
(when (> length elmo-display-progress-threshold)
(setq i (1+ i))
(setq percent (/ (* i 100) length))
'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))))
+ (message "Creating msgdb...done")
+ (elmo-msgdb-sort-by-date 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)))
+ (let ((entity (elmo-msgdb-message-entity (elmo-folder-msgdb folder)
+ shimbun-id))
(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-message-entity-set-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
- header
- (elmo-shimbun-folder-header-hash-internal folder)))
- (elmo-msgdb-overview-entity-set-from
+ entity
+ (elmo-shimbun-folder-entity-hash folder))
+ (elmo-set-hash-val shimbun-id
+ entity
+ (elmo-shimbun-folder-entity-hash folder)))
+ (elmo-message-entity-set-field
entity
+ 'from
(elmo-mime-string (shimbun-header-from header)))
- (elmo-msgdb-overview-entity-set-subject
+ (elmo-message-entity-set-field
entity
+ 'subject
(elmo-mime-string (shimbun-header-subject header)))
- (elmo-msgdb-overview-entity-set-date
- entity (shimbun-header-date header))
+ (elmo-message-entity-set-field
+ entity
+ 'date
+ (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
+ (elmo-message-entity-set-field
entity
- (or (elmo-shimbun-header-extra-field
- (elmo-get-hash-val references
- (elmo-shimbun-folder-header-hash-internal
- folder))
- "x-shimbun-id")
+ 'references
+ (or (elmo-message-entity-field
+ (elmo-get-hash-val
+ references
+ (elmo-shimbun-folder-entity-hash folder))
+ 'message-id)
references)))))
(luna-define-method elmo-map-message-fetch ((folder elmo-shimbun-folder)
location strategy
&optional section unseen)
(if (elmo-folder-plugged-p folder)
- (let ((header (elmo-get-hash-val
- location
- (elmo-shimbun-folder-header-hash-internal folder)))
+ (let ((header (elmo-shimbun-folder-shimbun-header
+ folder
+ location))
shimbun-id)
(shimbun-article (elmo-shimbun-folder-shimbun-internal folder)
header)
(luna-define-method elmo-map-folder-list-message-locations
((folder elmo-shimbun-folder))
- (mapcar
- (lambda (header)
- (or (elmo-shimbun-header-extra-field header "x-shimbun-id")
- (shimbun-header-id header)))
- (elmo-shimbun-folder-headers-internal folder)))
+ (let ((expire-days (shimbun-article-expiration-days
+ (elmo-shimbun-folder-shimbun-internal folder))))
+ (elmo-uniq-list
+ (nconc
+ (delq nil
+ (mapcar
+ (lambda (ov)
+ (when (and (elmo-message-entity-field ov 'xref)
+ (if expire-days
+ (< (elmo-shimbun-lapse-seconds
+ (elmo-shimbun-parse-time-string
+ (elmo-message-entity-field ov 'date)))
+ (* expire-days 86400 ; seconds per day
+ ))
+ t))
+ (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")
+ (shimbun-header-id header)))
+ (elmo-shimbun-folder-headers-internal folder))))))
(luna-define-method elmo-folder-list-subfolders ((folder elmo-shimbun-folder)
&optional one-level)
- (unless (elmo-shimbun-folder-group-internal folder)
- (mapcar
- (lambda (x)
- (concat (elmo-folder-prefix-internal folder)
- (shimbun-server-internal
- (elmo-shimbun-folder-shimbun-internal folder))
- "."
- x))
- (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder)))))
+ (let ((prefix (elmo-folder-prefix-internal folder)))
+ (cond ((elmo-shimbun-folder-shimbun-internal folder)
+ (unless (elmo-shimbun-folder-group-internal folder)
+ (mapcar
+ (lambda (fld)
+ (concat prefix
+ (shimbun-server
+ (elmo-shimbun-folder-shimbun-internal folder))
+ "." fld))
+ (shimbun-groups (elmo-shimbun-folder-shimbun-internal folder)))))
+ ;; the rest are for "@/" group
+ (one-level
+ (mapcar
+ (lambda (server) (list (concat prefix server)))
+ (shimbun-servers-list)))
+ (t
+ (let (folders)
+ (dolist (server (shimbun-servers-list))
+ (setq folders
+ (append folders
+ (mapcar
+ (lambda (fld) (concat prefix server "." fld))
+ (shimbun-groups
+ (shimbun-open server
+ (let ((fld
+ (elmo-make-folder
+ (concat prefix server))))
+ (luna-make-entity
+ 'shimbun-elmo-mua
+ :folder fld))))))))
+ folders)))))
(luna-define-method elmo-folder-exists-p ((folder elmo-shimbun-folder))
(if (elmo-shimbun-folder-group-internal folder)
folder))))
t))
-(luna-define-method elmo-folder-search ((folder elmo-shimbun-folder)
- condition &optional from-msgs)
- nil)
-
-;;; 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)
- 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)
-
(require 'product)
(product-provide (provide 'elmo-shimbun) (require 'elmo-version))
projects / elisp / wanderlust.git / blobdiff