;; Based on nnspool.el by Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>.
;; For an overview of what the interface functions do, please see the
-;; Gnus sources.
+;; Gnus sources.
;;; Code:
(defvoo nnml-directory message-directory
"Mail spool directory.")
-(defvoo nnml-active-file
+(defvoo nnml-active-file
(concat (file-name-as-directory nnml-directory) "active")
"Mail active file.")
-(defvoo nnml-newsgroups-file
+(defvoo nnml-newsgroups-file
(concat (file-name-as-directory nnml-directory) "newsgroups")
"Mail newsgroups description file.")
beg article)
(if (stringp (car sequence))
'headers
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
(if (nnml-retrieve-headers-with-nov sequence fetch-old)
'nov
(while sequence
(setq article (car sequence))
- (setq file
- (concat nnml-current-directory
- (or (cdr (assq article nnml-article-file-alist))
- "")))
- (when (and (file-exists-p file)
+ (setq file (nnml-article-to-file article))
+ (when (and file
+ (file-exists-p file)
(not (file-directory-p file)))
(insert (format "221 %d Article retrieved.\n" article))
(setq beg (point))
(condition-case ()
(make-directory nnml-directory t)
(error)))
- (cond
+ (cond
((not (file-exists-p nnml-directory))
(nnml-close-server)
(nnheader-report 'nnml "Couldn't create directory: %s" nnml-directory))
(defun nnml-request-regenerate (server)
(nnml-possibly-change-directory nil server)
- (nnml-generate-nov-databases))
+ (nnml-generate-nov-databases)
+ t)
(deffoo nnml-request-article (id &optional group server buffer)
(nnml-possibly-change-directory group server)
nnml-directory))))))
(setq path (concat gpath (int-to-string (cdr group-num)))))
(setq path (nnml-article-to-file id)))
- (cond
+ (cond
((not path)
(nnheader-report 'nnml "No such article: %s" id))
((not (file-exists-p path))
(t
(nnheader-report 'nnml "Article %s retrieved" id)
;; We return the article number.
- (cons group (string-to-int (file-name-nondirectory path)))))))
+ (cons (if group-num (car group-num) group)
+ (string-to-int (file-name-nondirectory path)))))))
(deffoo nnml-request-group (group &optional server dont-check)
- (cond
+ (cond
((not (nnml-possibly-change-directory group server))
(nnheader-report 'nnml "Invalid group (no such directory)"))
((not (file-exists-p nnml-current-directory))
nnml-current-directory))
((not (file-directory-p nnml-current-directory))
(nnheader-report 'nnml "%s is not a directory" nnml-current-directory))
- (dont-check
+ (dont-check
(nnheader-report 'nnml "Group %s selected" group)
t)
(t
(if (not active)
(nnheader-report 'nnml "No such group: %s" group)
(nnheader-report 'nnml "Selected group %s" group)
- (nnheader-insert "211 %d %d %d %s\n"
+ (nnheader-insert "211 %d %d %d %s\n"
(max (1+ (- (cdr active) (car active))) 0)
(car active) (cdr active) group))))))
(deffoo nnml-request-expire-articles (articles group
&optional server force)
(nnml-possibly-change-directory group server)
- (let* ((active-articles
+ (let* ((active-articles
(nnheader-directory-articles nnml-current-directory))
(is-old t)
article rest mod-time number)
(nnmail-activate 'nnml)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
-
(while (and articles is-old)
- (when (setq article
- (assq (setq number (pop articles))
- nnml-article-file-alist))
- (setq article (concat nnml-current-directory (cdr article)))
+ (when (setq article (nnml-article-to-file (setq number (pop articles))))
(when (setq mod-time (nth 5 (file-attributes article)))
(if (and (nnml-deletable-article-p group number)
- (setq is-old
+ (setq is-old
(nnmail-expired-article-p group mod-time force
nnml-inhibit-expiry)))
(progn
(nnml-save-nov)
(nconc rest articles)))
-(deffoo nnml-request-move-article
+(deffoo nnml-request-move-article
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnml move*"))
result)
(nnml-possibly-change-directory group server)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
- (and
+ (nnml-update-file-alist)
+ (and
(nnml-deletable-article-p group article)
(nnml-request-article article group server)
(save-excursion
(nnml-possibly-change-directory group server)
(condition-case ()
(funcall nnmail-delete-file-function
- (concat nnml-current-directory
- (int-to-string article)))
+ (nnml-article-to-file article))
(file-error nil))
(nnml-nov-delete-article group article)
- (and last (nnml-save-nov))))
+ (when last
+ (nnml-save-nov)
+ (nnmail-save-active nnml-group-alist nnml-active-file))))
result))
(deffoo nnml-request-accept-article (group &optional server last)
(nnml-possibly-change-directory group server)
(nnmail-check-syntax)
(let (result)
+ (nnmail-cache-insert (nnmail-fetch-field "message-id"))
(if (stringp group)
- (and
+ (and
(nnmail-activate 'nnml)
- (setq result (car (nnml-save-mail
+ (setq result (car (nnml-save-mail
(list (cons group (nnml-active-number group))))))
(progn
(nnmail-save-active nnml-group-alist nnml-active-file)
(nnmail-activate 'nnml)
(setq result (car (nnml-save-mail
(nnmail-article-group 'nnml-active-number))))
- (progn
+ (when last
(nnmail-save-active nnml-group-alist nnml-active-file)
- (and last (nnml-save-nov)))))
+ (nnmail-cache-close)
+ (nnml-save-nov))))
result))
(deffoo nnml-request-replace-article (article group buffer)
headers)
(when (condition-case ()
(progn
- (nnmail-write-region
+ (nnmail-write-region
(point-min) (point-max)
- (concat nnml-current-directory
- (int-to-string article))
+ (or (nnml-article-to-file article)
+ (concat nnml-current-directory
+ (int-to-string article)))
nil (if (nnheader-be-verbose 5) nil 'nomesg))
t)
(error nil))
(setq headers (nnml-parse-head chars article))
;; Replace the NOV line in the NOV file.
- (save-excursion
+ (save-excursion
(set-buffer (nnml-open-nov group))
(goto-char (point-min))
(if (or (looking-at art)
;; we should insert it. (This situation should never
;; occur, but one likes to make sure...)
(while (and (looking-at "[0-9]+\t")
- (< (string-to-int
- (buffer-substring
+ (< (string-to-int
+ (buffer-substring
(match-beginning 0) (match-end 0)))
article)
(zerop (forward-line 1)))))
(nnml-possibly-change-directory group server)
(when force
;; Delete all articles in GROUP.
- (let ((articles
- (directory-files
+ (let ((articles
+ (directory-files
nnml-current-directory t
(concat nnheader-numerical-short-files
"\\|" (regexp-quote nnml-nov-file-name) "$")))
article)
- (while articles
+ (while articles
(setq article (pop articles))
(when (file-writable-p article)
(nnheader-message 5 "Deleting article %s in %s..." article group)
(delete-directory nnml-current-directory)
(error nil)))
;; Remove the group from all structures.
- (setq nnml-group-alist
+ (setq nnml-group-alist
(delq (assoc group nnml-group-alist) nnml-group-alist)
nnml-current-group nil
nnml-current-directory nil)
;; One might be more clever, I guess.
(let ((files (nnheader-article-to-file-alist old-dir)))
(while files
- (rename-file
+ (rename-file
(concat old-dir (cdar files))
(concat new-dir (cdar files)))
(pop files)))
;;; Internal functions.
(defun nnml-article-to-file (article)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
+ (nnml-update-file-alist)
(let (file)
(when (setq file (cdr (assq article nnml-article-file-alist)))
(concat nnml-current-directory file))))
(defun nnml-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
- (let (file path)
- (when (setq file (cdr (assq article nnml-article-file-alist)))
- (setq path (concat nnml-current-directory file))
+ (let (path)
+ (when (setq path (nnml-article-to-file article))
(when (file-writable-p path)
(or (not nnmail-keep-last-article)
(not (eq (cdr (nth 1 (assoc group nnml-group-alist)))
article)))))))
-;; Find an article number in the current group given the Message-ID.
+;; Find an article number in the current group given the Message-ID.
(defun nnml-find-group-number (id)
(save-excursion
(set-buffer (get-buffer-create " *nnml id*"))
number)
;; We want to look through all .overview files, but we want to
;; start with the one in the current directory. It seems most
- ;; likely that the article we are looking for is in that group.
+ ;; likely that the article we are looking for is in that group.
(if (setq number (nnml-find-id nnml-current-group id))
(cons nnml-current-group number)
;; It wasn't there, so we look through the other groups as well.
(make-directory (directory-file-name (car dirs)))
(nnheader-message 5 "Creating mail directory %s" (car dirs))
(setq dirs (cdr dirs)))))
-
+
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
(let (chars headers)
first)
(while ga
(nnml-possibly-create-directory (caar ga))
- (let ((file (concat (nnmail-group-pathname
+ (let ((file (concat (nnmail-group-pathname
(caar ga) nnml-directory)
(int-to-string (cdar ga)))))
(if first
;; It was already saved, so we just make a hard link.
(funcall nnmail-crosspost-link-function first file t)
;; Save the article.
- (nnmail-write-region (point-min) (point-max) file nil
+ (nnmail-write-region (point-min) (point-max) file nil
(if (nnheader-be-verbose 5) nil 'nomesg))
(setq first file)))
(setq ga (cdr ga))))
;; Generate a nov line for this article. We generate the nov
;; line after saving, because nov generation destroys the
- ;; header.
+ ;; header.
(setq headers (nnml-parse-head chars))
;; Output the nov line to all nov databases that should have it.
(let ((ga group-art))
"Compute the next article number in GROUP."
(let ((active (cadr (assoc group nnml-group-alist))))
;; The group wasn't known to nnml, so we just create an active
- ;; entry for it.
+ ;; entry for it.
(unless active
;; Perhaps the active file was corrupt? See whether
;; there are any articles in this group.
(defun nnml-add-nov (group article headers)
"Add a nov line for the GROUP base."
- (save-excursion
+ (save-excursion
(set-buffer (nnml-open-nov group))
(goto-char (point-max))
(mail-header-set-number headers article)
(save-excursion
(save-restriction
(goto-char (point-min))
- (narrow-to-region
+ (narrow-to-region
(point)
(1- (or (search-forward "\n\n" nil t) (point-max))))
;; Fold continuation lines.
(defun nnml-open-nov (group)
(or (cdr (assoc group nnml-nov-buffer-alist))
- (let ((buffer (nnheader-find-file-noselect
+ (let ((buffer (nnheader-find-file-noselect
(concat (nnmail-group-pathname group nnml-directory)
nnml-nov-file-name))))
(save-excursion
(defun nnml-generate-nov-databases ()
"Generate nov databases in all nnml directories."
(interactive)
- ;; Read the active file to make sure we don't re-use articles
+ ;; Read the active file to make sure we don't re-use articles
;; numbers in empty groups.
(nnmail-activate 'nnml)
(nnml-open-server (or (nnoo-current-server 'nnml) ""))
(file-directory-p dir))
(nnml-generate-nov-databases-1 dir seen))))
;; Do this directory.
- (let ((files (nnheader-article-to-file-alist dir)))
+ (let ((files (sort (nnheader-article-to-file-alist dir)
+ (lambda (a b) (< (car a) (car b))))))
(when files
(funcall nnml-generate-active-function dir)
;; Generate the nov file.
(defvar files)
(defun nnml-generate-active-info (dir)
;; Update the active info for this group.
- (let ((group (nnheader-file-to-group
+ (let ((group (nnheader-file-to-group
(directory-file-name dir) nnml-directory)))
(setq nnml-group-alist
(delq (assoc group nnml-group-alist) nnml-group-alist))
(push (list group
- (cons (car files)
+ (cons (caar files)
(let ((f files))
(while (cdr f) (setq f (cdr f)))
- (car f))))
+ (caar f))))
nnml-group-alist)))
(defun nnml-generate-nov-file (dir files)
(unless (file-directory-p (setq file (concat dir (cdar files))))
(erase-buffer)
(nnheader-insert-file-contents file)
- (narrow-to-region
+ (narrow-to-region
(goto-char (point-min))
(progn
(search-forward "\n\n" nil t)
(defun nnml-nov-delete-article (group article)
(save-excursion
(set-buffer (nnml-open-nov group))
- (goto-char (point-min))
- (when (re-search-forward (concat "^" (int-to-string article) "\t") nil t)
- (delete-region (match-beginning 0) (progn (forward-line 1) (point))))
+ (when (nnheader-find-nov-line article)
+ (delete-region (point) (progn (forward-line 1) (point)))
+ (when (bobp)
+ (let ((active (cadr (assoc group nnml-group-alist)))
+ num)
+ (when active
+ (if (eobp)
+ (setf (car active) (1+ (cdr active)))
+ (when (and (setq num (ignore-errors (read (current-buffer))))
+ (numberp num))
+ (setf (car active) num)))))))
t))
+(defun nnml-update-file-alist ()
+ (unless nnml-article-file-alist
+ (setq nnml-article-file-alist
+ (nnheader-article-to-file-alist nnml-current-directory))))
+
(provide 'nnml)
;;; nnml.el ends here
projects / gnus / blobdiff