X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnmh.el;h=d3f164ab2016b790ada4668319467c12306e8312;hb=e0e6809cf4f77f526bfe697a1c042d32423f1fa5;hp=dfe6833e47ea90ba40053a73067c7d11fe2bd68e;hpb=5512f5d5e241d7780d96c43ac2a21a52744171ba;p=gnus diff --git a/lisp/nnmh.el b/lisp/nnmh.el index dfe6833e4..d3f164ab2 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -1,7 +1,9 @@ ;;; nnmh.el --- mhspool access for Gnus -;; Copyright (C) 1995,96 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 +;; Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA ;; Keywords: news, mail @@ -26,7 +28,7 @@ ;; Based on nnspool.el by Masanobu UMEDA . ;; For an overview of what the interface functions do, please see the -;; Gnus sources. +;; Gnus sources. ;;; Code: @@ -34,21 +36,24 @@ (require 'nnmail) (require 'gnus-start) (require 'nnoo) -(require 'cl) +(eval-when-compile (require 'cl)) (nnoo-declare nnmh) (defvoo nnmh-directory message-directory - "*Mail spool directory.") + "Mail spool directory.") (defvoo 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.") (defvoo nnmh-prepare-save-mail-hook nil - "*Hook run narrowed to an article before saving.") + "Hook run narrowed to an article before saving.") (defvoo nnmh-be-safe nil - "*If non-nil, nnmh will check all articles to make sure whether they are new or not.") + "If non-nil, nnmh will check all articles to make sure whether they are new or not. +Go through the .nnmh-articles file and compare with the actual +articles in this folder. The articles that are \"new\" will be marked +as unread by Gnus.") @@ -60,6 +65,10 @@ (defvoo nnmh-status-string "") (defvoo nnmh-group-alist nil) +;; Don't even think about setting this variable. It does not exist. +;; Forget about it. Uh-huh. Nope. Nobody here. It's only bound +;; dynamically by certain functions in nndraft. +(defvar nnmh-allow-delete-final nil) @@ -76,14 +85,15 @@ (large (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup))) (count 0) + (file-name-coding-system nnmail-pathname-coding-system) 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)))))) @@ -102,11 +112,11 @@ (and large (zerop (% count 20)) - (message "nnmh: Receiving headers... %d%%" - (/ (* count 100) number)))) + (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)))) @@ -117,7 +127,7 @@ (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)) @@ -134,6 +144,7 @@ (let ((file (if (stringp id) nil (concat nnmh-current-directory (int-to-string id)))) + (file-name-coding-system nnmail-pathname-coding-system) (nntp-server-buffer (or buffer nntp-server-buffer))) (and (stringp file) (file-exists-p file) @@ -142,15 +153,18 @@ (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)) + (file-name-coding-system nnmail-pathname-coding-system) 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 @@ -160,29 +174,34 @@ (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 - (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)))))))))) + (cond + (dir + (setq nnmh-group-alist + (delq (assoc group nnmh-group-alist) nnmh-group-alist)) + (push (list group (cons (car dir) (car (last dir)))) + nnmh-group-alist) + (nnheader-report 'nnmh "Selected group %s" group) + (nnheader-insert + "211 %d %d %d %s\n" (length dir) (car dir) + (car (last dir)) group)) + (t + (nnheader-report 'nnmh "Empty group %s" group) + (nnheader-insert (format "211 0 1 0 %s\n" group)))))))))) (deffoo nnmh-request-scan (&optional group server) (nnmail-get-new-mail 'nnmh nil nnmh-directory group)) (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 ((file-name-coding-system nnmail-pathname-coding-system) + (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) @@ -193,14 +212,15 @@ ;; 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 @@ -210,17 +230,21 @@ (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)) ?/ ?.)) + (mm-string-as-multibyte + (mm-encode-coding-string + (nnheader-replace-chars-in-string + (substring dir (match-end 0)) + ?/ ?.) + nnmail-pathname-coding-system))) (apply 'max files) (apply 'min files))))))) t) @@ -228,27 +252,29 @@ (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..." + ;; Allow a special target group. -- jcn + (unless (eq nnmail-expiry-target 'delete) + (with-temp-buffer + (nnmh-request-article (car articles) + newsgroup server (current-buffer)) + (nnmail-expiry-target-group + nnmail-expiry-target newsgroup))) + (nnheader-message 5 "Deleting article %s in %s..." article newsgroup) (condition-case () (funcall nnmail-delete-file-function article) @@ -258,21 +284,22 @@ (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 - (article group server accept-form &optional last) +(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)) @@ -288,33 +315,38 @@ (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))) @@ -324,7 +356,7 @@ (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)) @@ -337,18 +369,17 @@ (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) @@ -357,24 +388,21 @@ (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 @@ -388,14 +416,15 @@ ;;; 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)) + (file-name-coding-system nnmail-pathname-coding-system)) (if (file-directory-p pathname) (setq nnmh-current-directory pathname) - (error "No such newsgroup: %s" newsgroup))))) + (nnheader-report 'nnmh "Not a directory: %s" nnmh-directory))))) (defun nnmh-possibly-create-directory (group) (let (dir dirs) @@ -408,7 +437,7 @@ (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 @@ -425,7 +454,7 @@ 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 @@ -439,27 +468,36 @@ (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)) + (file-name-coding-system nnmail-pathname-coding-system) + file) (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))) - (while (file-exists-p - (concat (nnmail-group-pathname group nnmh-directory) - (int-to-string (cdr active)))) + (while (or + ;; See whether the file exists... + (file-exists-p + (setq file (concat (nnmail-group-pathname group nnmh-directory) + (int-to-string (cdr active))))) + ;; ... or there is a buffer that will make that file exist + ;; in the future. + (get-file-buffer file)) + ;; Skip past that file. (setcdr active (1+ (cdr active)))) (cdr active))) @@ -469,16 +507,16 @@ ;; 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)) @@ -498,7 +536,7 @@ 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)) @@ -515,14 +553,14 @@ 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) @@ -531,10 +569,14 @@ (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)