X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnbabyl.el;h=e4dbed26874c6a474e48062e730060ac89b87ae8;hb=ee4a7be24fb6982b5baa5eafb65178ccaca6df50;hp=746f9db5d6102278218f882d0e7f8c17250750ee;hpb=1b405109c4a675fb9716bf6a671c39830d3a06f5;p=gnus diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index 746f9db5d..e4dbed268 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -1,8 +1,10 @@ -;;; nnbabyl.el --- mail mbox access for Gnus -;; Copyright (C) 1995 Free Software Foundation, Inc. +;;; nnbabyl.el --- rmail mbox access for Gnus -;; Author: Lars Ingebrigtsen -;; Masanobu UMEDA +;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001 +;; Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Masanobu UMEDA ;; Keywords: news, mail ;; This file is part of GNU Emacs. @@ -18,277 +20,361 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. ;;; Commentary: +;; For an overview of what the interface functions do, please see the +;; Gnus sources. + ;;; Code: (require 'nnheader) -(require 'rmail) +(condition-case nil + (require 'rmail) + (t (nnheader-message + 5 "Ignore rmail errors from this file, you don't have rmail"))) (require 'nnmail) +(require 'nnoo) +(eval-when-compile (require 'cl)) + +(nnoo-declare nnbabyl) + +(defvoo nnbabyl-mbox-file (expand-file-name "~/RMAIL") + "The name of the rmail box file in the users home directory.") + +(defvoo nnbabyl-active-file (expand-file-name "~/.rmail-active") + "The name of the active file for the rmail box.") -(defvar nnbabyl-mbox-file (expand-file-name "~/RMAIL") - "The name of the mail box file in the users home directory.") +(defvoo nnbabyl-get-new-mail t + "If non-nil, nnbabyl will check the incoming mail file and split the mail.") -(defvar nnbabyl-active-file (expand-file-name "~/.rmail-active") - "The name of the active file for the mail box.") -(defvar nnbabyl-get-new-mail t - "If non-nil, nnml will check the incoming mail file and split the mail.") +(defvoo nnbabyl-prepare-save-mail-hook nil + "Hook run narrowed to an article before saving.") (defvar nnbabyl-mail-delimiter "\^_") -(defconst nnbabyl-version "nnbabyl 0.1" +(defconst nnbabyl-version "nnbabyl 1.0" "nnbabyl version.") -(defvar nnbabyl-current-group nil - "Current nnbabyl news group directory.") +(defvoo nnbabyl-mbox-buffer nil) +(defvoo nnbabyl-current-group nil) +(defvoo nnbabyl-status-string "") +(defvoo nnbabyl-group-alist nil) +(defvoo nnbabyl-active-timestamp nil) -(defconst nnbabyl-mbox-buffer " *nnbabyl mbox buffer*") +(defvoo nnbabyl-previous-buffer-mode nil) -(defvar nnbabyl-status-string "") +(eval-and-compile + (autoload 'gnus-set-text-properties "gnus-ems")) -(defvar nnbabyl-group-alist nil) + ;;; Interface functions -(defun nnbabyl-retrieve-headers (sequence &optional newsgroup server) - "Retrieve the headers for the articles in SEQUENCE. -Newsgroup must be selected before calling this function." +(nnoo-define-basics nnbabyl) + +(deffoo nnbabyl-retrieve-headers (articles &optional group server fetch-old) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) - (let ((file nil) - (number (length sequence)) + (let ((number (length articles)) (count 0) - beg article art-string start stop) - (nnbabyl-possibly-change-newsgroup newsgroup) - (while sequence - (setq article (car sequence)) + (delim (concat "^" nnbabyl-mail-delimiter)) + article art-string start stop) + (nnbabyl-possibly-change-newsgroup group server) + (while (setq article (pop articles)) (setq art-string (nnbabyl-article-string article)) (set-buffer nnbabyl-mbox-buffer) - (if (or (search-forward art-string nil t) - (progn (goto-char 1) - (search-forward art-string nil t))) - (progn - (setq start - (save-excursion - (re-search-backward - (concat "^" nnbabyl-mail-delimiter) nil t) - (while (and (not (looking-at ".+:")) - (zerop (forward-line 1)))) - (point))) - (search-forward "\n\n" nil t) - (setq stop (1- (point))) - (set-buffer nntp-server-buffer) - (insert (format "221 %d Article retrieved.\n" article)) - (setq beg (point)) - (insert-buffer-substring nnbabyl-mbox-buffer start stop) - (goto-char (point-max)) - (insert ".\n"))) - (setq sequence (cdr sequence)) - (setq count (1+ count)) + (end-of-line) + (when (or (search-forward art-string nil t) + (search-backward art-string nil t)) + (unless (re-search-backward delim nil t) + (goto-char (point-min))) + (while (and (not (looking-at ".+:")) + (zerop (forward-line 1)))) + (setq start (point)) + (search-forward "\n\n" nil t) + (setq stop (1- (point))) + (set-buffer nntp-server-buffer) + (insert "221 ") + (princ article (current-buffer)) + (insert " Article retrieved.\n") + (insert-buffer-substring nnbabyl-mbox-buffer start stop) + (goto-char (point-max)) + (insert ".\n")) (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup) - (zerop (% count 20)) - gnus-verbose-backends - (message "nnbabyl: Receiving headers... %d%%" - (/ (* count 100) number)))) + (zerop (% (incf count) 20)) + (nnheader-message 5 "nnbabyl: Receiving headers... %d%%" + (/ (* count 100) number)))) (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup) - gnus-verbose-backends - (message "nnbabyl: Receiving headers... done")) + (nnheader-message 5 "nnbabyl: Receiving headers...done")) - ;; Fold continuation lines. - (goto-char 1) - (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) - (replace-match " " t t)) + (set-buffer nntp-server-buffer) + (nnheader-fold-continuation-lines) 'headers))) -(defun nnbabyl-open-server (host &optional service) - "Open mbox backend." - (setq nnbabyl-status-string "") - (setq nnbabyl-group-alist nil) - (nnheader-init-server-buffer)) - -(defun nnbabyl-close-server (&optional server) - "Close news server." - t) - -(defun nnbabyl-server-opened (&optional server) - "Return server process status, T or NIL. -If the stream is opened, return T, otherwise return NIL." - (and nntp-server-buffer - (get-buffer nntp-server-buffer))) - -(defun nnbabyl-status-message () - "Return server status response as string." - nnbabyl-status-string) - -(defun nnbabyl-request-article (article &optional newsgroup server buffer) - "Select ARTICLE by number." - (nnbabyl-possibly-change-newsgroup newsgroup) - (if (stringp article) - nil +(deffoo nnbabyl-open-server (server &optional defs) + (nnoo-change-server 'nnbabyl server defs) + (nnbabyl-create-mbox) + (cond + ((not (file-exists-p nnbabyl-mbox-file)) + (nnbabyl-close-server) + (nnheader-report 'nnbabyl "No such file: %s" nnbabyl-mbox-file)) + ((file-directory-p nnbabyl-mbox-file) + (nnbabyl-close-server) + (nnheader-report 'nnbabyl "Not a regular file: %s" nnbabyl-mbox-file)) + (t + (nnheader-report 'nnbabyl "Opened server %s using mbox %s" server + nnbabyl-mbox-file) + t))) + +(deffoo nnbabyl-close-server (&optional server) + ;; Restore buffer mode. + (when (and (nnbabyl-server-opened) + nnbabyl-previous-buffer-mode) (save-excursion (set-buffer nnbabyl-mbox-buffer) - (goto-char 1) - (if (search-forward (nnbabyl-article-string article) nil t) - (let (start stop) - (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) - (while (and (not (looking-at ".+:")) - (zerop (forward-line 1)))) - (setq start (point)) - (or (and (re-search-forward - (concat "^" nnbabyl-mail-delimiter) nil t) - (forward-line -1)) - (goto-char (point-max))) - (setq stop (point)) - (let ((nntp-server-buffer (or buffer nntp-server-buffer))) - (set-buffer nntp-server-buffer) - (erase-buffer) - (insert-buffer-substring nnbabyl-mbox-buffer start stop) - (goto-char (point-min)) - (if (search-forward "\n*** EOOH ***" nil t) - (progn - (delete-region (progn (beginning-of-line) (point)) - (or (search-forward "\n\n" nil t) - (point))))) - t)))))) - -(defun nnbabyl-request-group (group &optional server dont-check) - "Select news GROUP." + (narrow-to-region + (caar nnbabyl-previous-buffer-mode) + (cdar nnbabyl-previous-buffer-mode)) + (funcall (cdr nnbabyl-previous-buffer-mode)))) + (nnoo-close-server 'nnbabyl server) + (setq nnbabyl-mbox-buffer nil) + t) + +(deffoo nnbabyl-server-opened (&optional server) + (and (nnoo-current-server-p 'nnbabyl server) + nnbabyl-mbox-buffer + (buffer-name nnbabyl-mbox-buffer) + nntp-server-buffer + (buffer-name nntp-server-buffer))) + +(deffoo nnbabyl-request-article (article &optional newsgroup server buffer) + (nnbabyl-possibly-change-newsgroup newsgroup server) (save-excursion - (if (nnbabyl-possibly-change-newsgroup group) - (if dont-check - t - (nnbabyl-get-new-mail) - (save-excursion - (set-buffer nntp-server-buffer) - (erase-buffer) - (let ((active (assoc group nnbabyl-group-alist))) - (insert (format "211 %d %d %d %s\n" - (1+ (- (cdr (car (cdr active))) - (car (car (cdr active))))) - (car (car (cdr active))) - (cdr (car (cdr active))) - (car active)))) - t))))) - -(defun nnbabyl-close-group (group &optional server) + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-min)) + (when (search-forward (nnbabyl-article-string article) nil t) + (let (start stop summary-line) + (unless (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) + (goto-char (point-min)) + (end-of-line)) + (while (and (not (looking-at ".+:")) + (zerop (forward-line 1)))) + (setq start (point)) + (or (when (re-search-forward + (concat "^" nnbabyl-mail-delimiter) nil t) + (beginning-of-line) + t) + (goto-char (point-max))) + (setq stop (point)) + (let ((nntp-server-buffer (or buffer nntp-server-buffer))) + (set-buffer nntp-server-buffer) + (erase-buffer) + (insert-buffer-substring nnbabyl-mbox-buffer start stop) + (goto-char (point-min)) + ;; If there is an EOOH header, then we have to remove some + ;; duplicated headers. + (setq summary-line (looking-at "Summary-line:")) + (when (search-forward "\n*** EOOH ***" nil t) + (if summary-line + ;; The headers to be deleted are located before the + ;; EOOH line... + (delete-region (point-min) (progn (forward-line 1) + (point))) + ;; ...or after. + (delete-region (progn (beginning-of-line) (point)) + (or (search-forward "\n\n" nil t) + (point))))) + (if (numberp article) + (cons nnbabyl-current-group article) + (nnbabyl-article-group-number))))))) + +(deffoo nnbabyl-request-group (group &optional server dont-check) + (let ((active (cadr (assoc group nnbabyl-group-alist)))) + (save-excursion + (cond + ((or (null active) + (null (nnbabyl-possibly-change-newsgroup group server))) + (nnheader-report 'nnbabyl "No such group: %s" group)) + (dont-check + (nnheader-report 'nnbabyl "Selected group %s" group) + (nnheader-insert "")) + (t + (nnheader-report 'nnbabyl "Selected group %s" group) + (nnheader-insert "211 %d %d %d %s\n" + (1+ (- (cdr active) (car active))) + (car active) (cdr active) group)))))) + +(deffoo nnbabyl-request-scan (&optional group server) + (nnbabyl-possibly-change-newsgroup group server) + (nnbabyl-read-mbox) + (nnmail-get-new-mail + 'nnbabyl + (lambda () + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (save-buffer))) + (file-name-directory nnbabyl-mbox-file) + group + (lambda () + (save-excursion + (let ((in-buf (current-buffer))) + (goto-char (point-min)) + (while (search-forward "\n\^_\n" nil t) + (delete-char -1)) + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-max)) + (search-backward "\n\^_" nil t) + (goto-char (match-end 0)) + (insert-buffer-substring in-buf))) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)))) + +(deffoo nnbabyl-close-group (group &optional server) + t) + +(deffoo nnbabyl-request-create-group (group &optional server args) + (nnmail-activate 'nnbabyl) + (unless (assoc group nnbabyl-group-alist) + (push (list group (cons 1 0)) + nnbabyl-group-alist) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)) t) -(defun nnbabyl-request-list (&optional server) - "List active newsgoups." - (if server (nnbabyl-get-new-mail)) - (nnmail-find-file nnbabyl-active-file)) +(deffoo nnbabyl-request-list (&optional server) + (save-excursion + (nnmail-find-file nnbabyl-active-file) + (setq nnbabyl-group-alist (nnmail-get-active)) + t)) -(defun nnbabyl-request-newgroups (date &optional server) - "List groups created after DATE." +(deffoo nnbabyl-request-newgroups (date &optional server) (nnbabyl-request-list server)) -(defun nnbabyl-request-list-newsgroups (&optional server) - "List newsgroups (defined in NNTP2)." - (setq nnbabyl-status-string "nnbabyl: LIST NEWSGROUPS is not implemented.") - nil) - -(defun nnbabyl-request-post (&optional server) - "Post a new news in current buffer." - (mail-send-and-exit nil)) - -(fset 'nnbabyl-request-post-buffer 'nnmail-request-post-buffer) - -(defun nnbabyl-request-expire-articles (articles newsgroup &optional server force) - "Expire all articles in the ARTICLES list in group GROUP. -The list of unexpired articles will be returned (ie. all articles that -were too fresh to be expired). -If FORCE is non-nil, the ARTICLES will be deleted without looking at -the date." - (nnbabyl-possibly-change-newsgroup newsgroup) - (let* ((days (or (and nnmail-expiry-wait-function - (funcall nnmail-expiry-wait-function newsgroup)) - nnmail-expiry-wait)) - article rest) - (save-excursion +(deffoo nnbabyl-request-list-newsgroups (&optional server) + (nnheader-report 'nnbabyl "nnbabyl: LIST NEWSGROUPS is not implemented.")) + +(deffoo nnbabyl-request-expire-articles + (articles newsgroup &optional server force) + (nnbabyl-possibly-change-newsgroup newsgroup server) + (let* ((is-old t) + rest) + (nnmail-activate 'nnbabyl) + + (save-excursion (set-buffer nnbabyl-mbox-buffer) - (while articles - (goto-char 1) - (if (search-forward (nnbabyl-article-string (car articles)) nil t) - (if (or force - (> (nnmail-days-between - (current-time-string) - (buffer-substring - (point) (progn (end-of-line) (point)))) - days)) - (progn - (and gnus-verbose-backends - (message "Deleting: %s" (car articles))) - (nnbabyl-delete-mail)) - (setq rest (cons (car articles) rest)))) + (gnus-set-text-properties (point-min) (point-max) nil) + (while (and articles is-old) + (goto-char (point-min)) + (when (search-forward (nnbabyl-article-string (car articles)) nil t) + (if (setq is-old + (nnmail-expired-article-p + newsgroup + (buffer-substring + (point) (progn (end-of-line) (point))) force)) + (progn + (unless (eq nnmail-expiry-target 'delete) + (with-temp-buffer + (nnbabyl-request-article (car articles) + newsgroup server + (current-buffer)) + (let ((nnml-current-directory nil)) + (nnmail-expiry-target-group + nnmail-expiry-target newsgroup))) + (nnbabyl-possibly-change-newsgroup newsgroup server)) + (nnheader-message 5 "Deleting article %d in %s..." + (car articles) newsgroup) + (nnbabyl-delete-mail)) + (push (car articles) rest))) (setq articles (cdr articles))) (save-buffer) - rest))) - -(defun nnbabyl-request-move-article (article group server accept-form) - (nnbabyl-possibly-change-newsgroup group) + ;; Find the lowest active article in this group. + (let ((active (nth 1 (assoc newsgroup nnbabyl-group-alist)))) + (goto-char (point-min)) + (while (and (not (search-forward + (nnbabyl-article-string (car active)) nil t)) + (<= (car active) (cdr active))) + (setcar active (1+ (car active))) + (goto-char (point-min)))) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file) + (nconc rest articles)))) + +(deffoo nnbabyl-request-move-article + (article group server accept-form &optional last) (let ((buf (get-buffer-create " *nnbabyl move*")) result) - (and + (and (nnbabyl-request-article article group server) (save-excursion (set-buffer buf) (insert-buffer-substring nntp-server-buffer) (goto-char (point-min)) - (if (re-search-forward - "^X-Gnus-Newsgroup:" - (save-excursion (search-forward "\n\n" nil t) (point)) t) - (delete-region (progn (beginning-of-line) (point)) - (progn (forward-line 1) (point)))) + (while (re-search-forward + "^X-Gnus-Newsgroup:" + (save-excursion (search-forward "\n\n" nil t) (point)) t) + (delete-region (progn (beginning-of-line) (point)) + (progn (forward-line 1) (point)))) (setq result (eval accept-form)) (kill-buffer (current-buffer)) result) (save-excursion + (nnbabyl-possibly-change-newsgroup group server) (set-buffer nnbabyl-mbox-buffer) - (goto-char 1) + (goto-char (point-min)) (if (search-forward (nnbabyl-article-string article) nil t) (nnbabyl-delete-mail)) - (save-buffer))) + (and last (save-buffer)))) result)) -(defun nnbabyl-request-accept-article (group) +(deffoo nnbabyl-request-accept-article (group &optional server last) + (nnbabyl-possibly-change-newsgroup group server) + (nnmail-check-syntax) (let ((buf (current-buffer)) result beg) - (and - (setq nnbabyl-group-alist (nnmail-get-active)) + (and + (nnmail-activate 'nnbabyl) (save-excursion + (goto-char (point-min)) + (search-forward "\n\n" nil t) + (forward-line -1) + (save-excursion + (while (re-search-backward "^X-Gnus-Newsgroup: " beg t) + (delete-region (point) (progn (forward-line 1) (point))))) + (when nnmail-cache-accepted-message-ids + (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (setq result + (if (stringp group) + (list (cons group (nnbabyl-active-number group))) + (nnmail-article-group 'nnbabyl-active-number))) + (if (and (null result) + (yes-or-no-p "Moved to `junk' group; delete article? ")) + (setq result 'junk) + (setq result (car (nnbabyl-save-mail result)))) (set-buffer nnbabyl-mbox-buffer) - (setq beg (goto-char (point-max))) + (goto-char (point-max)) + (search-backward "\n\^_") + (goto-char (match-end 0)) (insert-buffer-substring buf) - (goto-char beg) - (if (stringp group) - (progn - (search-forward "\n\n" nil t) - (forward-line -1) - (save-excursion - (while (re-search-backward "^X-Gnus-Newsgroup: " beg t) - (delete-region (point) (progn (forward-line 1) (point))))) - (setq result (nnbabyl-insert-newsgroup-line group))) - (setq result (nnbabyl-save-mail))) - (save-buffer) - result) - (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)) - result)) - -(defun nnbabyl-request-replace-article (article group buffer) + (when last + (when nnmail-cache-accepted-message-ids + (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (save-buffer) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file)) + result)))) + +(deffoo nnbabyl-request-replace-article (article group buffer) (nnbabyl-possibly-change-newsgroup group) (save-excursion (set-buffer nnbabyl-mbox-buffer) - (goto-char 1) + (goto-char (point-min)) (if (not (search-forward (nnbabyl-article-string article) nil t)) nil (nnbabyl-delete-mail t t) @@ -296,160 +382,283 @@ the date." (save-buffer) t))) +(deffoo nnbabyl-request-delete-group (group &optional force server) + (nnbabyl-possibly-change-newsgroup group server) + ;; Delete all articles in GROUP. + (if (not force) + () ; Don't delete the articles. + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-min)) + ;; Delete all articles in this group. + (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":")) + found) + (while (search-forward ident nil t) + (setq found t) + (nnbabyl-delete-mail)) + (when found + (save-buffer))))) + ;; Remove the group from all structures. + (setq nnbabyl-group-alist + (delq (assoc group nnbabyl-group-alist) nnbabyl-group-alist) + nnbabyl-current-group nil) + ;; Save the active file. + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file) + t) + +(deffoo nnbabyl-request-rename-group (group new-name &optional server) + (nnbabyl-possibly-change-newsgroup group server) + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-min)) + (let ((ident (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":")) + (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":")) + found) + (while (search-forward ident nil t) + (replace-match new-ident t t) + (setq found t)) + (when found + (save-buffer)))) + (let ((entry (assoc group nnbabyl-group-alist))) + (and entry (setcar entry new-name)) + (setq nnbabyl-current-group nil) + ;; Save the new group alist. + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file) + t)) + -;;; Low-Level Interface +;;; Internal functions. +;; If FORCE, delete article no matter how many X-Gnus-Newsgroup +;; headers there are. If LEAVE-DELIM, don't delete the Unix mbox +;; delimiter line. (defun nnbabyl-delete-mail (&optional force leave-delim) - "If FORCE, delete article no matter how many X-Gnus-Newsgroup -headers there are. If LEAVE-DELIM, don't delete the Unix mbox -delimeter line." ;; Delete the current X-Gnus-Newsgroup line. - (or force - (delete-region - (progn (beginning-of-line) (point)) - (progn (forward-line 1) (point)))) + (unless force + (delete-region + (progn (beginning-of-line) (point)) + (progn (forward-line 1) (point)))) ;; Beginning of the article. (save-excursion (save-restriction + (widen) (narrow-to-region (save-excursion - (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) + (unless (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) + (goto-char (point-min)) + (end-of-line)) (if leave-delim (progn (forward-line 1) (point)) (match-beginning 0))) (progn (forward-line 1) - (or (and (re-search-forward (concat "^" nnbabyl-mail-delimiter) + (or (and (re-search-forward (concat "^" nnbabyl-mail-delimiter) nil t) - (if (and (not (bobp)) leave-delim) - (progn (forward-line -2) (point)) - (match-beginning 0))) + (match-beginning 0)) (point-max)))) (goto-char (point-min)) ;; Only delete the article if no other groups owns it as well. - (if (or force (not (re-search-forward "^X-Gnus-Newsgroup: " nil t))) - (delete-region (point-min) (point-max)))))) - -(defun nnbabyl-possibly-change-newsgroup (newsgroup) - (if (not (get-buffer nnbabyl-mbox-buffer)) - (save-excursion - (let ((buf (or (get-buffer (file-name-nondirectory nnbabyl-mbox-file)) - (create-file-buffer nnbabyl-mbox-file)))) - (set-buffer (setq nnbabyl-mbox-buffer buf)) - (insert-file-contents nnbabyl-mbox-file) - (setq buffer-file-name nnbabyl-mbox-file)) - (buffer-disable-undo (current-buffer)))) - (if (not nnbabyl-group-alist) - (setq nnbabyl-group-alist (nnmail-get-active))) + (when (or force (not (re-search-forward "^X-Gnus-Newsgroup: " nil t))) + (delete-region (point-min) (point-max)))))) + +(defun nnbabyl-possibly-change-newsgroup (newsgroup &optional server) + (when (and server + (not (nnbabyl-server-opened server))) + (nnbabyl-open-server server)) + (when (or (not nnbabyl-mbox-buffer) + (not (buffer-name nnbabyl-mbox-buffer))) + (save-excursion (nnbabyl-read-mbox))) + (unless nnbabyl-group-alist + (nnmail-activate 'nnbabyl)) (if newsgroup (if (assoc newsgroup nnbabyl-group-alist) - (setq nnbabyl-current-group newsgroup)))) + (setq nnbabyl-current-group newsgroup) + (nnheader-report 'nnbabyl "No such group in file")) + t)) (defun nnbabyl-article-string (article) - (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":" - (int-to-string article))) + (if (numberp article) + (concat "\nX-Gnus-Newsgroup: " nnbabyl-current-group ":" + (int-to-string article) " ") + (concat "\nMessage-ID: " article))) -(defun nnbabyl-save-mail () - "Called narrowed to an article." - (let ((group-art (nreverse (nnmail-article-group 'nnbabyl-active-number)))) - (nnmail-insert-lines) - (nnmail-insert-xref group-art) - (nnbabyl-insert-newsgroup-line group-art))) +(defun nnbabyl-article-group-number () + (save-excursion + (goto-char (point-min)) + (when (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) " + nil t) + (cons (buffer-substring (match-beginning 1) (match-end 1)) + (string-to-int + (buffer-substring (match-beginning 2) (match-end 2))))))) + +(defun nnbabyl-insert-lines () + "Insert how many lines and chars there are in the body of the mail." + (let (lines chars) + (save-excursion + (goto-char (point-min)) + (when (search-forward "\n\n" nil t) + ;; There may be an EOOH line here... + (when (looking-at "\\*\\*\\* EOOH \\*\\*\\*") + (search-forward "\n\n" nil t)) + (setq chars (- (point-max) (point)) + lines (max (- (count-lines (point) (point-max)) 1) 0)) + ;; Move back to the end of the headers. + (goto-char (point-min)) + (search-forward "\n\n" nil t) + (forward-char -1) + (save-excursion + (when (re-search-backward "^Lines: " nil t) + (delete-region (point) (progn (forward-line 1) (point))))) + (insert (format "Lines: %d\n" lines)) + chars)))) + +(defun nnbabyl-save-mail (group-art) + ;; Called narrowed to an article. + (nnbabyl-insert-lines) + (nnmail-insert-xref group-art) + (nnbabyl-insert-newsgroup-line group-art) + (run-hooks 'nnbabyl-prepare-save-mail-hook) + group-art) (defun nnbabyl-insert-newsgroup-line (group-art) (save-excursion (goto-char (point-min)) - (or (looking-at "\^_") - (insert "\^_\^L\n0, unseen,,\n*** EOOH ***\n")) (while (looking-at "From ") - (replace-match "Mail-from: ") + (replace-match "Mail-from: From " t t) (forward-line 1)) - (if (search-forward "\n\n" nil t) - (progn - (forward-char -1) - (while group-art - (insert (format "X-Gnus-Newsgroup: %s:%d %s\n" - (car (car group-art)) (cdr (car group-art)) - (current-time-string))) - (setq group-art (cdr group-art))))))) + ;; If there is a C-l at the beginning of the narrowed region, this + ;; isn't really a "save", but rather a "scan". + (goto-char (point-min)) + (unless (looking-at "\^L") + (save-excursion + (insert "\^L\n0, unseen,,\n*** EOOH ***\n") + (goto-char (point-max)) + (insert "\^_\n"))) + (when (search-forward "\n\n" nil t) + (forward-char -1) + (while group-art + (insert (format "X-Gnus-Newsgroup: %s:%d %s\n" + (caar group-art) (cdar group-art) + (current-time-string))) + (setq group-art (cdr group-art)))) + t)) (defun nnbabyl-active-number (group) - "Find the next article number in GROUP." - (let ((active (car (cdr (assoc group nnbabyl-group-alist))))) - (setcdr active (1+ (cdr active))) + ;; Find the next article number in GROUP. + (let ((active (cadr (assoc group nnbabyl-group-alist)))) + (if active + (setcdr active (1+ (cdr active))) + ;; This group is new, so we create a new entry for it. + ;; This might be a bit naughty... creating groups on the drop of + ;; a hat, but I don't know... + (push (list group (setq active (cons 1 1))) + nnbabyl-group-alist)) (cdr active))) +(defun nnbabyl-create-mbox () + (unless (file-exists-p nnbabyl-mbox-file) + ;; Create a new, empty RMAIL mbox file. + (save-excursion + (set-buffer (setq nnbabyl-mbox-buffer + (create-file-buffer nnbabyl-mbox-file))) + (setq buffer-file-name nnbabyl-mbox-file) + (insert "BABYL OPTIONS:\n\n\^_") + (nnmail-write-region + (point-min) (point-max) nnbabyl-mbox-file t 'nomesg)))) + (defun nnbabyl-read-mbox () - (nnbabyl-request-list) - (setq nnbabyl-group-alist (nnmail-get-active)) - (if (not (file-exists-p nnbabyl-mbox-file)) - (write-region 1 1 nnbabyl-mbox-file t 'nomesg)) - (if (and nnbabyl-mbox-buffer - (get-buffer nnbabyl-mbox-buffer) - (buffer-name nnbabyl-mbox-buffer) - (save-excursion - (set-buffer nnbabyl-mbox-buffer) - (= (buffer-size) (nth 7 (file-attributes nnbabyl-mbox-file))))) - () + (nnmail-activate 'nnbabyl) + (nnbabyl-create-mbox) + + (unless (and nnbabyl-mbox-buffer + (buffer-name nnbabyl-mbox-buffer) + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (= (buffer-size) (nnheader-file-size nnbabyl-mbox-file)))) + ;; This buffer has changed since we read it last. Possibly. (save-excursion (let ((delim (concat "^" nnbabyl-mail-delimiter)) - (buf (or (get-buffer (file-name-nondirectory nnbabyl-mbox-file)) - (create-file-buffer nnbabyl-mbox-file))) - start end) - (set-buffer (setq nnbabyl-mbox-buffer buf)) - (insert-file-contents nnbabyl-mbox-file) - (setq buffer-file-name nnbabyl-mbox-file) - - (buffer-disable-undo (current-buffer)) + (alist nnbabyl-group-alist) + start end number) + (set-buffer (setq nnbabyl-mbox-buffer + (nnheader-find-file-noselect + nnbabyl-mbox-file nil t))) + ;; Save previous buffer mode. + (setq nnbabyl-previous-buffer-mode + (cons (cons (point-min) (point-max)) + major-mode)) + + (buffer-disable-undo) + (widen) + (setq buffer-read-only nil) + (fundamental-mode) + + ;; Go through the group alist and compare against + ;; the rmail file. + (while alist + (goto-char (point-max)) + (when (and (re-search-backward + (format "^X-Gnus-Newsgroup: %s:\\([0-9]+\\) " + (caar alist)) + nil t) + (> (setq number + (string-to-number + (buffer-substring + (match-beginning 1) (match-end 1)))) + (cdadar alist))) + (setcdr (cadar alist) number)) + (setq alist (cdr alist))) + + ;; We go through the mbox and make sure that each and + ;; every mail belongs to some group or other. (goto-char (point-min)) + (if (looking-at "\^L") + (setq start (point)) + (re-search-forward delim nil t) + (setq start (match-end 0))) (while (re-search-forward delim nil t) - (setq start (match-beginning 0)) - (if (not (search-forward "\nX-Gnus-Newsgroup: " - (save-excursion - (setq end - (or - (and - (re-search-forward delim nil t) - (match-beginning 0)) - (point-max)))) - t)) - (goto-char end) - (save-excursion - (save-restriction - (goto-char start) - (narrow-to-region start end) - (nnbabyl-save-mail)))) - ))))) - -(defun nnbabyl-get-new-mail () - (let (incoming) - (nnbabyl-read-mbox) - (if (and nnmail-spool-file - (file-exists-p nnmail-spool-file) - (> (nth 7 (file-attributes nnmail-spool-file)) 0)) - (progn - (and gnus-verbose-backends - (message "nnbabyl: Reading incoming mail...")) - (setq incoming - (nnmail-move-inbox nnmail-spool-file - (concat nnbabyl-mbox-file "-Incoming"))) - (save-excursion - (let ((in-buf (nnmail-split-incoming - incoming 'nnbabyl-save-mail t))) - (set-buffer nnbabyl-mbox-buffer) - (goto-char (point-max)) - (search-backward "\n\^_" nil t) - (insert-buffer-substring in-buf) - (kill-buffer in-buf))) - (run-hooks 'nnmail-read-incoming-hook) - (and gnus-verbose-backends - (message "nnbabyl: Reading incoming mail...done")))) - (and (buffer-modified-p nnbabyl-mbox-buffer) - (save-excursion - (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file) - (set-buffer nnbabyl-mbox-buffer) - (save-buffer))) - ;; (if incoming (delete-file incoming)) - )) + (setq end (match-end 0)) + (unless (search-backward "\nX-Gnus-Newsgroup: " start t) + (goto-char end) + (save-excursion + (save-restriction + (narrow-to-region (goto-char start) end) + (nnbabyl-save-mail + (nnmail-article-group 'nnbabyl-active-number)) + (setq end (point-max))))) + (goto-char (setq start end))) + (when (buffer-modified-p (current-buffer)) + (save-buffer)) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))))) + +(defun nnbabyl-remove-incoming-delims () + (goto-char (point-min)) + (while (search-forward "\^_" nil t) + (replace-match "?" t t))) + +(defun nnbabyl-check-mbox () + "Go through the nnbabyl mbox and make sure that no article numbers are reused." + (interactive) + (let ((idents (make-vector 1000 0)) + id) + (save-excursion + (when (or (not nnbabyl-mbox-buffer) + (not (buffer-name nnbabyl-mbox-buffer))) + (nnbabyl-read-mbox)) + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-min)) + (while (re-search-forward "^X-Gnus-Newsgroup: \\([^ ]+\\) " nil t) + (if (intern-soft (setq id (match-string 1)) idents) + (progn + (delete-region (progn (beginning-of-line) (point)) + (progn (forward-line 1) (point))) + (nnheader-message 7 "Moving %s..." id) + (nnbabyl-save-mail + (nnmail-article-group 'nnbabyl-active-number))) + (intern id idents))) + (when (buffer-modified-p (current-buffer)) + (save-buffer)) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file) + (nnheader-message 5 "")))) (provide 'nnbabyl)