;;; nnmh.el --- mhspool access for Gnus
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Keywords: news, mail
;; 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:
(require 'nnmail)
(require 'gnus-start)
(require 'nnoo)
-(require 'cl)
+(eval-when-compile (require 'cl))
(nnoo-declare nnmh)
(defvoo nnmh-status-string "")
(defvoo nnmh-group-alist nil)
+(defvoo nnmh-allow-delete-final nil)
\f
(large (and (numberp nnmail-large-newsgroup)
(> number nnmail-large-newsgroup)))
(count 0)
+ (pathname-coding-system 'binary)
beg article)
(nnmh-possibly-change-directory newsgroup server)
;; 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
+ (when (and (file-exists-p
+ (setq file (concat (file-name-as-directory
nnmh-current-directory)
(int-to-string
(setq article (pop articles))))))
(and large
(zerop (% count 20))
- (message "nnmh: Receiving headers... %d%%"
+ (nnheader-message 5 "nnmh: Receiving headers... %d%%"
(/ (* count 100) number))))
(when large
- (message "nnmh: Receiving headers...done"))
+ (nnheader-message 5 "nnmh: Receiving headers...done"))
(nnheader-fold-continuation-lines)
'headers))))
(condition-case ()
(make-directory nnmh-directory t)
(error t)))
- (cond
+ (cond
((not (file-exists-p nnmh-directory))
(nnmh-close-server)
(nnheader-report 'nnmh "Couldn't create directory: %s" nnmh-directory))
(let ((file (if (stringp id)
nil
(concat nnmh-current-directory (int-to-string id))))
+ (pathname-coding-system 'binary)
(nntp-server-buffer (or buffer nntp-server-buffer)))
(and (stringp file)
(file-exists-p file)
(string-to-int (file-name-nondirectory file)))))
(deffoo nnmh-request-group (group &optional server dont-check)
+ (nnheader-init-server-buffer)
+ (nnmh-possibly-change-directory group server)
(let ((pathname (nnmail-group-pathname group nnmh-directory))
+ (pathname-coding-system 'binary)
dir)
- (cond
+ (cond
((not (file-directory-p pathname))
- (nnheader-report
+ (nnheader-report
'nnmh "Can't select group (no such directory): %s" group))
(t
(setq nnmh-current-directory pathname)
- (and nnmh-get-new-mail
+ (and nnmh-get-new-mail
nnmh-be-safe
(nnmh-update-gnus-unreads group))
(cond
(t
;; Re-scan the directory if it's on a foreign system.
(nnheader-re-read-dir pathname)
- (setq dir
+ (setq dir
(sort
(mapcar (lambda (name) (string-to-int name))
(directory-files pathname nil "^[0-9]+$" t))
'<))
- (cond
+ (cond
(dir
(nnheader-report 'nnmh "Selected group %s" group)
(nnheader-insert
(deffoo nnmh-request-list (&optional server dir)
(nnheader-insert "")
- (let ((nnmh-toplev
- (or dir (file-truename (file-name-as-directory nnmh-directory)))))
+ (nnmh-possibly-change-directory nil server)
+ (let ((pathname-coding-system 'binary)
+ (nnmh-toplev
+ (file-truename (or dir (file-name-as-directory nnmh-directory)))))
(nnmh-request-list-1 nnmh-toplev))
(setq nnmh-group-alist (nnmail-get-active))
t)
;; Recurse down all directories.
(let ((dirs (and (file-readable-p dir)
(> (nth 1 (file-attributes (file-chase-links dir))) 2)
- (directory-files dir t nil t)))
- dir)
+ (nnheader-directory-files dir t nil t)))
+ rdir)
;; Recurse down directories.
- (while (setq dir (pop dirs))
- (when (and (not (member (file-name-nondirectory dir) '("." "..")))
- (file-directory-p dir)
- (file-readable-p dir))
- (nnmh-request-list-1 dir))))
+ (while (setq rdir (pop dirs))
+ (when (and (file-directory-p rdir)
+ (file-readable-p rdir)
+ (not (equal (file-truename rdir)
+ (file-truename dir))))
+ (nnmh-request-list-1 rdir))))
;; For each directory, generate an active file line.
(unless (string= (expand-file-name nnmh-toplev) dir)
(let ((files (mapcar
(save-excursion
(set-buffer nntp-server-buffer)
(goto-char (point-max))
- (insert
- (format
- "%s %d %d y\n"
+ (insert
+ (format
+ "%s %d %d y\n"
(progn
- (string-match
+ (string-match
(regexp-quote
- (file-truename (file-name-as-directory
+ (file-truename (file-name-as-directory
(expand-file-name nnmh-toplev))))
dir)
(nnheader-replace-chars-in-string
- (substring dir (match-end 0)) ?/ ?.))
+ (decode-coding-string (substring dir (match-end 0))
+ nnmail-pathname-coding-system)
+ ?/ ?.))
(apply 'max files)
(apply 'min files)))))))
t)
(deffoo nnmh-request-newgroups (date &optional server)
(nnmh-request-list server))
-(deffoo nnmh-request-expire-articles (articles newsgroup &optional server force)
+(deffoo nnmh-request-expire-articles (articles newsgroup
+ &optional server force)
(nnmh-possibly-change-directory newsgroup server)
- (let* ((active-articles
- (mapcar
- (function
- (lambda (name)
- (string-to-int name)))
- (directory-files nnmh-current-directory nil "^[0-9]+$" t)))
- (is-old t)
+ (let* ((is-old t)
article rest mod-time)
- (nnmail-activate 'nnmh)
+ (nnheader-init-server-buffer)
(while (and articles is-old)
- (setq article (concat nnmh-current-directory
+ (setq article (concat nnmh-current-directory
(int-to-string (car articles))))
(when (setq mod-time (nth 5 (file-attributes article)))
(if (and (nnmh-deletable-article-p newsgroup (car articles))
(setq is-old
(nnmail-expired-article-p newsgroup mod-time force)))
(progn
- (nnheader-message 5 "Deleting article %s in %s..."
+ (nnheader-message 5 "Deleting article %s in %s..."
article newsgroup)
(condition-case ()
(funcall nnmail-delete-file-function article)
(push (car articles) rest))))
(push (car articles) rest)))
(setq articles (cdr articles)))
- (message "")
+ (nnheader-message 5 "")
(nconc rest articles)))
(deffoo nnmh-close-group (group &optional server)
t)
-(deffoo nnmh-request-move-article
+(deffoo nnmh-request-move-article
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnmh move*"))
result)
- (and
+ (and
(nnmh-deletable-article-p group article)
(nnmh-request-article article group server)
(save-excursion
(set-buffer buf)
+ (erase-buffer)
(insert-buffer-substring nntp-server-buffer)
(setq result (eval accept-form))
(kill-buffer (current-buffer))
(deffoo nnmh-request-accept-article (group &optional server last noinsert)
(nnmh-possibly-change-directory group server)
(nnmail-check-syntax)
- (if (stringp group)
- (and
- (nnmail-activate 'nnmh)
- (car (nnmh-save-mail
- (list (cons group (nnmh-active-number group)))
- noinsert)))
- (and
- (nnmail-activate 'nnmh)
- (car (nnmh-save-mail (nnmail-article-group 'nnmh-active-number)
- noinsert)))))
+ (when nnmail-cache-accepted-message-ids
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+ (nnheader-init-server-buffer)
+ (prog1
+ (if (stringp group)
+ (if noinsert
+ (nnmh-active-number group)
+ (car (nnmh-save-mail
+ (list (cons group (nnmh-active-number group)))
+ noinsert)))
+ (let ((res (nnmail-article-group 'nnmh-active-number)))
+ (if (and (null res)
+ (yes-or-no-p "Moved to `junk' group; delete article? "))
+ 'junk
+ (car (nnmh-save-mail res noinsert)))))
+ (when (and last nnmail-cache-accepted-message-ids)
+ (nnmail-cache-close))))
(deffoo nnmh-request-replace-article (article group buffer)
(nnmh-possibly-change-directory group)
(save-excursion
(set-buffer buffer)
(nnmh-possibly-create-directory group)
- (condition-case ()
- (progn
- (nnmail-write-region
- (point-min) (point-max)
- (concat nnmh-current-directory (int-to-string article))
- nil (if (nnheader-be-verbose 5) nil 'nomesg))
- t)
- (error nil))))
+ (ignore-errors
+ (nnmail-write-region
+ (point-min) (point-max)
+ (concat nnmh-current-directory (int-to-string article))
+ nil (if (nnheader-be-verbose 5) nil 'nomesg))
+ t)))
(deffoo nnmh-request-create-group (group &optional server args)
- (nnmail-activate 'nnmh)
+ (nnheader-init-server-buffer)
(unless (assoc group nnmh-group-alist)
(let (active)
(push (list group (setq active (cons 1 0)))
(let ((articles (mapcar
(lambda (file)
(string-to-int file))
- (directory-files
+ (directory-files
nnmh-current-directory nil "^[0-9]+$"))))
(when articles
(setcar active (apply 'min articles))
(if (not force)
() ; Don't delete the articles.
(let ((articles (directory-files nnmh-current-directory t "^[0-9]+$")))
- (while articles
+ (while articles
(when (file-writable-p (car articles))
(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)))
+ (ignore-errors
+ (delete-directory nnmh-current-directory)))
;; Remove the group from all structures.
- (setq nnmh-group-alist
+ (setq nnmh-group-alist
(delq (assoc group nnmh-group-alist) nnmh-group-alist)
nnmh-current-directory nil)
t)
(nnmh-possibly-change-directory group server)
(let ((new-dir (nnmail-group-pathname new-name nnmh-directory))
(old-dir (nnmail-group-pathname group nnmh-directory)))
- (when (condition-case ()
- (progn
- (make-directory new-dir t)
- t)
- (error nil))
+ (when (ignore-errors
+ (make-directory new-dir t)
+ t)
;; 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
+ (rename-file
(concat old-dir (cdar files))
(concat new-dir (cdar files)))
(pop files)))
(when (<= (length (directory-files old-dir)) 2)
- (condition-case ()
- (delete-directory old-dir)
- (error nil)))
+ (ignore-errors
+ (delete-directory old-dir)))
;; That went ok, so we change the internal structures.
(let ((entry (assoc group nnmh-group-alist)))
(when entry
;;; Internal functions.
(defun nnmh-possibly-change-directory (newsgroup &optional server)
- (when (and server
+ (when (and server
(not (nnmh-server-opened server)))
(nnmh-open-server server))
(when newsgroup
- (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory)))
+ (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory))
+ (pathname-coding-system 'binary))
(if (file-directory-p pathname)
(setq nnmh-current-directory pathname)
(error "No such newsgroup: %s" newsgroup)))))
(error "Could not create directory %s" (car dirs)))
(nnheader-message 5 "Creating mail directory %s" (car dirs))
(setq dirs (cdr dirs)))))
-
+
(defun nnmh-save-mail (group-art &optional noinsert)
"Called narrowed to an article."
(unless noinsert
first)
(while ga
(nnmh-possibly-create-directory (caar ga))
- (let ((file (concat (nnmail-group-pathname
+ (let ((file (concat (nnmail-group-pathname
(caar ga) nnmh-directory)
(int-to-string (cdar ga)))))
(if first
(defun nnmh-active-number (group)
"Compute the next article number in GROUP."
- (let ((active (cadr (assoc group nnmh-group-alist))))
+ (let ((active (cadr (assoc group nnmh-group-alist)))
+ (dir (nnmail-group-pathname group nnmh-directory))
+ (pathname-coding-system 'binary))
(unless active
;; The group wasn't known to nnmh, so we just create an active
- ;; entry for it.
+ ;; entry for it.
(setq active (cons 1 0))
(push (list group active) nnmh-group-alist)
+ (unless (file-exists-p dir)
+ (gnus-make-directory dir))
;; Find the highest number in the group.
(let ((files (sort
(mapcar
(lambda (f)
(string-to-int f))
- (directory-files
- (nnmail-group-pathname group nnmh-directory)
- nil "^[0-9]+$")
- '>))))
+ (directory-files dir nil "^[0-9]+$"))
+ '>)))
(when files
(setcdr active (car files)))))
(setcdr active (1+ (cdr active)))
;; marked as unread by Gnus.
(let* ((dir nnmh-current-directory)
(files (sort (mapcar (function (lambda (name) (string-to-int name)))
- (directory-files nnmh-current-directory
+ (directory-files nnmh-current-directory
nil "^[0-9]+$" t))
'<))
(nnmh-file (concat dir ".nnmh-articles"))
new articles)
;; Load the .nnmh-articles file.
(when (file-exists-p nnmh-file)
- (setq articles
+ (setq articles
(let (nnmh-newsgroup-articles)
- (condition-case nil (load nnmh-file nil t t) (error nil))
+ (ignore-errors (load nnmh-file nil t t))
nnmh-newsgroup-articles)))
;; Add all new articles to the `new' list.
(let ((art files))
art)
(while (setq art (pop arts))
(when (not (equal
- (nth 5 (file-attributes
+ (nth 5 (file-attributes
(concat dir (int-to-string (car art)))))
(cdr art)))
(setq articles (delq art articles))
new)))
;; Make Gnus mark all new articles as unread.
(when new
- (gnus-make-articles-unread
+ (gnus-make-articles-unread
(gnus-group-prefixed-name group (list 'nnmh ""))
(setq new (sort new '<))))
;; Sort the article list with highest numbers first.
(setq articles (sort articles (lambda (art1 art2)
(> (car art1) (car art2)))))
;; Finally write this list back to the .nnmh-articles file.
- (nnheader-temp-write nnmh-file
+ (with-temp-file nnmh-file
(insert ";; Gnus article active file for " group "\n\n")
(insert "(setq nnmh-newsgroup-articles '")
(gnus-prin1 articles)
(defun nnmh-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
(let ((path (concat nnmh-current-directory (int-to-string article))))
- (when (file-writable-p path)
- (or (not nnmail-keep-last-article)
+ ;; Writable.
+ (and (file-writable-p path)
+ (or
+ ;; We can never delete the last article in the group.
(not (eq (cdr (nth 1 (assoc group nnmh-group-alist)))
- article))))))
+ article))
+ ;; Well, we can.
+ nnmh-allow-delete-final))))
(provide 'nnmh)
projects / gnus / blobdiff