X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnbabyl.el;h=2df307018ab77f88f26c85a38cad151f490af06f;hb=740e202473330b9de91f12a7924fb5e88512abb6;hp=c8ac0a841184f20b5444854487bc4387b27e7d06;hpb=2e45acda29daf81ad904ef14d262bec8123646e9;p=gnus diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index c8ac0a841..2df307018 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -48,13 +48,16 @@ (defvar nnbabyl-mail-delimiter "\^_") -(defconst nnbabyl-version "nnbabyl 0.1" +(defconst nnbabyl-version "nnbabyl 1.0" "nnbabyl version.") (defvar nnbabyl-mbox-buffer nil) (defvar nnbabyl-current-group nil) (defvar nnbabyl-status-string "") (defvar nnbabyl-group-alist nil) +(defvar nnbabyl-active-timestamp nil) + +(defvar nnbabyl-previous-buffer-mode nil) @@ -67,60 +70,59 @@ (list 'nnbabyl-get-new-mail nnbabyl-get-new-mail) '(nnbabyl-current-group nil) '(nnbabyl-status-string "") + '(nnbabyl-previous-buffer-mode nil) '(nnbabyl-group-alist nil))) ;;; Interface functions -(defun nnbabyl-retrieve-headers (sequence &optional newsgroup server) +(defun nnbabyl-retrieve-headers (sequence &optional newsgroup server fetch-old) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) - (let ((file nil) - (number (length sequence)) + (let ((number (length sequence)) (count 0) article art-string start stop) (nnbabyl-possibly-change-newsgroup newsgroup) - (if (stringp (car sequence)) - 'headers - (while sequence - (setq article (car sequence)) - (setq art-string (nnbabyl-article-string article)) - (set-buffer nnbabyl-mbox-buffer) - (if (or (search-forward art-string nil t) - (search-backward art-string nil t)) - (progn - (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) - (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 " (int-to-string article) " Article retrieved.\n") - (insert-buffer-substring nnbabyl-mbox-buffer start stop) - (goto-char (point-max)) - (insert ".\n"))) - (setq sequence (cdr sequence)) - (setq count (1+ count)) - (and (numberp nnmail-large-newsgroup) - (> number nnmail-large-newsgroup) - (zerop (% count 20)) - gnus-verbose-backends - (message "nnbabyl: Receiving headers... %d%%" - (/ (* count 100) number)))) - + (while sequence + (setq article (car sequence)) + (setq art-string (nnbabyl-article-string article)) + (set-buffer nnbabyl-mbox-buffer) + (if (or (search-forward art-string nil t) + (search-backward art-string nil t)) + (progn + (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) + (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 " (int-to-string article) " Article retrieved.\n") + (insert-buffer-substring nnbabyl-mbox-buffer start stop) + (goto-char (point-max)) + (insert ".\n"))) + (setq sequence (cdr sequence)) + (setq count (1+ count)) (and (numberp nnmail-large-newsgroup) (> number nnmail-large-newsgroup) + (zerop (% count 20)) gnus-verbose-backends - (message "nnbabyl: Receiving headers...done")) + (message "nnbabyl: Receiving headers... %d%%" + (/ (* count 100) number)))) - ;; Fold continuation lines. - (goto-char (point-min)) - (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) - (replace-match " " t t)) - 'headers)))) + (and (numberp nnmail-large-newsgroup) + (> number nnmail-large-newsgroup) + gnus-verbose-backends + (message "nnbabyl: Receiving headers...done")) + + ;; Fold continuation lines. + (set-buffer nntp-server-buffer) + (goto-char (point-min)) + (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) + (replace-match " " t t)) + 'headers))) (defun nnbabyl-open-server (server &optional defs) (nnheader-init-server-buffer) @@ -140,10 +142,23 @@ (setq nnbabyl-current-server server))) (defun nnbabyl-close-server (&optional server) + ;; Restore buffer mode. + (when (and (nnbabyl-server-opened) + nnbabyl-previous-buffer-mode) + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (narrow-to-region + (car (car nnbabyl-previous-buffer-mode)) + (cdr (car nnbabyl-previous-buffer-mode))) + (funcall (cdr nnbabyl-previous-buffer-mode)))) + (setq nnbabyl-current-server nil + nnbabyl-mbox-buffer nil) t) (defun nnbabyl-server-opened (&optional server) (and (equal server nnbabyl-current-server) + nnbabyl-mbox-buffer + (buffer-name nnbabyl-mbox-buffer) nntp-server-buffer (buffer-name nntp-server-buffer))) @@ -152,40 +167,47 @@ (defun nnbabyl-request-article (article &optional newsgroup server buffer) (nnbabyl-possibly-change-newsgroup newsgroup) - (if (stringp article) - nil - (save-excursion - (set-buffer nnbabyl-mbox-buffer) - (goto-char (point-min)) - (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)))))) + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (goto-char (point-min)) + (if (search-forward (nnbabyl-article-string article) nil t) + (let (start stop summary-line) + (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 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))))))) (defun nnbabyl-request-group (group &optional server dont-check) (save-excursion (if (nnbabyl-possibly-change-newsgroup group) (if dont-check t - (nnbabyl-get-new-mail group) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) @@ -198,11 +220,40 @@ (car active)))) t))))) +(defun nnbabyl-request-scan (&optional group server) + (nnbabyl-read-mbox) + (nnmail-get-new-mail + 'nnbabyl + (lambda () + (save-excursion + (set-buffer nnbabyl-mbox-buffer) + (save-buffer))) + 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)))))) + (defun nnbabyl-close-group (group &optional server) t) +(defun nnbabyl-request-create-group (group &optional server) + (nnmail-activate 'nnbabyl) + (or (assoc group nnbabyl-group-alist) + (let (active) + (setq nnbabyl-group-alist (cons (list group (setq active (cons 1 0))) + nnbabyl-group-alist)) + (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))) + t) + (defun nnbabyl-request-list (&optional server) - (if server (nnbabyl-get-new-mail)) (save-excursion (or (nnmail-find-file nnbabyl-active-file) (progn @@ -220,28 +271,33 @@ (defun nnbabyl-request-post (&optional server) (mail-send-and-exit nil)) -(defalias 'nnbabyl-request-post-buffer 'nnmail-request-post-buffer) - -(defun nnbabyl-request-expire-articles (articles newsgroup &optional server force) +(defun nnbabyl-request-expire-articles + (articles newsgroup &optional server force) (nnbabyl-possibly-change-newsgroup newsgroup) (let* ((days (or (and nnmail-expiry-wait-function (funcall nnmail-expiry-wait-function newsgroup)) nnmail-expiry-wait)) - article rest) + (is-old t) + rest) + (nnmail-activate 'nnbabyl) + (save-excursion (set-buffer nnbabyl-mbox-buffer) - (while articles + (set-text-properties (point-min) (point-max) nil) + (while (and articles is-old) (goto-char (point-min)) (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)) + (setq is-old + (> (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))) + (message "Deleting article %d in %s..." + (car articles) newsgroup)) (nnbabyl-delete-mail)) (setq rest (cons (car articles) rest)))) (setq articles (cdr articles))) @@ -249,12 +305,13 @@ ;; Find the lowest active article in this group. (let ((active (nth 1 (assoc newsgroup nnbabyl-group-alist)))) (goto-char (point-min)) - (while (not (search-forward - (nnbabyl-article-string (car active)) nil t)) + (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) - rest))) + (nconc rest articles)))) (defun nnbabyl-request-move-article (article group server accept-form &optional last) @@ -287,8 +344,7 @@ (let ((buf (current-buffer)) result beg) (and - (nnbabyl-request-list) - (setq nnbabyl-group-alist (nnmail-get-active)) + (nnmail-activate 'nnbabyl) (save-excursion (goto-char (point-min)) (search-forward "\n\n" nil t) @@ -304,7 +360,7 @@ (goto-char (point-max)) (search-backward "\n\^_") (goto-char (match-end 0)) - (insert-buffer buf) + (insert-buffer-substring buf) (and last (progn (save-buffer) (nnmail-save-active @@ -323,8 +379,50 @@ (save-buffer) t))) +(defun nnbabyl-request-delete-group (group &optional force server) + (nnbabyl-possibly-change-newsgroup group) + ;; 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)) + (and 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) + +(defun nnbabyl-request-rename-group (group new-name &optional server) + (nnbabyl-possibly-change-newsgroup group) + (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)) + (and 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 @@ -338,6 +436,7 @@ ;; Beginning of the article. (save-excursion (save-restriction + (widen) (narrow-to-region (save-excursion (re-search-backward (concat "^" nnbabyl-mail-delimiter) nil t) @@ -361,9 +460,7 @@ (not (buffer-name nnbabyl-mbox-buffer))) (save-excursion (nnbabyl-read-mbox))) (or nnbabyl-group-alist - (progn - (nnbabyl-request-list) - (setq nnbabyl-group-alist (nnmail-get-active)))) + (nnmail-activate 'nnbabyl)) (if newsgroup (if (assoc newsgroup nnbabyl-group-alist) (setq nnbabyl-current-group newsgroup) @@ -371,8 +468,19 @@ nil))) (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-article-group-number () + (save-excursion + (goto-char (point-min)) + (and (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." @@ -408,11 +516,11 @@ (defun nnbabyl-insert-newsgroup-line (group-art) (save-excursion (goto-char (point-min)) - ;; If there is a C-l at the beginning of the narrowed region, this - ;; isn't really a "save", but rather a "scan". (while (looking-at "From ") (replace-match "Mail-from: From " t t) (forward-line 1)) + ;; 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)) (or (looking-at "\^L") (save-excursion @@ -432,12 +540,17 @@ (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))) + (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... + (setq nnbabyl-group-alist (cons (list group (setq active (cons 1 1))) + nnbabyl-group-alist))) (cdr active))) (defun nnbabyl-read-mbox () - (nnbabyl-request-list) - (setq nnbabyl-group-alist (nnmail-get-active)) + (nnmail-activate 'nnbabyl) (or (file-exists-p nnbabyl-mbox-file) (save-excursion (set-buffer (setq nnbabyl-mbox-buffer @@ -445,8 +558,8 @@ (setq buffer-file-name nnbabyl-mbox-file) (insert "BABYL OPTIONS:\n\n\^_") (write-region (point-min) (point-max) 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) @@ -454,85 +567,42 @@ () (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)) - (buffer-disable-undo (current-buffer)) - - (insert-file-contents nnbabyl-mbox-file) - (setq buffer-file-name nnbabyl-mbox-file) - (set-buffer-modified-p nil) + (set-buffer (setq nnbabyl-mbox-buffer + (nnheader-find-file-noselect + nnbabyl-mbox-file nil 'raw))) + ;; Save buffer mode. + (setq nnbabyl-previous-buffer-mode + (cons (cons (point-min) (point-max)) + major-mode)) + (buffer-disable-undo (current-buffer)) + (widen) + (setq buffer-read-only nil) + (fundamental-mode) + (goto-char (point-min)) + (re-search-forward delim nil t) + (setq start (match-end 0)) (while (re-search-forward delim nil t) - (setq start (match-beginning 0)) - (if (and - (save-excursion (re-search-forward delim nil t)) - (not (search-forward - "\nX-Gnus-Newsgroup: " - (save-excursion - (setq end (or (and (re-search-forward delim nil t) - (match-beginning 0)) - (point-max)))) t))) + (setq end (match-end 0)) + (or (search-backward "\nX-Gnus-Newsgroup: " start t) (progn (goto-char end) (save-excursion (save-restriction (goto-char start) - (narrow-to-region (1+ start) end) - (nnbabyl-save-mail)))))) + (narrow-to-region start end) + (nnbabyl-save-mail) + (setq end (point-max)))))) + (goto-char (setq start end))) (and (buffer-modified-p (current-buffer)) (save-buffer)) (nnmail-save-active nnbabyl-group-alist nnbabyl-active-file))))) -(defun nnbabyl-get-new-mail (&optional group) - "Read new incoming mail." - (let ((spools (nnmail-get-spool-files group)) - incoming incomings) - (nnbabyl-read-mbox) - (if (or (not nnbabyl-get-new-mail) (not nnmail-spool-file)) - () - ;; We go through all the existing spool files and split the - ;; mail from each. - (while spools - (and - (file-exists-p (car spools)) - (> (nth 7 (file-attributes (car spools))) 0) - (progn - (and gnus-verbose-backends - (message "nnbabyl: Reading incoming mail...")) - (setq incoming - (nnmail-move-inbox - (car spools) (concat nnbabyl-mbox-file "-Incoming"))) - (setq incomings (cons incoming incomings)) - (save-excursion - (let ((in-buf (nnmail-split-incoming - incoming 'nnbabyl-save-mail t group))) - (set-buffer in-buf) - (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) - (kill-buffer in-buf))))) - (setq spools (cdr spools))) - ;; If we did indeed read any incoming spools, we save all info. - (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))) - (while incomings - ;; The following has been commented away, just to make sure - ;; that nobody ever loses any mail. If you feel safe that - ;; nnfolder will never do anything strange, just remove those - ;; two semicolons, and avoid having lots of "Incoming*" - ;; files. - ;; (and (file-writable-p incoming) (delete-file incoming)) - (setq incomings (cdr incomings)))))) +(defun nnbabyl-remove-incoming-delims () + (goto-char (point-min)) + (while (search-forward "\^_" nil t) + (replace-match "?" t t))) (provide 'nnbabyl)