;;; Code:
(require 'nnheader)
-(require 'rmail)
(require 'nnmail)
-(require 'gnus)
+(require 'gnus-start)
(require 'nnoo)
-(eval-and-compile (require 'cl))
+(require 'cl)
(nnoo-declare nnmh)
-(defvoo nnmh-directory "~/Mail/"
+(defvoo nnmh-directory message-directory
"*Mail spool directory.")
(defvoo nnmh-get-new-mail t
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-report 'nnmh "Selected group %s" group)
t)
(t
+ ;; Re-scan the directory if it's on a foreign system.
+ (nnheader-re-read-dir pathname)
(setq dir
(sort
(mapcar (lambda (name) (string-to-int name))
(nnmail-get-new-mail 'nnmh nil nnmh-directory group))
(deffoo nnmh-request-list (&optional server dir)
- (unless dir
- (nnheader-insert "")
- (setq dir (file-truename (file-name-as-directory nnmh-directory))))
+ (nnheader-insert "")
+ (let ((nnmh-toplev
+ (or dir (file-truename (file-name-as-directory nnmh-directory)))))
+ (nnmh-request-list-1 nnmh-toplev))
+ (setq nnmh-group-alist (nnmail-get-active))
+ t)
+
+(defvar nnmh-toplev)
+(defun nnmh-request-list-1 (dir)
(setq dir (expand-file-name dir))
;; Recurse down all directories.
(let ((dirs (and (file-readable-p dir)
dir)
;; Recurse down directories.
(while (setq dir (pop dirs))
- (when (and (not (string-match "/\\.\\.?$" dir))
+ (when (and (not (member (file-name-nondirectory dir) '("." "..")))
(file-directory-p dir)
(file-readable-p dir))
- (nnmh-request-list nil dir))))
+ (nnmh-request-list-1 dir))))
;; For each directory, generate an active file line.
- (unless (string= (expand-file-name nnmh-directory) dir)
+ (unless (string= (expand-file-name nnmh-toplev) dir)
(let ((files (mapcar
(lambda (name) (string-to-int name))
(directory-files dir nil "^[0-9]+$" t))))
"%s %d %d y\n"
(progn
(string-match
- (file-truename (file-name-as-directory
- (expand-file-name nnmh-directory))) dir)
+ (regexp-quote
+ (file-truename (file-name-as-directory
+ (expand-file-name nnmh-toplev)))) 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))
+ (apply 'max files)
+ (apply 'min files)))))))
t)
(deffoo nnmh-request-newgroups (date &optional server)
(condition-case ()
(funcall nnmail-delete-file-function article)
(file-error
+ (nnheader-message 1 "Couldn't delete article %s in %s"
+ article newsgroup)
(setq rest (cons (car articles) rest)))))
(setq rest (cons (car articles) rest))))
(setq articles (cdr articles)))
(setq result (eval accept-form))
(kill-buffer (current-buffer))
result)
- (condition-case ()
- (funcall nnmail-delete-file-function
- (concat nnmh-current-directory (int-to-string article)))
- (file-error nil)))
+ (progn
+ (nnmh-possibly-change-directory group server)
+ (condition-case ()
+ (funcall nnmail-delete-file-function
+ (concat nnmh-current-directory (int-to-string article)))
+ (file-error nil))))
result))
(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)
- ;; We trick the choosing function into believing that only one
- ;; group is available.
- (let ((nnmail-split-methods (list (list group ""))))
- (car (nnmh-save-mail noinsert))))
+ (car (nnmh-save-mail
+ (list (cons group (nnmh-active-number group)))
+ noinsert)))
(and
(nnmail-activate 'nnmh)
- (car (nnmh-save-mail noinsert)))))
+ (car (nnmh-save-mail (nnmail-article-group 'nnmh-active-number)
+ noinsert)))))
(deffoo nnmh-request-replace-article (article group buffer)
(nnmh-possibly-change-directory group)
(nnmh-possibly-create-directory group)
(condition-case ()
(progn
- (write-region (point-min) (point-max)
- (concat nnmh-current-directory (int-to-string article))
- nil (if (nnheader-be-verbose 5) nil 'nomesg))
+ (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))))
-(deffoo nnmh-request-create-group (group &optional server)
+(deffoo nnmh-request-create-group (group &optional server args)
(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 server)
- (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)))))))
+ (unless (assoc group nnmh-group-alist)
+ (let (active)
+ (push (list group (setq active (cons 1 0)))
+ nnmh-group-alist)
+ (nnmh-possibly-create-directory group)
+ (nnmh-possibly-change-directory group server)
+ (let ((articles (mapcar
+ (lambda (file)
+ (string-to-int file))
+ (directory-files
+ nnmh-current-directory nil "^[0-9]+$"))))
+ (when articles
+ (setcar active (apply 'min articles))
+ (setcdr active (apply 'max articles))))))
t)
(deffoo nnmh-request-delete-group (group &optional force server)
(deffoo nnmh-request-rename-group (group new-name &optional server)
(nnmh-possibly-change-directory group server)
- ;; 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)))
+ (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))
+ ;; 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)))
+ (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 nnmh-group-alist)))
+ (and entry (setcar entry new-name))
+ (setq nnmh-current-directory nil)
+ t))))
\f
;;; Internal functions.
(nnheader-message 5 "Creating mail directory %s" (car dirs))
(setq dirs (cdr dirs)))))
-(defun nnmh-save-mail (&optional noinsert)
+(defun nnmh-save-mail (group-art &optional noinsert)
"Called narrowed to an article."
- (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: ")
- (forward-line 1))
- ;; We save the article in all the newsgroups it belongs in.
- (let ((ga group-art)
- first)
- (while ga
- (nnmh-possibly-create-directory (caar ga))
- (let ((file (concat (nnmail-group-pathname
- (caar ga) nnmh-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.
- (write-region (point-min) (point-max) file nil nil)
- (setq first file)))
- (setq ga (cdr ga))))
- group-art))
+ (unless noinsert
+ (nnmail-insert-lines)
+ (nnmail-insert-xref group-art))
+ (run-hooks 'nnmail-prepare-save-mail-hook)
+ (run-hooks 'nnmh-prepare-save-mail-hook)
+ (goto-char (point-min))
+ (while (looking-at "From ")
+ (replace-match "X-From-Line: ")
+ (forward-line 1))
+ ;; We save the article in all the newsgroups it belongs in.
+ (let ((ga group-art)
+ first)
+ (while ga
+ (nnmh-possibly-create-directory (caar ga))
+ (let ((file (concat (nnmail-group-pathname
+ (caar ga) nnmh-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 nil)
+ (setq first file)))
+ (setq ga (cdr ga))))
+ group-art)
(defun nnmh-active-number (group)
"Compute the next article number in GROUP."
(let ((active (cadr (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))))
+ (unless active
+ ;; The group wasn't known to nnmh, so we just create an active
+ ;; entry for it.
+ (setq active (cons 1 0))
+ (push (list group active) nnmh-group-alist)
+ ;; 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]+$")
+ '>))))
+ (when files
+ (setcdr active (car files)))))
(setcdr active (1+ (cdr active)))
(while (file-exists-p
(concat (nnmail-group-pathname group nnmh-directory)
(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
+ ;; articles in this folder. The articles that are "new" will be
;; marked as unread by Gnus.
(let* ((dir nnmh-current-directory)
(files (sort (mapcar (function (lambda (name) (string-to-int name)))
(nnmh-file (concat dir ".nnmh-articles"))
new articles)
;; Load the .nnmh-articles file.
- (if (file-exists-p nnmh-file)
- (setq articles
- (let (nnmh-newsgroup-articles)
- (condition-case nil (load nnmh-file nil t t) (error nil))
- nnmh-newsgroup-articles)))
+ (when (file-exists-p nnmh-file)
+ (setq articles
+ (let (nnmh-newsgroup-articles)
+ (condition-case nil (load nnmh-file nil t t) (error nil))
+ nnmh-newsgroup-articles)))
;; Add all new articles to the `new' list.
(let ((art files))
(while art
- (if (not (assq (car art) articles)) (setq new (cons (car art) new)))
+ (unless (assq (car art) articles)
+ (setq new (cons (car art) new)))
(setq art (cdr art))))
;; Remove all deleted articles.
(let ((art articles))
(while art
- (if (not (memq (caar art) files))
- (setq articles (delq (car art) articles)))
- (setq art (cdr art))))
- ;; Check whether the highest-numbered articles really are the ones
- ;; that Gnus thinks they are by looking at the time-stamps.
- (let ((art articles))
- (while (and art
- (not (equal
- (nth 5 (file-attributes
- (concat dir (int-to-string (caar art)))))
- (cdar art))))
- (setq articles (delq (car art) articles))
- (setq new (cons (caar art) new))
+ (unless (memq (caar art) files)
+ (setq articles (delq (car art) articles)))
(setq art (cdr art))))
+ ;; Check whether the articles really are the ones that Gnus thinks
+ ;; they are by looking at the time-stamps.
+ (let ((arts articles)
+ art)
+ (while (setq art (pop arts))
+ (when (not (equal
+ (nth 5 (file-attributes
+ (concat dir (int-to-string (car art)))))
+ (cdr art)))
+ (setq articles (delq art articles))
+ (push (car art) new))))
;; Go through all the new articles and add them, and their
- ;; time-stamps to the list.
- (let ((n new))
- (while n
- (setq articles
- (cons (cons
- (car n)
- (nth 5 (file-attributes
- (concat dir (int-to-string (car n))))))
- articles))
- (setq n (cdr n))))
+ ;; time-stamps, to the list.
+ (setq articles
+ (nconc articles
+ (mapcar
+ (lambda (art)
+ (cons art
+ (nth 5 (file-attributes
+ (concat dir (int-to-string art))))))
+ new)))
;; Make Gnus mark all new articles as unread.
- (or (zerop (length new))
- (gnus-make-articles-unread
- (gnus-group-prefixed-name group (list 'nnmh ""))
- (setq new (sort new '<))))
+ (when new
+ (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.
- (save-excursion
- (set-buffer (get-buffer-create "*nnmh out*"))
+ (nnheader-temp-write nnmh-file
(insert ";; Gnus article active file for " group "\n\n")
(insert "(setq nnmh-newsgroup-articles '")
- (insert (prin1-to-string articles) ")\n")
- (write-region (point-min) (point-max) nnmh-file nil 'nomesg)
- (kill-buffer (current-buffer)))))
+ (gnus-prin1 articles)
+ (insert ")\n"))))
(defun nnmh-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
projects / gnus / blobdiff