-;;; nnmh.el --- mail spool access for Gnus (mhspool)
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; nnmh.el --- mhspool access for Gnus
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
(require 'rmail)
(require 'nnmail)
(require 'gnus)
+(eval-and-compile (require 'cl))
(defvar nnmh-directory "~/Mail/"
- "Mail directory.")
+ "*Mail spool directory.")
(defvar nnmh-get-new-mail t
- "If non-nil, nnmh will check the incoming mail file and split the mail.")
+ "*If non-nil, nnmh will check the incoming mail file and split the mail.")
+
+(defvar nnmh-prepare-save-mail-hook nil
+ "*Hook run narrowed to an article before saving.")
+
+(defvar nnmh-be-safe nil
+ "*If non-nil, nnmh will check all articles to make sure whether they are new or not.")
\f
-(defconst nnmh-version "nnmh 0.1"
+(defconst nnmh-version "nnmh 1.0"
"nnmh version.")
(defvar nnmh-current-directory nil
"Current news group directory.")
(defvar nnmh-status-string "")
-
(defvar nnmh-group-alist nil)
\f
+(defvar nnmh-current-server nil)
+(defvar nnmh-server-alist nil)
+(defvar nnmh-server-variables
+ (list
+ (list 'nnmh-directory nnmh-directory)
+ (list 'nnmh-get-new-mail nnmh-get-new-mail)
+ '(nnmh-current-directory nil)
+ '(nnmh-status-string "")
+ '(nnmh-group-alist)))
+
+\f
+
;;; Interface functions.
-(defun nnmh-retrieve-headers (sequence &optional newsgroup server)
+(defun nnmh-retrieve-headers (articles &optional newsgroup server fetch-old)
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
- (let ((file nil)
- (number (length sequence))
- (count 0)
- beg article)
+ (let* ((file nil)
+ (number (length articles))
+ (large (and (numberp nnmail-large-newsgroup)
+ (> number nnmail-large-newsgroup)))
+ (count 0)
+ beg article)
(nnmh-possibly-change-directory newsgroup)
- (while sequence
- (setq article (car sequence))
- (setq file
- (concat nnmh-current-directory (prin1-to-string article)))
- (if (and (file-exists-p file)
- (not (file-directory-p file)))
- (progn
- (insert (format "221 %d Article retrieved.\n" article))
- (setq beg (point))
- (insert-file-contents file)
- (goto-char beg)
- (if (search-forward "\n\n" nil t)
- (forward-char -1)
- (goto-char (point-max))
- (insert "\n\n"))
- (insert (format "Lines: %d\n" (count-lines (point) (point-max))))
- (insert ".\n")
- (delete-region (point) (point-max))))
- (setq sequence (cdr sequence))
- (setq count (1+ count))
- (and (numberp nnmail-large-newsgroup)
- (> number nnmail-large-newsgroup)
- (zerop (% count 20))
- (message "nnmh: Receiving headers... %d%%"
- (/ (* count 100) number))))
-
- (and (numberp nnmail-large-newsgroup)
- (> number nnmail-large-newsgroup)
- (message "nnmh: Receiving headers... done"))
-
- ;; Fold continuation lines.
- (goto-char 1)
- (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
- (replace-match " " t t))
- 'headers)))
-
-(defun nnmh-open-server (host &optional service)
- (setq nnmh-status-string "")
- (nnheader-init-server-buffer))
+ ;; We don't support fetching by Message-ID.
+ (if (stringp (car articles))
+ 'headers
+ (while articles
+ (when (and (file-exists-p
+ (setq file (concat (file-name-as-directory
+ nnmh-current-directory)
+ (int-to-string
+ (setq article (pop articles))))))
+
+ (not (file-directory-p file)))
+ (insert (format "221 %d Article retrieved.\n" article))
+ (setq beg (point))
+ (nnheader-insert-head file)
+ (goto-char beg)
+ (if (search-forward "\n\n" nil t)
+ (forward-char -1)
+ (goto-char (point-max))
+ (insert "\n\n"))
+ (insert ".\n")
+ (delete-region (point) (point-max)))
+ (setq count (1+ count))
+
+ (and large
+ (zerop (% count 20))
+ (message "nnmh: Receiving headers... %d%%"
+ (/ (* count 100) number))))
+
+ (and large (message "nnmh: Receiving headers...done"))
+
+ (nnheader-fold-continuation-lines)
+ 'headers))))
+
+(defun nnmh-open-server (server &optional defs)
+ (nnheader-init-server-buffer)
+ (if (equal server nnmh-current-server)
+ t
+ (if nnmh-current-server
+ (setq nnmh-server-alist
+ (cons (list nnmh-current-server
+ (nnheader-save-variables nnmh-server-variables))
+ nnmh-server-alist)))
+ (let ((state (assoc server nnmh-server-alist)))
+ (if state
+ (progn
+ (nnheader-restore-variables (nth 1 state))
+ (setq nnmh-server-alist (delq state nnmh-server-alist)))
+ (nnheader-set-init-variables nnmh-server-variables defs)))
+ (setq nnmh-current-server server)))
(defun nnmh-close-server (&optional server)
+ (setq nnmh-current-server nil)
t)
(defun nnmh-server-opened (&optional server)
- (and nntp-server-buffer
- (get-buffer nntp-server-buffer)))
+ (and (equal server nnmh-current-server)
+ nntp-server-buffer
+ (buffer-name nntp-server-buffer)))
(defun nnmh-status-message (&optional server)
nnmh-status-string)
(nnmh-possibly-change-directory newsgroup)
(let ((file (if (stringp id)
nil
- (concat nnmh-current-directory (prin1-to-string id))))
+ (concat nnmh-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)))))
+ (and (stringp file)
+ (file-exists-p file)
+ (not (file-directory-p file))
+ (save-excursion (nnmail-find-file file))
+ (string-to-int (file-name-nondirectory file)))))
(defun nnmh-request-group (group &optional server dont-check)
- (and nnmh-get-new-mail (or dont-check (nnmh-get-new-mail)))
- (let ((pathname (nnmh-article-pathname group nnmh-directory))
+ (let ((pathname (nnmail-group-pathname group nnmh-directory))
dir)
- (if (file-directory-p pathname)
- (progn
- (setq nnmh-current-directory pathname)
- (and nnmh-get-new-mail (nnmh-update-gnus-unreads group))
- (or dont-check
- (progn
- (setq dir
- (sort
- (mapcar
- (function
- (lambda (name)
- (string-to-int name)))
- (directory-files pathname nil "^[0-9]+$" t))
- '<))
- (save-excursion
- (set-buffer nntp-server-buffer)
- (erase-buffer)
- (if dir
- (insert (format "211 %d %d %d %s\n" (length dir)
- (car dir)
- (progn (while (cdr dir)
- (setq dir (cdr dir)))
- (car dir))
- group))
- (insert (format "211 0 1 0 %s\n" group))))))
- t))))
+ (cond
+ ((not (file-directory-p pathname))
+ (nnheader-report
+ 'nnmh "Can't select group (no such directory): %s" group))
+ (t
+ (setq nnmh-current-directory pathname)
+ (and nnmh-get-new-mail
+ nnmh-be-safe
+ (nnmh-update-gnus-unreads group))
+ (cond
+ (dont-check
+ (nnheader-report 'nnmh "Selected group %s" group)
+ t)
+ (t
+ (setq dir
+ (sort
+ (mapcar (lambda (name) (string-to-int name))
+ (directory-files pathname nil "^[0-9]+$" t))
+ '<))
+ (cond
+ (dir
+ (nnheader-report 'nnmh "Selected group %s" group)
+ (nnheader-insert
+ "211 %d %d %d %s\n" (length dir) (car dir)
+ (progn (while (cdr dir) (setq dir (cdr dir))) (car dir))
+ group))
+ (t
+ (nnheader-report 'nnmh "Empty group %s" group)
+ (nnheader-insert (format "211 0 1 0 %s\n" group))))))))))
+
+(defun nnmh-request-scan (&optional group server)
+ (nnmail-get-new-mail 'nnmh nil nnmh-directory group))
(defun nnmh-request-list (&optional server dir)
- (and server nnmh-get-new-mail (nnmh-get-new-mail))
(or dir
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
- (setq dir nnmh-directory)))
+ (setq dir (file-truename (file-name-as-directory nnmh-directory)))))
(setq dir (expand-file-name dir))
;; Recurse down all directories.
- (let ((dirs (directory-files dir t nil t)))
+ (let ((dirs (and (file-readable-p dir)
+ (> (nth 1 (file-attributes (file-chase-links dir))) 2)
+ (directory-files dir t nil t))))
(while dirs
- (if (and (not (string-match "/\\.\\.$" (car dirs)))
- (not (string-match "/\\.$" (car dirs)))
- (file-directory-p (car dirs)))
- (nnmh-request-list server (car dirs)))
+ (if (and (not (string-match "/\\.\\.?$" (car dirs)))
+ (file-directory-p (car dirs))
+ (file-readable-p (car dirs)))
+ (nnmh-request-list nil (car dirs)))
(setq dirs (cdr dirs))))
;; For each directory, generate an active file line.
(if (not (string= (expand-file-name nnmh-directory) dir))
(let ((files (mapcar
(lambda (name) (string-to-int name))
(directory-files dir nil "^[0-9]+$" t))))
- (save-excursion
- (set-buffer nntp-server-buffer)
- (insert
- (format
- "%s %d %d y\n"
- (progn
- (string-match (expand-file-name nnmh-directory) dir)
- (nnmail-replace-chars-in-string
- (substring dir (match-end 0)) ?/ ?.))
- (if files (apply (function max) files) 0)
- (if files (apply (function min) files) 0))))))
+ (if (null files)
+ ()
+ (save-excursion
+ (set-buffer nntp-server-buffer)
+ (goto-char (point-max))
+ (insert
+ (format
+ "%s %d %d y\n"
+ (progn
+ (string-match
+ (file-truename (file-name-as-directory
+ (expand-file-name nnmh-directory))) dir)
+ (nnheader-replace-chars-in-string
+ (substring dir (match-end 0)) ?/ ?.))
+ (apply (function max) files)
+ (apply (function min) files)))))))
+ (setq nnmh-group-alist (nnmail-get-active))
t)
(defun nnmh-request-newgroups (date &optional server)
(defun nnmh-request-post (&optional server)
(mail-send-and-exit nil))
-(fset 'nnmh-request-post-buffer 'nnmail-request-post-buffer)
-
(defun nnmh-request-expire-articles (articles newsgroup &optional server force)
(nnmh-possibly-change-directory newsgroup)
- (let* ((days (or (and nnmail-expiry-wait-function
- (funcall nnmail-expiry-wait-function newsgroup))
- nnmail-expiry-wait))
+ (let* ((active-articles
+ (mapcar
+ (function
+ (lambda (name)
+ (string-to-int name)))
+ (directory-files nnmh-current-directory nil "^[0-9]+$" t)))
+ (max-article (and active-articles (apply 'max active-articles)))
+ (is-old t)
article rest mod-time)
- (if nnmail-keep-last-article
- (progn
- (setq articles (sort articles '>))
- (setq rest (cons (car articles) rest))
- (setq articles (cdr articles))))
- (while articles
- (setq article (concat nnmh-current-directory (int-to-string
- (car articles))))
+ (nnmail-activate 'nnmh)
+
+ (while (and articles is-old)
+ (setq article (concat nnmh-current-directory
+ (int-to-string (car articles))))
(if (setq mod-time (nth 5 (file-attributes article)))
- (if (or force
- (> (nnmail-days-between
- (current-time-string)
- (current-time-string mod-time))
- days))
+ (if (and (nnmh-deletable-article-p newsgroup (car articles))
+ (setq is-old
+ (nnmail-expired-article-p newsgroup mod-time force)))
(progn
- (message "Deleting %s..." article)
+ (nnheader-message 5 "Deleting article %s in %s..."
+ article newsgroup)
(condition-case ()
- (delete-file article)
- (file-error nil)))
+ (funcall nnmail-delete-file-function article)
+ (file-error
+ (setq rest (cons (car articles) rest)))))
(setq rest (cons (car articles) rest))))
(setq articles (cdr articles)))
- rest))
+ (message "")
+ (nconc rest articles)))
(defun nnmh-close-group (group &optional server)
t)
(let ((buf (get-buffer-create " *nnmh move*"))
result)
(and
+ (nnmh-deletable-article-p group article)
(nnmh-request-article article group server)
(save-excursion
(set-buffer buf)
(kill-buffer (current-buffer))
result)
(condition-case ()
- (delete-file (concat nnmh-current-directory
- (int-to-string article)))
+ (funcall nnmail-delete-file-function
+ (concat nnmh-current-directory (int-to-string article)))
(file-error nil)))
- result))
+ result))
-(defun nnmh-request-accept-article (group &optional last)
+(defun nnmh-request-accept-article (group &optional last noinsert)
(if (stringp group)
(and
- (nnmh-request-list)
- (setq nnmh-group-alist (nnmail-get-active))
+ (nnmail-activate 'nnmh)
;; We trick the choosing function into believing that only one
;; group is availiable.
- (let ((nnmail-split-methods '(group "")))
- (cons group (nnmh-save-mail))))
+ (let ((nnmail-split-methods (list (list group ""))))
+ (car (nnmh-save-mail noinsert))))
(and
- (nnmh-request-list)
- (setq nnmh-group-alist (nnmail-get-active))
- (nnmh-save-mail))))
+ (nnmail-activate 'nnmh)
+ (car (nnmh-save-mail noinsert)))))
(defun nnmh-request-replace-article (article group buffer)
(nnmh-possibly-change-directory group)
(progn
(write-region (point-min) (point-max)
(concat nnmh-current-directory (int-to-string article))
- nil (if gnus-verbose-backends nil 'nomesg))
+ nil (if (nnheader-be-verbose 5) nil 'nomesg))
t)
(error nil))))
+(defun nnmh-request-create-group (group &optional server)
+ (nnmail-activate 'nnmh)
+ (or (assoc group nnmh-group-alist)
+ (let (active)
+ (setq nnmh-group-alist (cons (list group (setq active (cons 1 0)))
+ nnmh-group-alist))
+ (nnmh-possibly-create-directory group)
+ (nnmh-possibly-change-directory group)
+ (let ((articles (mapcar
+ (lambda (file)
+ (string-to-int file))
+ (directory-files
+ nnmh-current-directory nil "^[0-9]+$"))))
+ (and articles
+ (progn
+ (setcar active (apply 'min articles))
+ (setcdr active (apply 'max articles)))))))
+ t)
+
+(defun nnmh-request-delete-group (group &optional force server)
+ (nnmh-possibly-change-directory group)
+ ;; Delete all articles in GROUP.
+ (if (not force)
+ () ; Don't delete the articles.
+ (let ((articles (directory-files nnmh-current-directory t "^[0-9]+$")))
+ (while articles
+ (and (file-writable-p (car articles))
+ (progn
+ (nnheader-message 5 "Deleting article %s in %s..."
+ (car articles) group)
+ (funcall nnmail-delete-file-function (car articles))))
+ (setq articles (cdr articles))))
+ ;; Try to delete the directory itself.
+ (condition-case ()
+ (delete-directory nnmh-current-directory)
+ (error nil)))
+ ;; Remove the group from all structures.
+ (setq nnmh-group-alist
+ (delq (assoc group nnmh-group-alist) nnmh-group-alist)
+ nnmh-current-directory nil)
+ t)
+
+(defun nnmh-request-rename-group (group new-name &optional server)
+ (nnmh-possibly-change-directory group)
+ ;; Rename directory.
+ (and (file-writable-p nnmh-current-directory)
+ (condition-case ()
+ (progn
+ (rename-file
+ (directory-file-name nnmh-current-directory)
+ (directory-file-name
+ (nnmail-group-pathname new-name nnmh-directory)))
+ t)
+ (error nil))
+ ;; That went ok, so we change the internal structures.
+ (let ((entry (assoc group nnmh-group-alist)))
+ (and entry (setcar entry new-name))
+ (setq nnmh-current-directory nil)
+ t)))
+
\f
;;; Internal functions.
(defun nnmh-possibly-change-directory (newsgroup)
(if newsgroup
- (let ((pathname (nnmh-article-pathname newsgroup nnmh-directory)))
+ (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory)))
(if (file-directory-p pathname)
(setq nnmh-current-directory pathname)
(error "No such newsgroup: %s" newsgroup)))))
(defun nnmh-possibly-create-directory (group)
(let (dir dirs)
- (setq dir (nnmail-article-pathname group nnmh-directory))
+ (setq dir (nnmail-group-pathname group nnmh-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)))
+ (nnheader-message 5 "Creating mail directory %s" (car dirs))
(setq dirs (cdr dirs)))))
-(defun nnmh-save-mail ()
+(defun nnmh-save-mail (&optional noinsert)
"Called narrowed to an article."
- (let ((group-art (nreverse (nnmail-article-group 'nnmh-active-number)))
- chars nov-line lines hbeg hend)
- (setq chars (nnmail-insert-lines))
- (nnmail-insert-xref group-art)
+ (let ((group-art (nreverse (nnmail-article-group 'nnmh-active-number))))
+ (unless noinsert
+ (nnmail-insert-lines)
+ (nnmail-insert-xref group-art))
+ (run-hooks 'nnmh-prepare-save-mail-hook)
(goto-char (point-min))
(while (looking-at "From ")
(replace-match "X-From-Line: ")
first)
(while ga
(nnmh-possibly-create-directory (car (car ga)))
- (let ((file (concat (nnmh-article-pathname
+ (let ((file (concat (nnmail-group-pathname
(car (car ga)) nnmh-directory)
(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 nil)
(setq first file)))
(defun nnmh-active-number (group)
"Compute the next article number in GROUP."
(let ((active (car (cdr (assoc group nnmh-group-alist)))))
+ ;; The group wasn't known to nnmh, so we just create an active
+ ;; entry for it.
+ (or active
+ (progn
+ (setq active (cons 1 0))
+ (setq nnmh-group-alist (cons (list group active) nnmh-group-alist))))
(setcdr active (1+ (cdr active)))
- (let (file)
- (while (file-exists-p
- (setq file (concat (nnmh-article-pathname
- group nnmh-directory)
- (int-to-string (cdr active)))))
- (setcdr active (1+ (cdr active)))))
+ (while (file-exists-p
+ (concat (nnmail-group-pathname group nnmh-directory)
+ (int-to-string (cdr active))))
+ (setcdr active (1+ (cdr active))))
(cdr active)))
-(defun nnmh-article-pathname (group mail-dir)
- "Make pathname for GROUP."
- (let ((mail-dir (file-name-as-directory (expand-file-name mail-dir))))
- (if (file-directory-p (concat mail-dir group))
- (concat mail-dir group "/")
- (concat mail-dir (nnmail-replace-chars-in-string group ?. ?/) "/"))))
-
-(defun nnmh-get-new-mail ()
- "Read new incoming mail."
- (let (incoming)
- (if (and nnmh-get-new-mail nnmail-spool-file
- (file-exists-p nnmail-spool-file)
- (> (nth 7 (file-attributes nnmail-spool-file)) 0))
- (progn
- (message "nnmh: Reading incoming mail...")
- (setq incoming
- (nnmail-move-inbox nnmail-spool-file
- (concat nnmh-directory "Incoming")))
- (nnmh-request-list)
- (setq nnmh-group-alist (nnmail-get-active))
- (nnmail-split-incoming incoming 'nnmh-save-mail)
- (run-hooks 'nnmail-read-incoming-hook)
-;; (delete-file incoming)
- (message "nnmh: Reading incoming mail...done")))))
-
(defun nnmh-update-gnus-unreads (group)
;; Go through the .nnmh-articles file and compare with the actual
;; articles in this folder. The articles that are "new" will be
(write-region (point-min) (point-max) nnmh-file nil 'nomesg)
(kill-buffer (current-buffer)))))
+(defun nnmh-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 nnmh-group-alist))) article))))
+
(provide 'nnmh)
;;; nnmh.el ends here
projects / gnus / blobdiff