X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnml.el;h=c42ad58c1338c1b2259f0fe1f0708608b5182e0c;hp=e373247ab079619e5eeef1c5dc1d1d9dff4b3939;hb=d0498ec691ac9cc3f6bdd9f4ba3ac26457cc3d8a;hpb=a9ea2f8e352007f14f77dccac95b32e51de1eaf8 diff --git a/lisp/nnml.el b/lisp/nnml.el index e373247ab..c42ad58c1 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -1,5 +1,5 @@ ;;; nnml.el --- mail spool access for Gnus -;; Copyright (C) 1995 Free Software Foundation, Inc. +;; Copyright (C) 1995,96 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -18,8 +18,9 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. ;;; Commentary: @@ -31,69 +32,65 @@ (require 'nnheader) (require 'nnmail) +(require 'nnoo) +(require 'cl) -(defvar nnml-directory "~/Mail/" +(nnoo-declare nnml) + +(defvoo nnml-directory message-directory "Mail spool directory.") -(defvar nnml-active-file (concat nnml-directory "active") +(defvoo nnml-active-file + (concat (file-name-as-directory nnml-directory) "active") "Mail active file.") -(defvar nnml-newsgroups-file (concat nnml-directory "newsgroups") +(defvoo nnml-newsgroups-file + (concat (file-name-as-directory nnml-directory) "newsgroups") "Mail newsgroups description file.") -(defvar nnml-get-new-mail t +(defvoo nnml-get-new-mail t "If non-nil, nnml will check the incoming mail file and split the mail.") -(defvar nnml-nov-is-evil nil +(defvoo nnml-nov-is-evil nil "If non-nil, Gnus will never generate and use nov databases for mail groups. Using nov databases will speed up header fetching considerably. -This variable shouldn't be flipped much. If you have, for some reason, +This variable shouldn't be flipped much. If you have, for some reason, set this to t, and want to set it to nil again, you should always run -the `nnml-generate-nov-databases' command. The function will go +the `nnml-generate-nov-databases' command. The function will go through all nnml directories and generate nov databases for them -all. This may very well take some time.") +all. This may very well take some time.") -(defvar nnml-prepare-save-mail-hook nil +(defvoo nnml-prepare-save-mail-hook nil "Hook run narrowed to an article before saving.") +(defvoo nnml-inhibit-expiry nil + "If non-nil, inhibit expiry.") + + -(defconst nnml-version "nnml 0.2" +(defconst nnml-version "nnml 1.0" "nnml version.") -(defvar nnml-nov-file-name ".overview") +(defvoo nnml-nov-file-name ".overview") -(defvar nnml-current-directory nil) -(defvar nnml-status-string "") -(defvar nnml-nov-buffer-alist nil) -(defvar nnml-group-alist nil) -(defvar nnml-active-timestamp nil) - - +(defvoo nnml-current-directory nil) +(defvoo nnml-current-group nil) +(defvoo nnml-status-string "") +(defvoo nnml-nov-buffer-alist nil) +(defvoo nnml-group-alist nil) +(defvoo nnml-active-timestamp nil) +(defvoo nnml-article-file-alist nil) -;; Server variables. - -(defvar nnml-current-server nil) -(defvar nnml-server-alist nil) -(defvar nnml-server-variables - (list - (list 'nnml-directory nnml-directory) - (list 'nnml-active-file nnml-active-file) - (list 'nnml-newsgroups-file nnml-newsgroups-file) - (list 'nnml-get-new-mail nnml-get-new-mail) - (list 'nnml-nov-is-evil nnml-nov-is-evil) - (list 'nnml-nov-file-name nnml-nov-file-name) - '(nnml-current-directory nil) - '(nnml-status-string "") - '(nnml-nov-buffer-alist nil) - '(nnml-group-alist nil) - '(nnml-active-timestamp nil))) +(defvoo nnml-generate-active-function 'nnml-generate-active-info) ;;; Interface functions. -(defun nnml-retrieve-headers (sequence &optional newsgroup server) +(nnoo-define-basics nnml) + +(deffoo nnml-retrieve-headers (sequence &optional newsgroup server fetch-old) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) @@ -103,13 +100,18 @@ all. This may very well take some time.") beg article) (if (stringp (car sequence)) 'headers - (nnml-possibly-change-directory newsgroup) - (if (nnml-retrieve-headers-with-nov sequence) + (nnml-possibly-change-directory newsgroup server) + (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 (int-to-string article))) + (setq file + (concat nnml-current-directory + (or (cdr (assq article nnml-article-file-alist)) + ""))) (if (and (file-exists-p file) (not (file-directory-p file))) (progn @@ -128,189 +130,171 @@ all. This may very well take some time.") (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup) (zerop (% count 20)) - gnus-verbose-backends - (message "nnml: Receiving headers... %d%%" - (/ (* count 100) number)))) + (nnheader-message 6 "nnml: Receiving headers... %d%%" + (/ (* count 100) number)))) (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup) - gnus-verbose-backends - (message "nnml: Receiving headers...done")) + (nnheader-message 6 "nnml: Receiving headers...done")) - ;; Fold continuation lines. - (goto-char (point-min)) - (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) - (replace-match " " t t)) + (nnheader-fold-continuation-lines) 'headers))))) -(defun nnml-open-server (server &optional defs) - (nnheader-init-server-buffer) - (if (equal server nnml-current-server) - t - (if nnml-current-server - (setq nnml-server-alist - (cons (list nnml-current-server - (nnheader-save-variables nnml-server-variables)) - nnml-server-alist))) - (let ((state (assoc server nnml-server-alist))) - (if state - (progn - (nnheader-restore-variables (nth 1 state)) - (setq nnml-server-alist (delq state nnml-server-alist))) - (nnheader-set-init-variables nnml-server-variables defs))) - (setq nnml-current-server server))) - -(defun nnml-close-server (&optional server) - t) - -(defun nnml-server-opened (&optional server) - (and (equal server nnml-current-server) - nntp-server-buffer - (buffer-name nntp-server-buffer))) - -(defun nnml-status-message (&optional server) - nnml-status-string) - -(defun nnml-request-article (id &optional newsgroup server buffer) - (nnml-possibly-change-directory newsgroup) - (let ((file (if (stringp id) - nil - (concat nnml-current-directory (int-to-string id)))) - (nntp-server-buffer (or buffer nntp-server-buffer))) - (if (and (stringp file) - (file-exists-p file) - (not (file-directory-p file))) - (save-excursion - (nnmail-find-file file))))) - -(defun nnml-request-group (group &optional server dont-check) - (if (not (nnml-possibly-change-directory group)) - (progn - (setq nnml-status-string "Invalid group (no such directory)") - nil) - (if dont-check - t - (nnml-get-new-mail group) - (let ((timestamp (nth 5 (file-attributes nnml-active-file)))) - (if (or (not nnml-active-timestamp) - (> (nth 0 timestamp) (nth 0 nnml-active-timestamp)) - (> (nth 1 timestamp) (nth 1 nnml-active-timestamp))) - (progn - (setq nnml-active-timestamp timestamp) - (nnmail-activate 'nnml 'force))) - (let ((active (nth 1 (assoc group nnml-group-alist)))) - (save-excursion - (set-buffer nntp-server-buffer) - (erase-buffer) - (if (not active) - () - (insert (format "211 %d %d %d %s\n" - (max (1+ (- (cdr active) (car active))) 0) - (car active) (cdr active) group)) - t))))))) - -(defun nnml-close-group (group &optional server) - t) - -(defun nnml-request-close () - (setq nnml-current-server nil) - (setq nnml-server-alist nil) +(deffoo nnml-open-server (server &optional defs) + (nnoo-change-server 'nnml server defs) + (when (not (file-exists-p nnml-directory)) + (condition-case () + (make-directory nnml-directory t) + (error t))) + (cond + ((not (file-exists-p nnml-directory)) + (nnml-close-server) + (nnheader-report 'nnml "Couldn't create directory: %s" nnml-directory)) + ((not (file-directory-p (file-truename nnml-directory))) + (nnml-close-server) + (nnheader-report 'nnml "Not a directory: %s" nnml-directory)) + (t + (nnheader-report 'nnml "Opened server %s using directory %s" + server nnml-directory) + t))) + +(deffoo nnml-request-article (id &optional newsgroup server buffer) + (nnml-possibly-change-directory newsgroup server) + (let* ((nntp-server-buffer (or buffer nntp-server-buffer)) + path gpath group-num) + (if (stringp id) + (when (and (setq group-num (nnml-find-group-number id)) + (cdr + (assq (cdr group-num) + (nnheader-article-to-file-alist + (setq gpath + (nnmail-group-pathname + (car group-num) + nnml-directory)))))) + (setq path (concat gpath (int-to-string (cdr group-num))))) + (setq path (nnml-article-to-file id))) + (cond + ((not path) + (nnheader-report 'nnml "No such article: %s" id)) + ((not (file-exists-p path)) + (nnheader-report 'nnml "No such file: %s" path)) + ((file-directory-p path) + (nnheader-report 'nnml "File is a directory: %s" path)) + ((not (save-excursion (nnmail-find-file path))) + (nnheader-report 'nnml "Couldn't read file: %s" path)) + (t + (nnheader-report 'nnml "Article %s retrieved" id) + ;; We return the article number. + (cons newsgroup (string-to-int (file-name-nondirectory path))))))) + +(deffoo nnml-request-group (group &optional server dont-check) + (cond + ((not (nnml-possibly-change-directory group server)) + (nnheader-report 'nnml "Invalid group (no such directory)")) + ((not (file-exists-p nnml-current-directory)) + (nnheader-report 'nnml "Directory %s does not exist" + nnml-current-directory)) + ((not (file-directory-p nnml-current-directory)) + (nnheader-report 'nnml "%s is not a directory" nnml-current-directory)) + (dont-check + (nnheader-report 'nnml "Group %s selected" group) + t) + (t + (nnmail-activate 'nnml) + (let ((active (nth 1 (assoc group nnml-group-alist)))) + (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" + (max (1+ (- (cdr active) (car active))) 0) + (car active) (cdr active) group)))))) + +(deffoo nnml-request-scan (&optional group server) + (setq nnml-article-file-alist nil) + (nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group)) + +(deffoo nnml-close-group (group &optional server) + (setq nnml-article-file-alist nil) t) -(defun nnml-request-create-group (group &optional server) +(deffoo nnml-request-create-group (group &optional server args) (nnmail-activate 'nnml) - (or (assoc group nnml-group-alist) - (let (active) - (setq nnml-group-alist (cons (list group (setq active (cons 0 0))) - nnml-group-alist)) - (nnml-possibly-create-directory group) - (nnml-possibly-change-directory group) - (let ((articles (mapcar - (lambda (file) - (string-to-int file)) - (directory-files - nnml-current-directory nil "^[0-9]+$")))) - (and articles - (progn - (setcar active (apply 'min articles)) - (setcdr active (apply 'max articles))))) - (nnmail-save-active nnml-group-alist nnml-active-file))) + (unless (assoc group nnml-group-alist) + (let (active) + (push (list group (setq active (cons 1 0))) + nnml-group-alist) + (nnml-possibly-create-directory group) + (nnml-possibly-change-directory group server) + (let ((articles (nnheader-directory-articles nnml-current-directory))) + (when articles + (setcar active (apply 'min articles)) + (setcdr active (apply 'max articles)))) + (nnmail-save-active nnml-group-alist nnml-active-file))) t) -(defun nnml-request-list (&optional server) - (if server (nnml-get-new-mail)) +(deffoo nnml-request-list (&optional server) (save-excursion (nnmail-find-file nnml-active-file) (setq nnml-group-alist (nnmail-get-active)))) -(defun nnml-request-newgroups (date &optional server) +(deffoo nnml-request-newgroups (date &optional server) (nnml-request-list server)) -(defun nnml-request-list-newsgroups (&optional server) +(deffoo nnml-request-list-newsgroups (&optional server) (save-excursion (nnmail-find-file nnml-newsgroups-file))) -(defun nnml-request-post (&optional server) - (mail-send-and-exit nil)) - -(defalias 'nnml-request-post-buffer 'nnmail-request-post-buffer) - -(defun nnml-request-expire-articles (articles newsgroup &optional server force) - (nnml-possibly-change-directory newsgroup) - (let* ((days (or (and nnmail-expiry-wait-function - (funcall nnmail-expiry-wait-function newsgroup)) - nnmail-expiry-wait)) - (active-articles - (mapcar - (function - (lambda (name) - (string-to-int name))) - (directory-files nnml-current-directory nil "^[0-9]+$" t))) - (max-article (and active-articles (apply 'max active-articles))) +(deffoo nnml-request-expire-articles (articles newsgroup &optional server force) + (nnml-possibly-change-directory newsgroup server) + (let* ((active-articles + (nnheader-directory-articles nnml-current-directory)) (is-old t) - article rest mod-time) + 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) (setq article (concat nnml-current-directory - (int-to-string (car articles)))) - (if (setq mod-time (nth 5 (file-attributes article))) - (if (and (or (not nnmail-keep-last-article) - (not max-article) - (not (= (car articles) max-article))) - (not (equal mod-time '(0 0))) - (or force - (setq is-old - (> (nnmail-days-between - (current-time-string) - (current-time-string mod-time)) - days)))) - (progn - (and gnus-verbose-backends - (message "Deleting article %s..." article)) - (condition-case () - (delete-file article) - (file-error - (setq rest (cons (car articles) rest)))) - (setq active-articles (delq (car articles) active-articles)) - (nnml-nov-delete-article newsgroup (car articles))) - (setq rest (cons (car articles) rest)))) - (setq articles (cdr articles))) + (int-to-string + (setq number (pop articles))))) + (when (setq mod-time (nth 5 (file-attributes article))) + (if (and (nnml-deletable-article-p newsgroup number) + (setq is-old + (nnmail-expired-article-p newsgroup mod-time force + nnml-inhibit-expiry))) + (progn + (nnheader-message 5 "Deleting article %s in %s..." + article newsgroup) + (condition-case () + (funcall nnmail-delete-file-function article) + (file-error + (push number rest))) + (setq active-articles (delq number active-articles)) + (nnml-nov-delete-article newsgroup number)) + (push number rest)))) (let ((active (nth 1 (assoc newsgroup nnml-group-alist)))) - (and active - (setcar active (or (and active-articles - (apply 'min active-articles)) - 0))) + (when active + (setcar active (or (and active-articles + (apply 'min active-articles)) + (1+ (cdr active))))) (nnmail-save-active nnml-group-alist nnml-active-file)) (nnml-save-nov) (message "") (nconc rest articles))) -(defun 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-deletable-article-p group article) (nnml-request-article article group server) (save-excursion (set-buffer buf) @@ -319,52 +303,55 @@ all. This may very well take some time.") (kill-buffer (current-buffer)) result) (progn + (nnml-possibly-change-directory group server) (condition-case () - (delete-file (concat nnml-current-directory - (int-to-string article))) + (funcall nnmail-delete-file-function + (concat nnml-current-directory + (int-to-string article))) (file-error nil)) (nnml-nov-delete-article group article) (and last (nnml-save-nov)))) result)) -(defun nnml-request-accept-article (group &optional last) +(deffoo nnml-request-accept-article (group &optional server last) + (nnml-possibly-change-directory group server) + (nnmail-check-syntax) (let (result) (if (stringp group) (and (nnmail-activate 'nnml) - ;; We trick the choosing function into believing that only one - ;; group is availiable. - (let ((nnmail-split-methods (list (list group "")))) - (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) (and last (nnml-save-nov)))) (and (nnmail-activate 'nnml) - (setq result (car (nnml-save-mail))) + (setq result (car (nnml-save-mail + (nnmail-article-group 'nnml-active-number)))) (progn (nnmail-save-active nnml-group-alist nnml-active-file) (and last (nnml-save-nov))))) result)) -(defun nnml-request-replace-article (article group buffer) +(deffoo nnml-request-replace-article (article group buffer) (nnml-possibly-change-directory group) (save-excursion (set-buffer buffer) (nnml-possibly-create-directory group) - (if (not (condition-case () - (progn - (write-region (point-min) (point-max) - (concat nnml-current-directory - (int-to-string article)) - nil (if gnus-verbose-backends nil 'nomesg)) - t) - (error nil))) - () - (let ((chars (nnmail-insert-lines)) - (art (concat (int-to-string article) "\t")) - nov-line) - (setq nov-line (nnml-make-nov-line chars)) + (let ((chars (nnmail-insert-lines)) + (art (concat (int-to-string article) "\t")) + headers) + (when (condition-case () + (progn + (nnmail-write-region + (point-min) (point-max) + (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 (set-buffer (nnml-open-nov group)) @@ -375,7 +362,7 @@ all. This may very well take some time.") (delete-region (progn (beginning-of-line) (point)) (progn (forward-line 1) (point))) ;; The line isn't here, so we have to find out where - ;; we should insert it. (This situation should never + ;; 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 @@ -384,29 +371,169 @@ all. This may very well take some time.") article) (zerop (forward-line 1))))) (beginning-of-line) - (insert (int-to-string article) nov-line) + (nnheader-insert-nov headers) (nnml-save-nov) - (kill-buffer (current-buffer)) t))))) +(deffoo nnml-request-delete-group (group &optional force server) + (nnml-possibly-change-directory group server) + (when force + ;; Delete all articles in GROUP. + (let ((articles + (directory-files + nnml-current-directory t + (concat nnheader-numerical-short-files + "\\|" (regexp-quote nnml-nov-file-name) "$"))) + article) + (while articles + (setq article (pop articles)) + (when (file-writable-p article) + (nnheader-message 5 "Deleting article %s in %s..." article group) + (funcall nnmail-delete-file-function article)))) + ;; Try to delete the directory itself. + (condition-case () + (delete-directory nnml-current-directory) + (error nil))) + ;; Remove the group from all structures. + (setq nnml-group-alist + (delq (assoc group nnml-group-alist) nnml-group-alist) + nnml-current-group nil + nnml-current-directory nil) + ;; Save the active file. + (nnmail-save-active nnml-group-alist nnml-active-file) + t) - -;;; Internal functions +(deffoo nnml-request-rename-group (group new-name &optional server) + (nnml-possibly-change-directory group server) + (let ((new-dir (nnmail-group-pathname new-name nnml-directory)) + (old-dir (nnmail-group-pathname group nnml-directory))) + (when (condition-case () + (progn + (make-directory new-dir t) + t) + (error nil)) + ;; We move the articles file by file instead of renaming + ;; the directory -- there may be subgroups in this group. + ;; One might be more clever, I guess. + (let ((files (nnheader-article-to-file-alist old-dir))) + (while files + (rename-file + (concat old-dir (cdar files)) + (concat new-dir (cdar files))) + (pop files))) + ;; Move .overview file. + (let ((overview (concat old-dir nnml-nov-file-name))) + (when (file-exists-p overview) + (rename-file overview (concat new-dir nnml-nov-file-name)))) + (when (<= (length (directory-files old-dir)) 2) + (condition-case () + (delete-directory old-dir) + (error nil))) + ;; That went ok, so we change the internal structures. + (let ((entry (assoc group nnml-group-alist))) + (and entry (setcar entry new-name)) + (setq nnml-current-directory nil + nnml-current-group nil) + ;; Save the new group alist. + (nnmail-save-active nnml-group-alist nnml-active-file) + t)))) + +(deffoo nnml-set-status (article name value &optional group server) + (nnml-possibly-change-directory group server) + (let ((file (nnml-article-to-file article))) + (cond + ((not (file-exists-p file)) + (nnheader-report 'nnml "File %s does not exist" file)) + (t + (nnheader-temp-write file + (nnheader-insert-file-contents-literally file) + (nnmail-replace-status name value)) + t)))) -(defun nnml-retrieve-headers-with-nov (articles) + +;;; 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))) + (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)) + (and (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. +(defun nnml-find-group-number (id) + (save-excursion + (set-buffer (get-buffer-create " *nnml id*")) + (buffer-disable-undo (current-buffer)) + (let ((alist nnml-group-alist) + 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. + (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. + (while (and (not number) + alist) + (or (string= (caar alist) nnml-current-group) + (setq number (nnml-find-id (caar alist) id))) + (or number + (setq alist (cdr alist)))) + (and number + (cons (caar alist) number)))))) + +(defun nnml-find-id (group id) + (erase-buffer) + (let ((nov (concat (nnmail-group-pathname group nnml-directory) + nnml-nov-file-name)) + number found) + (when (file-exists-p nov) + (insert-file-contents nov) + (while (and (not found) + (search-forward id nil t)) ; We find the ID. + ;; And the id is in the fourth field. + (if (search-backward + "\t" (save-excursion (beginning-of-line) (point)) t 4) + (progn + (beginning-of-line) + (setq found t) + ;; We return the article number. + (setq number + (condition-case () + (read (current-buffer)) + (error nil)))))) + number))) + +(defun nnml-retrieve-headers-with-nov (articles &optional fetch-old) (if (or gnus-nov-is-evil nnml-nov-is-evil) nil (let ((first (car articles)) (last (progn (while (cdr articles) (setq articles (cdr articles))) (car articles))) (nov (concat nnml-current-directory nnml-nov-file-name))) - (if (file-exists-p nov) - (save-excursion - (set-buffer nntp-server-buffer) - (erase-buffer) - (insert-file-contents nov) + (when (file-exists-p nov) + (save-excursion + (set-buffer nntp-server-buffer) + (erase-buffer) + (insert-file-contents nov) + (if (and fetch-old + (not (numberp fetch-old))) + t ; Don't remove anything. + (if fetch-old + (setq first (max 1 (- first fetch-old)))) (goto-char (point-min)) - (while (and (not (eobp)) (< first (read (current-buffer)))) + (while (and (not (eobp)) (> first (read (current-buffer)))) (forward-line 1)) (beginning-of-line) (if (not (eobp)) (delete-region 1 (point))) @@ -414,34 +541,37 @@ all. This may very well take some time.") (forward-line 1)) (beginning-of-line) (if (not (eobp)) (delete-region (point) (point-max))) - t))))) - -(defun nnml-possibly-change-directory (newsgroup &optional force) - (if newsgroup - (let ((pathname (nnmail-article-pathname newsgroup nnml-directory))) - (and (or force (file-directory-p pathname)) - (setq nnml-current-directory pathname))) - t)) + t)))))) + +(defun nnml-possibly-change-directory (group &optional server) + (when (and server + (not (nnml-server-opened server))) + (nnml-open-server server)) + (when group + (let ((pathname (nnmail-group-pathname group nnml-directory))) + (when (not (equal pathname nnml-current-directory)) + (setq nnml-current-directory pathname + nnml-current-group group + nnml-article-file-alist nil)))) + t) (defun nnml-possibly-create-directory (group) (let (dir dirs) - (setq dir (nnmail-article-pathname group nnml-directory)) + (setq dir (nnmail-group-pathname group nnml-directory)) (while (not (file-directory-p dir)) (setq dirs (cons dir dirs)) (setq dir (file-name-directory (directory-file-name dir)))) (while dirs - (if (make-directory (directory-file-name (car dirs))) - (error "Could not create directory %s" (car dirs))) - (and gnus-verbose-backends - (message "Creating mail directory %s" (car dirs))) + (make-directory (directory-file-name (car dirs))) + (nnheader-message 5 "Creating mail directory %s" (car dirs)) (setq dirs (cdr dirs))))) -(defun nnml-save-mail () +(defun nnml-save-mail (group-art) "Called narrowed to an article." - (let ((group-art (nreverse (nnmail-article-group 'nnml-active-number))) - chars nov-line) + (let (chars headers) (setq chars (nnmail-insert-lines)) (nnmail-insert-xref group-art) + (run-hooks 'nnmail-prepare-save-mail-hook) (run-hooks 'nnml-prepare-save-mail-hook) (goto-char (point-min)) (while (looking-at "From ") @@ -451,157 +581,92 @@ all. This may very well take some time.") (let ((ga group-art) first) (while ga - (nnml-possibly-create-directory (car (car ga))) - (let ((file (concat (nnmail-article-pathname - (car (car ga)) nnml-directory) - (int-to-string (cdr (car ga)))))) + (nnml-possibly-create-directory (caar ga)) + (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. - (add-name-to-file first file t) + (funcall nnmail-crosspost-link-function first file t) ;; Save the article. - (write-region (point-min) (point-max) file nil - (if gnus-verbose-backends nil 'nomesg)) + (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 + ;; Generate a nov line for this article. We generate the nov ;; line after saving, because nov generation destroys the ;; header. - (setq nov-line (nnml-make-nov-line chars)) + (setq headers (nnml-parse-head chars)) ;; Output the nov line to all nov databases that should have it. (let ((ga group-art)) (while ga - (nnml-add-nov (car (car ga)) (cdr (car ga)) nov-line) + (nnml-add-nov (caar ga) (cdar ga) headers) (setq ga (cdr ga)))) group-art)) (defun nnml-active-number (group) "Compute the next article number in GROUP." - (let ((active (car (cdr (assoc group nnml-group-alist))))) - (or active - (progn - (setq active (cons 1 0)) - (setq nnml-group-alist (cons (list group active) nnml-group-alist)))) + (let ((active (cadr (assoc group nnml-group-alist)))) + ;; The group wasn't known to nnml, so we just create an active + ;; entry for it. + (unless active + ;; Perhaps the active file was corrupt? See whether + ;; there are any articles in this group. + (nnml-possibly-create-directory group) + (nnml-possibly-change-directory group) + (unless nnml-article-file-alist + (setq nnml-article-file-alist + (sort + (nnheader-article-to-file-alist nnml-current-directory) + (lambda (a1 a2) (< (car a1) (car a2)))))) + (setq active + (if nnml-article-file-alist + (cons (caar nnml-article-file-alist) + (caar (last nnml-article-file-alist))) + (cons 1 0))) + (setq nnml-group-alist (cons (list group active) nnml-group-alist))) (setcdr active (1+ (cdr active))) (while (file-exists-p - (concat (nnmail-article-pathname group nnml-directory) + (concat (nnmail-group-pathname group nnml-directory) (int-to-string (cdr active)))) (setcdr active (1+ (cdr active)))) (cdr active))) -(defun nnml-get-new-mail (&optional group) - "Read new incoming mail." - (let* ((spools (nnmail-get-spool-files group)) - (group-in group) - incoming incomings) - (if (or (not nnml-get-new-mail) (not nnmail-spool-file)) - () - ;; We first activate all the groups. - (if (or (not group) (not nnml-group-alist)) - (nnmail-activate 'nnml)) - ;; The we go through all the existing spool files and split the - ;; mail from each. - (while spools - (and - (file-exists-p (car spools)) - (> (nth 7 (file-attributes (car spools))) 0) - (progn - (and gnus-verbose-backends - (message "nnml: Reading incoming mail...")) - (setq incoming - (nnmail-move-inbox - (car spools) (concat nnml-directory "Incoming"))) - (setq group (nnmail-get-split-group (car spools) group-in)) - (nnmail-split-incoming incoming 'nnml-save-mail nil group) - (setq incomings (cons incoming incomings)))) - (setq spools (cdr spools))) - ;; If we did indeed read any incoming spools, we save all info. - (if incoming - (progn - (nnmail-save-active nnml-group-alist nnml-active-file) - (nnml-save-nov) - (run-hooks 'nnmail-read-incoming-hook) - (and gnus-verbose-backends - (message "nnml: Reading incoming mail...done")))) - (while incomings - (and nnmail-delete-incoming - (file-writable-p incoming) - (delete-file incoming)) - (setq incomings (cdr incomings)))))) - - -(defun nnml-add-nov (group article line) +(defun nnml-add-nov (group article headers) "Add a nov line for the GROUP base." (save-excursion (set-buffer (nnml-open-nov group)) (goto-char (point-max)) - (insert (int-to-string article) line))) + (mail-header-set-number headers article) + (nnheader-insert-nov headers))) (defsubst nnml-header-value () - (buffer-substring (match-end 0) (save-excursion (end-of-line) (point)))) + (buffer-substring (match-end 0) (progn (end-of-line) (point)))) -(defun nnml-make-nov-line (chars) - "Create a nov from the current headers." - (let ((case-fold-search t) - subject from date id references lines xref in-reply-to char) - (save-excursion - (save-restriction - (goto-char (point-min)) - (narrow-to-region - (point) - (1- (or (search-forward "\n\n" nil t) (point-max)))) - ;; Fold continuation lines. - (goto-char (point-min)) - (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) - (replace-match " " t t)) - (subst-char-in-region (point-min) (point-max) ?\t ? ) - ;; [number subject from date id references chars lines xref] - (save-excursion - (goto-char (point-min)) - (while (re-search-forward "^\\(from\\|subject\\|message-id\\|date\\|lines\\|xref\\|references\\|in-reply-to\\): " - nil t) - (beginning-of-line) - (setq char (downcase (following-char))) - (cond - ((eq char ?s) - (setq subject (nnml-header-value))) - ((eq char ?f) - (setq from (nnml-header-value))) - ((eq char ?x) - (setq xref (nnml-header-value))) - ((eq char ?l) - (setq lines (nnml-header-value))) - ((eq char ?d) - (setq date (nnml-header-value))) - ((eq char ?m) - (setq id (setq id (nnml-header-value)))) - ((eq char ?r) - (setq references (nnml-header-value))) - ((eq char ?i) - (setq in-reply-to (nnml-header-value)))) - (forward-line 1)) - - (and (not references) - in-reply-to - (string-match "<[^>]+>" in-reply-to) - (setq references - (substring in-reply-to (match-beginning 0) - (match-end 0))))) - ;; [number subject from date id references chars lines xref] - (format "\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%s\t\n" - (or subject "(none)") - (or from "(nobody)") (or date "") - (or id (concat "nnml-dummy-id-" - (mapconcat - (lambda (time) (int-to-string time)) - (current-time) "-"))) - (or references "") - (or chars 0) (or lines "0") (or xref "")))))) +(defun nnml-parse-head (chars &optional number) + "Parse the head of the current buffer." + (save-excursion + (save-restriction + (goto-char (point-min)) + (narrow-to-region + (point) + (1- (or (search-forward "\n\n" nil t) (point-max)))) + ;; Fold continuation lines. + (goto-char (point-min)) + (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) + (replace-match " " t t)) + ;; Remove any tabs; they are too confusing. + (subst-char-in-region (point-min) (point-max) ?\t ? ) + (let ((headers (nnheader-parse-head t))) + (mail-header-set-chars headers chars) + (mail-header-set-number headers number) + headers)))) (defun nnml-open-nov (group) (or (cdr (assoc group nnml-nov-buffer-alist)) (let ((buffer (find-file-noselect - (concat (nnmail-article-pathname - group nnml-directory) nnml-nov-file-name)))) + (concat (nnmail-group-pathname group nnml-directory) + nnml-nov-file-name)))) (save-excursion (set-buffer buffer) (buffer-disable-undo (current-buffer))) @@ -612,85 +677,102 @@ all. This may very well take some time.") (defun nnml-save-nov () (save-excursion (while nnml-nov-buffer-alist - (if (buffer-name (cdr (car nnml-nov-buffer-alist))) - (progn - (set-buffer (cdr (car nnml-nov-buffer-alist))) - (and (buffer-modified-p) - (write-region - 1 (point-max) (buffer-file-name) nil 'nomesg)) - (set-buffer-modified-p nil) - (kill-buffer (current-buffer)))) + (when (buffer-name (cdar nnml-nov-buffer-alist)) + (set-buffer (cdar nnml-nov-buffer-alist)) + (when (buffer-modified-p) + (nnmail-write-region 1 (point-max) (buffer-file-name) nil 'nomesg)) + (set-buffer-modified-p nil) + (kill-buffer (current-buffer))) (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist))))) ;;;###autoload -(defun nnml-generate-nov-databases (dir) - "Generate nov databases in all nnml mail newsgroups." - (interactive - (progn - (setq nnml-group-alist nil) - (list nnml-directory))) - (nnml-open-server (or nnml-current-server "")) - (let ((dirs (directory-files dir t nil t))) +(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 + ;; numbers in empty groups. + (nnmail-activate 'nnml) + (nnml-open-server (or (nnoo-current-server 'nnml) "")) + (setq nnml-directory (expand-file-name nnml-directory)) + ;; Recurse down the directories. + (nnml-generate-nov-databases-1 nnml-directory) + ;; Save the active file. + (nnmail-save-active nnml-group-alist nnml-active-file)) + +(defun nnml-generate-nov-databases-1 (dir) + (setq dir (file-name-as-directory dir)) + ;; We descend recursively + (let ((dirs (directory-files dir t nil t)) + dir) (while dirs - (if (and (not (string-match "/\\.\\.$" (car dirs))) - (not (string-match "/\\.$" (car dirs))) - (file-directory-p (car dirs))) - (nnml-generate-nov-databases (car dirs))) - (setq dirs (cdr dirs)))) + (setq dir (pop dirs)) + (when (and (not (member (file-name-nondirectory dir) '("." ".."))) + (file-directory-p dir)) + (nnml-generate-nov-databases-1 dir)))) + ;; Do this directory. (let ((files (sort (mapcar - (function - (lambda (name) - (string-to-int name))) + (lambda (name) (string-to-int name)) (directory-files dir nil "^[0-9]+$" t)) - (function <))) - (nov (concat dir "/" nnml-nov-file-name)) - (nov-buffer (get-buffer-create "*nov*")) - nov-line chars) - (if files - (setq nnml-group-alist - (cons (list (nnmail-replace-chars-in-string - (substring (expand-file-name dir) - (length (expand-file-name - nnml-directory))) - ?/ ?.) - (cons (car files) - (let ((f files)) - (while (cdr f) (setq f (cdr f))) - (car f)))) - nnml-group-alist))) - (if files - (save-excursion - (set-buffer nntp-server-buffer) - (if (file-exists-p nov) - (delete-file nov)) - (save-excursion - (set-buffer nov-buffer) - (buffer-disable-undo (current-buffer)) - (erase-buffer)) - (while files - (erase-buffer) - (insert-file-contents (concat dir "/" (int-to-string (car files)))) + '<))) + (when files + (funcall nnml-generate-active-function dir) + ;; Generate the nov file. + (nnml-generate-nov-file dir files)))) + +(defvar files) +(defun nnml-generate-active-info (dir) + ;; Update the active info for this 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) + (let ((f files)) + (while (cdr f) (setq f (cdr f))) + (car f)))) + nnml-group-alist))) + +(defun nnml-generate-nov-file (dir files) + (let* ((dir (file-name-as-directory dir)) + (nov (concat dir nnml-nov-file-name)) + (nov-buffer (get-buffer-create " *nov*")) + chars file headers) + (save-excursion + ;; Init the nov buffer. + (set-buffer nov-buffer) + (buffer-disable-undo (current-buffer)) + (erase-buffer) + (set-buffer nntp-server-buffer) + ;; Delete the old NOV file. + (when (file-exists-p nov) + (funcall nnmail-delete-file-function nov)) + (while files + (unless (file-directory-p + (setq file (concat dir (int-to-string (car files))))) + (erase-buffer) + (insert-file-contents file) + (narrow-to-region + (goto-char (point-min)) + (progn + (search-forward "\n\n" nil t) + (setq chars (- (point-max) (point))) + (max 1 (1- (point))))) + (when (and (not (= 0 chars)) ; none of them empty files... + (not (= (point-min) (point-max)))) (goto-char (point-min)) - (narrow-to-region 1 (save-excursion (search-forward "\n\n" nil t) - (setq chars (- (point-max) - (point))) - (point))) - (if (not (= 0 chars)) ; none of them empty files... - (progn - (setq nov-line (nnml-make-nov-line chars)) - (save-excursion - (set-buffer nov-buffer) - (goto-char (point-max)) - (insert (int-to-string (car files)) nov-line)))) - (widen) - (setq files (cdr files))) - (save-excursion - (set-buffer nov-buffer) - (write-region 1 (point-max) (expand-file-name nov) nil - 'nomesg) - (kill-buffer (current-buffer))))) - (nnmail-save-active nnml-group-alist nnml-active-file))) + (setq headers (nnml-parse-head chars (car files))) + (save-excursion + (set-buffer nov-buffer) + (goto-char (point-max)) + (nnheader-insert-nov headers))) + (widen)) + (setq files (cdr files))) + (save-excursion + (set-buffer nov-buffer) + (nnmail-write-region 1 (point-max) nov nil 'nomesg) + (kill-buffer (current-buffer)))))) (defun nnml-nov-delete-article (group article) (save-excursion