;;; 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 <larsi@ifi.uio.no>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; 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:
(defvar nnml-nov-buffer-alist nil)
(defvar nnml-group-alist nil)
(defvar nnml-active-timestamp nil)
+(defvar nnml-article-file-alist nil)
(defvar nnml-generate-active-function 'nnml-generate-active-info)
(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-current-group nil)
- '(nnml-status-string "")
- '(nnml-nov-buffer-alist nil)
- '(nnml-group-alist nil)
- '(nnml-active-timestamp nil)))
+ `((nnml-directory ,nnml-directory)
+ (nnml-active-file ,nnml-active-file)
+ (nnml-newsgroups-file ,nnml-newsgroups-file)
+ (nnml-get-new-mail ,nnml-get-new-mail)
+ (nnml-nov-is-evil ,nnml-nov-is-evil)
+ (nnml-nov-file-name ,nnml-nov-file-name)
+ (nnml-current-directory nil)
+ (nnml-current-group nil)
+ (nnml-status-string "")
+ (nnml-nov-buffer-alist nil)
+ (nnml-group-alist nil)
+ (nnml-active-timestamp nil)))
\f
(if (stringp (car sequence))
'headers
(nnml-possibly-change-directory newsgroup)
+ (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
(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"))
(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)))
+ (nnheader-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)))
(defun nnml-close-server (&optional server)
- (setq nnml-current-server nil)
+ (setq nnml-current-server nil
+ nnml-group-alist nil)
t)
(defun nnml-server-opened (&optional server)
(defun nnml-request-article (id &optional newsgroup server buffer)
(nnml-possibly-change-directory newsgroup)
- (let* ((group-num (and (stringp id) (nnml-find-group-number id)))
- (number (if (numberp id) id (cdr group-num)))
- (file
- (and number
- (concat
- (if (numberp id)
- nnml-current-directory
- (nnmail-group-pathname (car group-num) nnml-directory))
- (int-to-string number))))
- (nntp-server-buffer (or buffer nntp-server-buffer)))
- (and file
- (file-exists-p file)
- (not (file-directory-p file))
- (save-excursion (nnmail-find-file file))
- ;; We return the article number.
- (cons newsgroup (string-to-int (file-name-nondirectory file))))))
+ (let* ((nntp-server-buffer (or buffer nntp-server-buffer))
+ file path gpath group-num)
+ (if (stringp id)
+ (when (and (setq group-num (nnml-find-group-number id))
+ (setq file (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)))))
+ (unless nnml-article-file-alist
+ (setq nnml-article-file-alist
+ (nnheader-article-to-file-alist nnml-current-directory)))
+ (when (setq file (cdr (assq id nnml-article-file-alist)))
+ (setq path (concat nnml-current-directory file))))
+ (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)))))))
(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
- (nnmail-activate 'nnml)
- (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))))))
+ (cond
+ ((not (nnml-possibly-change-directory group))
+ (nnheader-report 'nnml "Invalid group (no such directory)"))
+ (dont-check
+ (nnheader-report 'nnml "Group %s selected" group)
+ t)
+ (t
+ (nnmail-activate 'nnml)
+ (let ((active (nth 1 (assoc group nnml-group-alist))))
+ (save-excursion
+ (set-buffer nntp-server-buffer)
+ (erase-buffer)
+ (if (not active)
+ (nnheader-report 'nnml "No such group: %s" group)
+ (insert (format "211 %d %d %d %s\n"
+ (max (1+ (- (cdr active) (car active))) 0)
+ (car active) (cdr active) group))
+ (nnheader-report 'nnml "Group %s selected" group)
+ t))))))
(defun nnml-request-scan (&optional group server)
+ (setq nnml-article-file-alist nil)
(nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group))
(defun nnml-close-group (group &optional server)
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
(setq is-old
(nnmail-expired-article-p newsgroup mod-time force)))
(progn
- (and gnus-verbose-backends
- (message "Deleting article %s in %s..."
- article newsgroup))
+ (nnheader-message 5 "Deleting article %s in %s..."
+ article newsgroup)
(condition-case ()
(funcall nnmail-delete-file-function article)
(file-error
(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 "")
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnml move*"))
result)
+ (nnml-possibly-change-directory group)
+ (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)
(and
(nnmail-activate 'nnml)
;; We trick the choosing function into believing that only one
- ;; group is availiable.
+ ;; group is available.
(let ((nnmail-split-methods (list (list group ""))))
(setq result (car (nnml-save-mail))))
(progn
(write-region (point-min) (point-max)
(concat nnml-current-directory
(int-to-string article))
- nil (if gnus-verbose-backends nil 'nomesg))
+ nil (if (nnheader-be-verbose 5) nil 'nomesg))
t)
(error nil)))
()
(while articles
(setq article (pop articles))
(when (file-writable-p article)
- (when gnus-verbose-backends
- (message "Deleting article %s in %s..." article group))
+ (nnheader-message 5 "Deleting article %s in %s..." article group)
(funcall nnmail-delete-file-function article))))
;; Try to delete the directory itself.
(condition-case ()
(defun nnml-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
- (or (not nnmail-keep-last-article)
- (not (eq (cdr (nth 1 (assoc group nnml-group-alist))) article))))
+ (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)
(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)
(if (not (eobp)) (delete-region (point) (point-max)))
t))))))
-(defun nnml-possibly-change-directory (newsgroup &optional force)
- (if newsgroup
- (let ((pathname (nnmail-group-pathname newsgroup nnml-directory)))
- (and (or force (file-directory-p pathname))
- (setq nnml-current-directory pathname
- nnml-current-group newsgroup)))
- t))
+(defun nnml-possibly-change-directory (group &optional force)
+ (when group
+ (let ((pathname (nnmail-group-pathname group nnml-directory)))
+ (when (or force
+ (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 (file-name-directory (directory-file-name dir))))
(while dirs
(make-directory (directory-file-name (car dirs)))
- (and gnus-verbose-backends
- (message "Creating mail directory %s" (car dirs)))
+ (nnheader-message 5 "Creating mail directory %s" (car dirs))
(setq dirs (cdr dirs)))))
(defun nnml-save-mail ()
(int-to-string (cdr (car 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))
+ (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
(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 subject "(none)") (or from "(nobody)") (or date "")
+ (or id (nnmail-message-id))
+ (or references "") (or chars 0) (or lines "0")
(or xref ""))))))
(defun nnml-open-nov (group)
(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 (cdr (car nnml-nov-buffer-alist)))
+ (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)))
(setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
;;;###autoload
(defun nnml-generate-active-info (dir)
;; Update the active info for this group.
- (let ((group (nnmail-replace-chars-in-string
- (substring dir (length nnml-directory))
- ?/ ?.)))
+ (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
(let* ((dir (file-name-as-directory dir))
(nov (concat dir nnml-nov-file-name))
(nov-buffer (get-buffer-create " *nov*"))
- nov-line chars)
+ nov-line chars file)
(save-excursion
;; Init the nov buffer.
(set-buffer nov-buffer)
(when (file-exists-p nov)
(funcall nnmail-delete-file-function nov))
(while files
- (erase-buffer)
- (insert-file-contents (concat dir (int-to-string (car files))))
- (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))
- (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)))
+ (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))
+ (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
projects / gnus / blobdiff