;; Author: Scott Byer <byer@mv.us.adobe.com>
;; Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
-;; Keywords: news, mail
+;; Keywords: mail
;; This file is part of GNU Emacs.
(nnoo-declare nnfolder)
-(defvoo nnfolder-directory (expand-file-name "~/Mail/")
+(defvoo nnfolder-directory (expand-file-name message-directory)
"The name of the nnfolder directory.")
(defvoo nnfolder-active-file
- (concat (file-name-as-directory nnfolder-directory) "active")
+ (nnheader-concat nnfolder-directory "active")
"The name of the active file.")
;; I renamed this variable to something more in keeping with the general GNU
;; style. -SLB
(defvoo nnfolder-ignore-active-file nil
- "If non-nil, causes nnfolder to do some extra work in order to determine the true active ranges of an mbox file.
-Note that the active file is still saved, but it's values are not
-used. This costs some extra time when scanning an mbox when opening
-it.")
+ "If non-nil, causes nnfolder to do some extra work in order to determine
+the true active ranges of an mbox file. Note that the active file is still
+saved, but it's values are not used. This costs some extra time when
+scanning an mbox when opening it.")
+
+(defvoo nnfolder-distrust-mbox nil
+ "If non-nil, causes nnfolder to not trust the user with respect to
+inserting unaccounted for mail in the middle of an mbox file. This can greatly
+slow down scans, which now must scan the entire file for unmarked messages.
+When nil, scans occur forward from the last marked message, a huge
+time saver for large mailboxes.")
(defvoo nnfolder-newsgroups-file
(concat (file-name-as-directory nnfolder-directory) "newsgroups")
(defvoo nnfolder-prepare-save-mail-hook nil
"Hook run narrowed to an article before saving.")
+(defvoo nnfolder-save-buffer-hook nil
+ "Hook run before saving the nnfolder mbox buffer.")
+
(defvoo nnfolder-inhibit-expiry nil
"If non-nil, inhibit expiry.")
(defvoo nnfolder-status-string "")
(defvoo nnfolder-group-alist nil)
(defvoo nnfolder-buffer-alist nil)
-(defvoo nnfolder-active-timestamp nil)
+(defvoo nnfolder-scantime-alist nil)
\f
(let ((delim-string (concat "^" message-unix-mail-delimiter))
article art-string start stop)
(nnfolder-possibly-change-group group server)
- (set-buffer nnfolder-current-buffer)
- (goto-char (point-min))
- (if (stringp (car articles))
- 'headers
- (while articles
- (setq article (car articles))
- (setq art-string (nnfolder-article-string article))
- (set-buffer nnfolder-current-buffer)
- (if (or (search-forward art-string nil t)
- ;; Don't search the whole file twice! Also, articles
- ;; probably have some locality by number, so searching
- ;; backwards will be faster. Especially if we're at the
- ;; beginning of the buffer :-). -SLB
- (search-backward art-string nil t))
- (progn
- (setq start (or (re-search-backward delim-string nil t)
- (point)))
- (search-forward "\n\n" nil t)
- (setq stop (1- (point)))
- (set-buffer nntp-server-buffer)
- (insert (format "221 %d Article retrieved.\n" article))
- (insert-buffer-substring nnfolder-current-buffer start stop)
- (goto-char (point-max))
- (insert ".\n")))
- (setq articles (cdr articles)))
-
- (set-buffer nntp-server-buffer)
- (nnheader-fold-continuation-lines)
- 'headers))))
+ (when nnfolder-current-buffer
+ (set-buffer nnfolder-current-buffer)
+ (goto-char (point-min))
+ (if (stringp (car articles))
+ 'headers
+ (while articles
+ (setq article (car articles))
+ (setq art-string (nnfolder-article-string article))
+ (set-buffer nnfolder-current-buffer)
+ (if (or (search-forward art-string nil t)
+ ;; Don't search the whole file twice! Also, articles
+ ;; probably have some locality by number, so searching
+ ;; backwards will be faster. Especially if we're at the
+ ;; beginning of the buffer :-). -SLB
+ (search-backward art-string nil t))
+ (progn
+ (setq start (or (re-search-backward delim-string nil t)
+ (point)))
+ (search-forward "\n\n" nil t)
+ (setq stop (1- (point)))
+ (set-buffer nntp-server-buffer)
+ (insert (format "221 %d Article retrieved.\n" article))
+ (insert-buffer-substring nnfolder-current-buffer start stop)
+ (goto-char (point-max))
+ (insert ".\n")))
+ (setq articles (cdr articles)))
+
+ (set-buffer nntp-server-buffer)
+ (nnheader-fold-continuation-lines)
+ 'headers)))))
(deffoo nnfolder-open-server (server &optional defs)
(nnoo-change-server 'nnfolder server defs)
(cond
((null active)
(nnheader-report 'nnfolder "No such group: %s" group))
+ ((null nnfolder-current-group)
+ (nnheader-report 'nnfolder "Empty group: %s" group))
(t
(nnheader-report 'nnfolder "Selected group %s" group)
(nnheader-insert "211 %d %d %d %s\n"
(car range) (cdr range) group))))))))
(deffoo nnfolder-request-scan (&optional group server)
- (nnfolder-possibly-change-group group server)
+ (nnfolder-possibly-change-group group server t)
(nnmail-get-new-mail
'nnfolder
(lambda ()
(setq nnfolder-buffer-alist
(delq (car bufs) nnfolder-buffer-alist))
(set-buffer (nth 1 (car bufs)))
- (and (buffer-modified-p) (save-buffer))
+ (nnfolder-save-buffer)
(kill-buffer (current-buffer)))
(setq bufs (cdr bufs))))))
nnfolder-directory
;; Make sure we _had_ the group open.
(when (or (assoc group nnfolder-buffer-alist)
(equal group nnfolder-current-group))
- (nnfolder-possibly-change-group group server)
- (when nnfolder-current-buffer
+ (let ((inf (assoc group nnfolder-buffer-alist)))
+ (when inf
+ (when nnfolder-current-group
+ (push (list nnfolder-current-group nnfolder-current-buffer)
+ nnfolder-buffer-alist))
+ (setq nnfolder-buffer-alist
+ (delq inf nnfolder-buffer-alist))
+ (setq nnfolder-current-buffer (cadr inf)
+ nnfolder-current-group (car inf))))
+ (when (and nnfolder-current-buffer
+ (buffer-name nnfolder-current-buffer))
(save-excursion
(set-buffer nnfolder-current-buffer)
;; If the buffer was modified, write the file out now.
- (and (buffer-modified-p) (save-buffer))
+ (nnfolder-save-buffer)
;; If we're shutting the server down, we need to kill the
;; buffer and remove it from the open buffer list. Or, of
;; course, if we're trying to minimize our space impact.
(nnfolder-delete-mail))
(setq rest (cons (car articles) rest))))
(setq articles (cdr articles)))
- (and (buffer-modified-p) (save-buffer))
+ (nnfolder-save-buffer)
;; Find the lowest active article in this group.
(let* ((active (cadr (assoc newsgroup nnfolder-group-alist)))
(marker (concat "\n" nnfolder-article-marker))
(goto-char (point-min))
(if (search-forward (nnfolder-article-string article) nil t)
(nnfolder-delete-mail))
- (and last
- (buffer-modified-p)
- (save-buffer))))
+ (and last (nnfolder-save-buffer))))
result))
(deffoo nnfolder-request-accept-article (group &optional server last)
(nnfolder-possibly-change-group group server)
+ (nnmail-check-syntax)
(and (stringp group) (nnfolder-possibly-change-group group))
(let ((buf (current-buffer))
result)
(forward-line -1)
(while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
(delete-region (point) (progn (forward-line 1) (point))))
- (setq result (car (nnfolder-save-mail (and (stringp group) group)))))
+ (setq result
+ (car (nnfolder-save-mail
+ (if (stringp group)
+ (list (cons group (nnfolder-active-number group)))
+ (nnmail-article-group 'nnfolder-active-number))))))
(save-excursion
(set-buffer nnfolder-current-buffer)
- (and last (buffer-modified-p) (save-buffer))))
+ (and last (nnfolder-save-buffer))))
(nnmail-save-active nnfolder-group-alist nnfolder-active-file)
(unless result
(nnheader-report 'nnfolder "Couldn't store article"))
nil
(nnfolder-delete-mail t t)
(insert-buffer-substring buffer)
- (and (buffer-modified-p) (save-buffer))
+ (nnfolder-save-buffer)
t)))
(deffoo nnfolder-request-delete-group (group &optional force server)
(match-beginning 0))
(point-max))))))
-(defun nnfolder-possibly-change-group (group &optional server)
+;; When scanning, we're not looking t immediately switch into the group - if
+;; we know our information is up to date, don't even bother reading the file.
+(defun nnfolder-possibly-change-group (group &optional server scanning)
(when (and server
(not (nnfolder-server-opened server)))
(nnfolder-open-server server))
- (when group
+ (when (and group (or nnfolder-current-buffer
+ (not (equal group nnfolder-current-group))))
(unless (file-exists-p nnfolder-directory)
(make-directory (directory-file-name nnfolder-directory) t))
(nnfolder-possibly-activate-groups nil)
(setq nnfolder-buffer-alist (delq inf nnfolder-buffer-alist))
(setq inf nil)))
- (if inf
- ()
+ (unless inf
(save-excursion
(setq file (nnfolder-group-pathname group))
- (if (file-directory-p (file-truename file))
- ()
+ (unless (file-directory-p (file-truename file))
(unless (file-exists-p file)
(unless (file-exists-p (file-name-directory file))
(make-directory (file-name-directory file) t))
- (write-region 1 1 file t 'nomesg))
- (setq nnfolder-current-buffer
- (set-buffer (nnfolder-read-folder file)))
- (setq nnfolder-buffer-alist (cons (list group (current-buffer))
- nnfolder-buffer-alist)))))))
+ (nnmail-write-region 1 1 file t 'nomesg))
+ (setq nnfolder-current-buffer
+ (nnfolder-read-folder file scanning))
+ (when nnfolder-current-buffer
+ (set-buffer nnfolder-current-buffer)
+ (setq nnfolder-buffer-alist
+ (cons (list group nnfolder-current-buffer)
+ nnfolder-buffer-alist))))))))
(setq nnfolder-current-group group)))
-(defun nnfolder-save-mail (&optional group)
+(defun nnfolder-save-mail (group-art-list)
"Called narrowed to an article."
- (let* ((nnmail-split-methods
- (if group (list (list group "")) nnmail-split-methods))
- (group-art-list
- (nreverse (nnmail-article-group 'nnfolder-active-number)))
- (delim (concat "^" message-unix-mail-delimiter))
+ (let* ((delim (concat "^" message-unix-mail-delimiter))
save-list group-art)
(goto-char (point-min))
- ;; This might come from somewhere else.
+ ;; The From line may have been quoted by movemail.
+ (when (looking-at (concat ">" message-unix-mail-delimiter))
+ (delete-char 1))
+ ;; This might come from somewhere else.
(unless (looking-at delim)
(insert "From nobody " (current-time-string) "\n")
(goto-char (point-min)))
(setq save-list group-art-list)
(nnmail-insert-lines)
(nnmail-insert-xref group-art-list)
+ (run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnfolder-prepare-save-mail-hook)
;; Insert the mail into each of the destination groups.
;; Insert the new newsgroup marker.
(nnfolder-insert-newsgroup-line group-art)
(unless nnfolder-current-buffer
+ (nnfolder-close-group (car group-art))
(nnfolder-request-create-group (car group-art))
(nnfolder-possibly-change-group (car group-art)))
(let ((beg (point-min))
(obuf (current-buffer)))
(set-buffer nnfolder-current-buffer)
(goto-char (point-max))
+ (unless (eolp)
+ (insert "\n"))
+ (insert "\n")
(insert-buffer-substring obuf beg end)
(set-buffer obuf)))
;; shouldn't cost us much extra time at all, but will be a lot less
;; vulnerable to glitches between the mbox and the active file.
-(defun nnfolder-read-folder (file)
- (save-excursion
- (nnfolder-possibly-activate-groups nil)
- ;; We should be paranoid here and make sure the group is in the alist,
- ;; and add it if it isn't.
- ;;(if (not (assoc nnfoler-current-group nnfolder-group-alist)
- (set-buffer (setq nnfolder-current-buffer
- (nnheader-find-file-noselect file nil 'raw)))
- (buffer-disable-undo (current-buffer))
- (let* ((delim (concat "^" message-unix-mail-delimiter))
- (marker (concat "\n" nnfolder-article-marker))
- (number "[0-9]+")
- (active (cadr (assoc nnfolder-current-group
- nnfolder-group-alist)))
- ;; Set min to Big Number.
- (min (max (1- (lsh 1 23)) (1- (lsh 1 24)) (1- (lsh 1 25))))
- (max (cdr active))
- start end)
- (goto-char (point-min))
-
- ;; Anytime the active number is 1 or 0, it is suspect. In that case,
- ;; search the file manually to find the active number. Or, of course,
- ;; if we're being paranoid. (This would also be the place to build
- ;; other lists from the header markers, such as expunge lists, etc., if
- ;; we ever desired to abandon the active file entirely for mboxes.)
- (when (or nnfolder-ignore-active-file
- (< max 2))
- (while (and (search-forward marker nil t)
- (re-search-forward number nil t))
- (let ((newnum (string-to-number (match-string 0))))
- (setq max (max max newnum))
- (setq min (min min newnum))))
- (setcar active (max 1 (min min max)))
- (setcdr active (max max (cdr active)))
- (goto-char (point-min)))
-
- ;; Keep track of the active number on our own, and insert it back into
- ;; the active list when we're done. Also, prime the pump to cut down on
- ;; the number of searches we do.
- (setq end (point-marker))
- (set-marker end (or (and (re-search-forward delim nil t)
- (match-beginning 0))
- (point-max)))
- (while (not (= end (point-max)))
- (setq start (marker-position end))
- (goto-char end)
- ;; There may be more than one "From " line, so we skip past
- ;; them.
- (while (looking-at delim)
- (forward-line 1))
- (set-marker end (or (and (re-search-forward delim nil t)
- (match-beginning 0))
- (point-max)))
- (goto-char start)
- (if (not (search-forward marker end t))
- (progn
- (narrow-to-region start end)
- (nnmail-insert-lines)
- (nnfolder-insert-newsgroup-line
- (cons nil (nnfolder-active-number nnfolder-current-group)))
- (widen))))
-
- ;; Make absolutely sure that the active list reflects reality!
- (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
- (current-buffer))))
+(defun nnfolder-read-folder (file &optional scanning)
+ ;; This is an attempt at a serious shortcut - don't even read in the file
+ ;; if we know we've seen it since the last time it was touched.
+ (let ((scantime (cadr (assoc nnfolder-current-group
+ nnfolder-scantime-alist)))
+ (modtime (nth 5 (or (file-attributes file) '(nil nil nil nil nil)))))
+ (if (and scanning scantime
+ (eq (car scantime) (car modtime))
+ (eq (cdr scantime) (cadr modtime)))
+ nil
+ (save-excursion
+ (nnfolder-possibly-activate-groups nil)
+ ;; Read in the file.
+ (set-buffer (setq nnfolder-current-buffer
+ (nnheader-find-file-noselect file nil 'raw)))
+ (buffer-disable-undo (current-buffer))
+ ;; If the file hasn't been touched since the last time we scanned it,
+ ;; don't bother doing anything with it.
+ (let ((delim (concat "^" message-unix-mail-delimiter))
+ (marker (concat "\n" nnfolder-article-marker))
+ (number "[0-9]+")
+ (active (or (cadr (assoc nnfolder-current-group
+ nnfolder-group-alist))
+ (cons 1 0)))
+ (scantime (assoc nnfolder-current-group nnfolder-scantime-alist))
+ (minid (lsh -1 -1))
+ maxid start end newscantime)
+
+ (setq maxid (or (cdr active) 0))
+ (goto-char (point-min))
+
+ ;; Anytime the active number is 1 or 0, it is suspect. In that
+ ;; case, search the file manually to find the active number. Or,
+ ;; of course, if we're being paranoid. (This would also be the
+ ;; place to build other lists from the header markers, such as
+ ;; expunge lists, etc., if we ever desired to abandon the active
+ ;; file entirely for mboxes.)
+ (when (or nnfolder-ignore-active-file
+ (< maxid 2))
+ (while (and (search-forward marker nil t)
+ (re-search-forward number nil t))
+ (let ((newnum (string-to-number (match-string 0))))
+ (setq maxid (max maxid newnum))
+ (setq minid (min minid newnum))))
+ (setcar active (max 1 (min minid maxid)))
+ (setcdr active (max maxid (cdr active)))
+ (goto-char (point-min)))
+
+ ;; As long as we trust that the user will only insert unmarked mail
+ ;; at the end, go to the end and search backwards for the last
+ ;; marker. Find the start of that message, and begin to search for
+ ;; unmarked messages from there.
+ (if (not (or nnfolder-distrust-mbox
+ (< maxid 2)))
+ (progn
+ (goto-char (point-max))
+ (if (not (re-search-backward marker nil t))
+ (goto-char (point-min))
+ (if (not (re-search-backward delim nil t))
+ (goto-char (point-min))))))
+
+ ;; Keep track of the active number on our own, and insert it back
+ ;; into the active list when we're done. Also, prime the pump to
+ ;; cut down on the number of searches we do.
+ (setq end (point-marker))
+ (set-marker end (or (and (re-search-forward delim nil t)
+ (match-beginning 0))
+ (point-max)))
+ (while (not (= end (point-max)))
+ (setq start (marker-position end))
+ (goto-char end)
+ ;; There may be more than one "From " line, so we skip past
+ ;; them.
+ (while (looking-at delim)
+ (forward-line 1))
+ (set-marker end (or (and (re-search-forward delim nil t)
+ (match-beginning 0))
+ (point-max)))
+ (goto-char start)
+ (if (not (search-forward marker end t))
+ (progn
+ (narrow-to-region start end)
+ (nnmail-insert-lines)
+ (nnfolder-insert-newsgroup-line
+ (cons nil (nnfolder-active-number nnfolder-current-group)))
+ (widen))))
+
+ ;; Make absolutely sure that the active list reflects reality!
+ (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
+ ;; Set the scantime for this group.
+ (setq newscantime (visited-file-modtime))
+ (if scantime
+ (setcdr scantime (list newscantime))
+ (push (list nnfolder-current-group newscantime)
+ nnfolder-scantime-alist))
+ (current-buffer))))))
;;;###autoload
(defun nnfolder-generate-active-file ()
(interactive)
(nnmail-activate 'nnfolder)
(let ((files (directory-files nnfolder-directory))
- file)
+ file)
(while (setq file (pop files))
- (when (nnheader-mail-file-mbox-p file)
- (nnheader-message 5 "Adding group %s..." file)
- (push (list file (cons 1 0)) nnfolder-group-alist)
- (nnfolder-read-folder file)
- (nnfolder-close-group file))
+ (when (and (not (backup-file-name-p file))
+ (nnheader-mail-file-mbox-p
+ (concat nnfolder-directory file)))
+ (nnheader-message 5 "Adding group %s..." file)
+ (push (list file (cons 1 0)) nnfolder-group-alist)
+ (nnfolder-possibly-change-group file)
+ (nnfolder-close-group file))
(message ""))))
(defun nnfolder-group-pathname (group)
;; If not, we translate dots into slashes.
(concat dir (nnheader-replace-chars-in-string group ?. ?/)))))
+(defun nnfolder-save-buffer ()
+ "Save the buffer."
+ (when (buffer-modified-p)
+ (run-hooks 'nnfolder-save-buffer-hook)
+ (save-buffer)))
+
(provide 'nnfolder)
;;; nnfolder.el ends here
projects / gnus / blobdiff