xemacs-beta: lisp/gnus/nnml.el comparison

comparison lisp/gnus/nnml.el @ 108:360340f9fd5f r20-1b6

Import from CVS: tag r20-1b6

author	cvs
date	Mon, 13 Aug 2007 09:18:39 +0200
parents	cf808b4c4290
children	48d667d6f17f

comparison

equal deleted inserted replaced

-:523141596bda
+:360340f9fd5f
 ;;; Commentary:
 ;; 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.
 ;;; Code:
 (require 'nnheader)
 (require 'nnmail)
 (nnoo-declare nnml)
 (defvoo nnml-directory message-directory
 "Mail spool directory.")
 (defvoo nnml-active-file
 (concat (file-name-as-directory nnml-directory) "active")
 "Mail active file.")
 (defvoo nnml-newsgroups-file
 (concat (file-name-as-directory nnml-directory) "newsgroups")
 "Mail newsgroups description file.")
 (defvoo nnml-get-new-mail t
 "If non-nil, nnml will check the incoming mail file and split the mail.")
 (nnoo-change-server 'nnml server defs)
 (when (not (file-exists-p nnml-directory))
 (condition-case ()
 	(make-directory nnml-directory t)
 (error)))
 (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)
 				 (nnmail-group-pathname
 				  (car group-num)
 				  nnml-directory))))))
 	  (setq path (concat gpath (int-to-string (cdr group-num)))))
 (setq path (nnml-article-to-file id)))
 (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)
 ;; We return the article number.
 (cons (if group-num (car group-num) group)
 	    (string-to-int (file-name-nondirectory path)))))))
 (deffoo nnml-request-group (group &optional server dont-check)
 (cond
 ((not (nnml-possibly-change-directory group server))
 (nnheader-report 'nnml "Invalid group (no such directory)"))
 ((not (file-exists-p nnml-current-directory))
 (nnheader-report 'nnml "Directory %s does not exist"
 		     nnml-current-directory))
 ((not (file-directory-p nnml-current-directory))
 (nnheader-report 'nnml "%s is not a directory" nnml-current-directory))
 (dont-check
 (nnheader-report 'nnml "Group %s selected" group)
 t)
 (t
 (nnheader-re-read-dir nnml-current-directory)
 (nnmail-activate 'nnml)
 (let ((active (nth 1 (assoc group nnml-group-alist))))
 (if (not active)
 	  (nnheader-report 'nnml "No such group: %s" group)
 	(nnheader-report 'nnml "Selected group %s" group)
 	(nnheader-insert "211 %d %d %d %s\n"
 			 (max (1+ (- (cdr active) (car active))) 0)
 			 (car active) (cdr active) group))))))
 (deffoo nnml-request-scan (&optional group server)
 (setq nnml-article-file-alist nil)
 (nnmail-find-file nnml-newsgroups-file)))
 (deffoo nnml-request-expire-articles (articles group
 					       &optional server force)
 (nnml-possibly-change-directory group server)
 (let* ((active-articles
 	  (nnheader-directory-articles nnml-current-directory))
 	 (is-old t)
 	 article rest mod-time number)
 (nnmail-activate 'nnml)
 (while (and articles is-old)
 (when (setq article (nnml-article-to-file (setq number (pop articles))))
 	(when (setq mod-time (nth 5 (file-attributes article)))
 	  (if (and (nnml-deletable-article-p group number)
 		   (setq is-old
 			 (nnmail-expired-article-p group mod-time force
 						   nnml-inhibit-expiry)))
 	      (progn
 		(nnheader-message 5 "Deleting article %s in %s"
 				  article group)
 			   (1+ (cdr active)))))
 (nnmail-save-active nnml-group-alist nnml-active-file))
 (nnml-save-nov)
 (nconc rest articles)))
 (deffoo nnml-request-move-article
 (article group server accept-form &optional last)
 (let ((buf (get-buffer-create " *nnml move*"))
 	result)
 (nnml-possibly-change-directory group server)
 (nnml-update-file-alist)
 (and
 (nnml-deletable-article-p group article)
 (nnml-request-article article group server)
 (save-excursion
 (set-buffer buf)
 (insert-buffer-substring nntp-server-buffer)
 (deffoo nnml-request-accept-article (group &optional server last)
 (nnml-possibly-change-directory group server)
 (nnmail-check-syntax)
 (let (result)
+(nnmail-cache-insert (nnmail-fetch-field "message-id"))
 (if (stringp group)
 	(and
 	 (nnmail-activate 'nnml)
 	 (setq result (car (nnml-save-mail
 			    (list (cons group (nnml-active-number group))))))
 	 (progn
 	   (nnmail-save-active nnml-group-alist nnml-active-file)
 	   (and last (nnml-save-nov))))
 (and
 (nnmail-activate 'nnml)
 (setq result (car (nnml-save-mail
 			  (nnmail-article-group 'nnml-active-number))))
-(progn
+(when last
 	 (nnmail-save-active nnml-group-alist nnml-active-file)
-	 (and last (nnml-save-nov)))))
+	 (nnmail-cache-close)
+	 (nnml-save-nov))))
 result))
 (deffoo nnml-request-replace-article (article group buffer)
 (nnml-possibly-change-directory group)
 (save-excursion
 (let ((chars (nnmail-insert-lines))
 	  (art (concat (int-to-string article) "\t"))
 	  headers)
 (when (condition-case ()
 		(progn
 		  (nnmail-write-region
 		   (point-min) (point-max)
 		   (or (nnml-article-to-file article)
 		       (concat nnml-current-directory
 			       (int-to-string article)))
 		   nil (if (nnheader-be-verbose 5) nil 'nomesg))
 		  t)
 	      (error nil))
 	(setq headers (nnml-parse-head chars article))
 	;; Replace the NOV line in the NOV file.
 	(save-excursion
 	  (set-buffer (nnml-open-nov group))
 	  (goto-char (point-min))
 	  (if (or (looking-at art)
 		  (search-forward (concat "\n" art) nil t))
 	      ;; Delete the old NOV line.
 			     (progn (forward-line 1) (point)))
 	    ;; The line isn't here, so we have to find out where
 	    ;; we should insert it.  (This situation should never
 	    ;; occur, but one likes to make sure...)
 	    (while (and (looking-at "[0-9]+\t")
 			(< (string-to-int
 			    (buffer-substring
 			     (match-beginning 0) (match-end 0)))
 			   article)
 			(zerop (forward-line 1)))))
 	  (beginning-of-line)
 	  (nnheader-insert-nov headers)
 (deffoo nnml-request-delete-group (group &optional force server)
 (nnml-possibly-change-directory group server)
 (when force
 ;; Delete all articles in GROUP.
 (let ((articles
 	   (directory-files
 	    nnml-current-directory t
 	    (concat nnheader-numerical-short-files
 		    "\\|" (regexp-quote nnml-nov-file-name) "$")))
 	  article)
 (while articles
 	(setq article (pop articles))
 	(when (file-writable-p article)
 	  (nnheader-message 5 "Deleting article %s in %s..." article group)
 	  (funcall nnmail-delete-file-function article))))
 ;; Try to delete the directory itself.
 (condition-case ()
 	(delete-directory nnml-current-directory)
 (error nil)))
 ;; Remove the group from all structures.
 (setq nnml-group-alist
 	(delq (assoc group nnml-group-alist) nnml-group-alist)
 	nnml-current-group nil
 	nnml-current-directory nil)
 ;; Save the active file.
 (nnmail-save-active nnml-group-alist nnml-active-file)
 ;; 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)))
 ;; Move .overview file.
 (let ((overview (concat old-dir nnml-nov-file-name)))
 (when (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)
 (save-excursion
 (set-buffer (get-buffer-create " *nnml id*"))
 (buffer-disable-undo (current-buffer))
 (let ((alist nnml-group-alist)
 	  number)
 ;; We want to look through all .overview files, but we want to
 ;; start with the one in the current directory.  It seems most
 ;; likely that the article we are looking for is in that group.
 (if (setq number (nnml-find-id nnml-current-group id))
 	  (cons nnml-current-group number)
 	;; It wasn't there, so we look through the other groups as well.
 	(while (and (not number)
 		    alist)
 (setq dir (file-name-directory (directory-file-name dir))))
 (while dirs
 (make-directory (directory-file-name (car dirs)))
 (nnheader-message 5 "Creating mail directory %s" (car dirs))
 (setq dirs (cdr dirs)))))
 (defun nnml-save-mail (group-art)
 "Called narrowed to an article."
 (let (chars headers)
 (setq chars (nnmail-insert-lines))
 (nnmail-insert-xref group-art)
 ;; We save the article in all the groups it belongs in.
 (let ((ga group-art)
 	  first)
 (while ga
 	(nnml-possibly-create-directory (caar ga))
 	(let ((file (concat (nnmail-group-pathname
 			     (caar ga) nnml-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
 				 (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
 ;; line after saving, because nov generation destroys the
 ;; header.
 (setq headers (nnml-parse-head chars))
 ;; Output the nov line to all nov databases that should have it.
 (let ((ga group-art))
 (while ga
 	(nnml-add-nov (caar ga) (cdar ga) headers)
 (defun nnml-active-number (group)
 "Compute the next article number in GROUP."
 (let ((active (cadr (assoc group nnml-group-alist))))
 ;; The group wasn't known to nnml, so we just create an active
 ;; entry for it.
 (unless active
 ;; Perhaps the active file was corrupt?  See whether
 ;; there are any articles in this group.
 (nnml-possibly-create-directory group)
 (nnml-possibly-change-directory group)
 (setcdr active (1+ (cdr active))))
 (cdr active)))
 (defun nnml-add-nov (group article headers)
 "Add a nov line for the GROUP base."
 (save-excursion
 (set-buffer (nnml-open-nov group))
 (goto-char (point-max))
 (mail-header-set-number headers article)
 (nnheader-insert-nov headers)))
 (defun nnml-parse-head (chars &optional number)
 "Parse the head of the current buffer."
 (save-excursion
 (save-restriction
 (goto-char (point-min))
 (narrow-to-region
 (point)
 (1- (or (search-forward "\n\n" nil t) (point-max))))
 ;; Fold continuation lines.
 (goto-char (point-min))
 (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
 	(mail-header-set-number headers number)
 	headers))))
 (defun nnml-open-nov (group)
 (or (cdr (assoc group nnml-nov-buffer-alist))
 (let ((buffer (nnheader-find-file-noselect
 		     (concat (nnmail-group-pathname group nnml-directory)
 			     nnml-nov-file-name))))
 	(save-excursion
 	  (set-buffer buffer)
 	  (buffer-disable-undo (current-buffer)))
 ;;;###autoload
 (defun nnml-generate-nov-databases ()
 "Generate nov databases in all nnml directories."
 (interactive)
 ;; Read the active file to make sure we don't re-use articles
 ;; numbers in empty groups.
 (nnmail-activate 'nnml)
 (nnml-open-server (or (nnoo-current-server 'nnml) ""))
 (setq nnml-directory (expand-file-name nnml-directory))
 ;; Recurse down the directories.
 	(nnml-generate-nov-file dir files)))))
 (defvar files)
 (defun nnml-generate-active-info (dir)
 ;; Update the active info for this group.
 (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
 		(cons (caar files)
 	(funcall nnmail-delete-file-function nov))
 (while files
 	(unless (file-directory-p (setq file (concat dir (cdar files))))
 	  (erase-buffer)
 	  (nnheader-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)))))

Mercurial > hg > xemacs-beta

comparison lisp/gnus/nnml.el @ 108:360340f9fd5f r20-1b6