X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnsoup.el;h=e64b93a7d42cfb68daf4c5262a4984e99c452fb5;hp=d2a5c14aca17a99f86910c47e94879d77ed6d6ca;hb=915c1bceb6e7e1ea69eac0485892763825b2c57c;hpb=d2869f5985c767d07a5bbb2dbfd01806cc9b846f diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el index d2a5c14ac..e64b93a7d 100644 --- a/lisp/nnsoup.el +++ b/lisp/nnsoup.el @@ -1,8 +1,10 @@ ;;; nnsoup.el --- SOUP access for Gnus -;; Copyright (C) 1995,96,97 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen -;; Masanobu UMEDA +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen +;; Masanobu UMEDA ;; Keywords: news, mail ;; This file is part of GNU Emacs. @@ -19,8 +21,8 @@ ;; 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, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -38,19 +40,22 @@ (defvoo nnsoup-directory "~/SOUP/" "*SOUP packet directory.") -(defvoo nnsoup-tmp-directory "/tmp/" +(defvoo nnsoup-tmp-directory + (cond ((fboundp 'temp-directory) (temp-directory)) + ((boundp 'temporary-file-directory) temporary-file-directory) + ("/tmp/")) "*Where nnsoup will store temporary files.") -(defvoo nnsoup-replies-directory (concat nnsoup-directory "replies/") +(defvoo nnsoup-replies-directory (expand-file-name "replies/" nnsoup-directory) "*Directory where outgoing packets will be composed.") -(defvoo nnsoup-replies-format-type ?n +(defvoo nnsoup-replies-format-type ?u ;; u is USENET news format. "*Format of the replies packages.") (defvoo nnsoup-replies-index-type ?n "*Index type of the replies packages.") -(defvoo nnsoup-active-file (concat nnsoup-directory "active") +(defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory) "Active file.") (defvoo nnsoup-packer "tar cf - %s | gzip > $HOME/Soupin%d.tgz" @@ -69,6 +74,11 @@ The SOUP packet file name will be inserted at the %s.") (defvoo nnsoup-packet-regexp "Soupout" "*Regular expression matching SOUP packets in `nnsoup-packet-directory'.") +(defvoo nnsoup-always-save t + "If non nil commit the reply buffer on each message send. +This is necessary if using message mode outside Gnus with nnsoup as a +backend for the messages.") + (defconst nnsoup-version "nnsoup 0.0" @@ -82,7 +92,6 @@ The SOUP packet file name will be inserted at the %s.") (defvoo nnsoup-current-group nil) (defvoo nnsoup-group-alist-touched nil) (defvoo nnsoup-article-alist nil) - ;;; Interface functions. @@ -105,7 +114,7 @@ The SOUP packet file name will be inserted at the %s.") ;; articles in SEQUENCE come from. (while (and areas sequence) ;; Peel off areas that are below sequence. - (while (and areas (< (cdaar areas) (car sequence))) + (while (and areas (< (cdar (car areas)) (car sequence))) (setq areas (cdr areas))) (when areas ;; This is a useful area. @@ -113,7 +122,7 @@ The SOUP packet file name will be inserted at the %s.") (setq this-area-seq nil) ;; We take note whether this MSG has a corresponding IDX ;; for later use. - (when (or (= (gnus-soup-encoding-index + (when (or (= (gnus-soup-encoding-index (gnus-soup-area-encoding (nth 1 (car areas)))) ?n) (not (file-exists-p (nnsoup-file @@ -121,14 +130,14 @@ The SOUP packet file name will be inserted at the %s.") (setq use-nov nil)) ;; We assign the portion of `sequence' that is relevant to ;; this MSG packet to this packet. - (while (and sequence (<= (car sequence) (cdaar areas))) + (while (and sequence (<= (car sequence) (cdar (car areas)))) (push (car sequence) this-area-seq) (setq sequence (cdr sequence))) (setcar useful-areas (cons (nreverse this-area-seq) (car useful-areas))))) ;; We now have a list of article numbers and corresponding - ;; areas. + ;; areas. (setq useful-areas (nreverse useful-areas)) ;; Two different approaches depending on whether all the MSG @@ -149,7 +158,7 @@ The SOUP packet file name will be inserted at the %s.") (when index-buffer (insert-buffer-substring index-buffer) (goto-char b) - ;; We have to remove the index number entires and + ;; We have to remove the index number entries and ;; insert article numbers instead. (while (looking-at "[0-9]+") (replace-match (int-to-string number) t t) @@ -163,7 +172,7 @@ The SOUP packet file name will be inserted at the %s.") useful-areas (cdr useful-areas)) (while articles (when (setq msg-buf - (nnsoup-narrow-to-article + (nnsoup-narrow-to-article (car articles) (cdar useful-areas) 'head)) (goto-char (point-max)) (insert (format "221 %d Article retrieved.\n" (car articles))) @@ -181,7 +190,7 @@ The SOUP packet file name will be inserted at the %s.") (condition-case () (make-directory nnsoup-directory t) (error t))) - (cond + (cond ((not (file-exists-p nnsoup-directory)) (nnsoup-close-server) (nnheader-report 'nnsoup "Couldn't create directory: %s" nnsoup-directory)) @@ -225,25 +234,25 @@ The SOUP packet file name will be inserted at the %s.") (deffoo nnsoup-request-group (group &optional server dont-check) (nnsoup-possibly-change-group group) - (if dont-check + (if dont-check t (let ((active (cadr (assoc group nnsoup-group-alist)))) (if (not active) (nnheader-report 'nnsoup "No such group: %s" group) - (nnheader-insert - "211 %d %d %d %s\n" + (nnheader-insert + "211 %d %d %d %s\n" (max (1+ (- (cdr active) (car active))) 0) (car active) (cdr active) group))))) (deffoo nnsoup-request-type (group &optional article) (nnsoup-possibly-change-group group) - ;; Try to guess the type based on the first articl ein the group. + ;; Try to guess the type based on the first article in the group. (when (not article) (setq article - (cdaar (cddr (assoc group nnsoup-group-alist))))) + (cdar (car (cddr (assoc group nnsoup-group-alist)))))) (if (not article) 'unknown - (let ((kind (gnus-soup-encoding-kind + (let ((kind (gnus-soup-encoding-kind (gnus-soup-area-encoding (nth 1 (nnsoup-article-to-area article nnsoup-current-group)))))) @@ -306,29 +315,29 @@ The SOUP packet file name will be inserted at the %s.") (setq info (pop infolist) range-list (gnus-uncompress-range (car info)) prefix (gnus-soup-area-prefix (nth 1 info))) - (when ;; All the articles in this file are marked for expiry. + (when;; All the articles in this file are marked for expiry. (and (or (setq mod-time (nth 5 (file-attributes (nnsoup-file prefix)))) (setq mod-time (nth 5 (file-attributes (nnsoup-file prefix t))))) (gnus-sublist-p articles range-list) - ;; This file is old enough. + ;; This file is old enough. (nnmail-expired-article-p group mod-time force)) ;; Ok, we delete this file. (when (ignore-errors - (nnheader-message + (nnheader-message 5 "Deleting %s in group %s..." (nnsoup-file prefix) group) (when (file-exists-p (nnsoup-file prefix)) (delete-file (nnsoup-file prefix))) - (nnheader-message + (nnheader-message 5 "Deleting %s in group %s..." (nnsoup-file prefix t) group) (when (file-exists-p (nnsoup-file prefix t)) (delete-file (nnsoup-file prefix t))) t) (setcdr (cdr total-infolist) (delq info (cddr total-infolist))) - (setq articles (gnus-sorted-complement articles range-list)))) + (setq articles (gnus-sorted-difference articles range-list)))) (when (not mod-time) (setcdr (cdr total-infolist) (delq info (cddr total-infolist))))) (if (cddr total-infolist) @@ -360,19 +369,17 @@ The SOUP packet file name will be inserted at the %s.") entry e min max) (while (setq e (cdr (setq entry (pop alist)))) (setq min (caaar e)) - (while (cdr e) - (setq e (cdr e))) - (setq max (cdaar e)) + (setq max (cdar (car (last e)))) (setcdr entry (cons (cons min max) (cdr entry))))) (setq nnsoup-group-alist-touched t)) nnsoup-group-alist)) (defun nnsoup-write-active-file (&optional force) (when (and nnsoup-group-alist - (or force + (or force nnsoup-group-alist-touched)) (setq nnsoup-group-alist-touched nil) - (nnheader-temp-write nnsoup-active-file + (with-temp-file nnsoup-active-file (gnus-prin1 `(setq nnsoup-group-alist ',nnsoup-group-alist)) (insert "\n") (gnus-prin1 `(setq nnsoup-current-prefix ,nnsoup-current-prefix)) @@ -381,7 +388,7 @@ The SOUP packet file name will be inserted at the %s.") (defun nnsoup-next-prefix () "Return the next free prefix." (let (prefix) - (while (or (file-exists-p + (while (or (file-exists-p (nnsoup-file (setq prefix (int-to-string nnsoup-current-prefix)))) (file-exists-p (nnsoup-file prefix t))) @@ -390,7 +397,7 @@ The SOUP packet file name will be inserted at the %s.") prefix)) (defun nnsoup-file-name (dir file) - "Return the full path of FILE (in any case) in DIR." + "Return the full name of FILE (in any case) in DIR." (let* ((case-fold-search t) (files (directory-files dir t)) (regexp (concat (regexp-quote file) "$"))) @@ -413,14 +420,17 @@ The SOUP packet file name will be inserted at the %s.") (while (setq area (pop areas)) ;; Change the name to the permanent name and move the files. (setq cur-prefix (nnsoup-next-prefix)) - (message "Incorporating file %s..." cur-prefix) - (when (file-exists-p - (setq file (concat nnsoup-tmp-directory - (gnus-soup-area-prefix area) ".IDX"))) + (nnheader-message 5 "Incorporating file %s..." cur-prefix) + (when (file-exists-p + (setq file + (expand-file-name + (concat (gnus-soup-area-prefix area) ".IDX") + nnsoup-tmp-directory))) (rename-file file (nnsoup-file cur-prefix))) - (when (file-exists-p - (setq file (concat nnsoup-tmp-directory - (gnus-soup-area-prefix area) ".MSG"))) + (when (file-exists-p + (setq file (expand-file-name + (concat (gnus-soup-area-prefix area) ".MSG") + nnsoup-tmp-directory))) (rename-file file (nnsoup-file cur-prefix t)) (gnus-soup-set-area-prefix area cur-prefix) ;; Find the number of new articles in this area. @@ -428,7 +438,7 @@ The SOUP packet file name will be inserted at the %s.") (if (not (setq entry (assoc (gnus-soup-area-name area) nnsoup-group-alist))) ;; If this is a new area (group), we just add this info to - ;; the group alist. + ;; the group alist. (push (list (gnus-soup-area-name area) (cons 1 number) (list (cons 1 number) area)) @@ -444,7 +454,7 @@ The SOUP packet file name will be inserted at the %s.") (defun nnsoup-number-of-articles (area) (save-excursion - (cond + (cond ;; If the number is in the area info, we just return it. ((gnus-soup-area-number area) (gnus-soup-area-number area)) @@ -453,12 +463,12 @@ The SOUP packet file name will be inserted at the %s.") (set-buffer (nnsoup-index-buffer (gnus-soup-area-prefix area))) (count-lines (point-min) (point-max))) ;; We do it the hard way - re-searching through the message - ;; buffer. + ;; buffer. (t (set-buffer (nnsoup-message-buffer (gnus-soup-area-prefix area))) (unless (assoc (gnus-soup-area-prefix area) nnsoup-article-alist) (nnsoup-dissect-buffer area)) - (length (cdr (assoc (gnus-soup-area-prefix area) + (length (cdr (assoc (gnus-soup-area-prefix area) nnsoup-article-alist))))))) (defun nnsoup-dissect-buffer (area) @@ -467,9 +477,10 @@ The SOUP packet file name will be inserted at the %s.") (i 0) alist len) (goto-char (point-min)) - (cond + (cond ;; rnews batch format - ((= format ?n) + ((or (= format ?u) + (= format ?n)) ;; Gnus back compatibility. (while (looking-at "^#! *rnews \\(+[0-9]+\\) *$") (forward-line 1) (push (list @@ -482,7 +493,7 @@ The SOUP packet file name will be inserted at the %s.") ((= format ?m) (while (looking-at mbox-delim) (forward-line 1) - (push (list + (push (list (incf i) (point) (progn (if (re-search-forward mbox-delim nil t) @@ -494,7 +505,7 @@ The SOUP packet file name will be inserted at the %s.") ((= format ?M) (while (looking-at "\^A\^A\^A\^A\n") (forward-line 1) - (push (list + (push (list (incf i) (point) (progn (if (search-forward "\n\^A\^A\^A\^A\n" nil t) @@ -523,17 +534,19 @@ The SOUP packet file name will be inserted at the %s.") (let* ((file (concat prefix (if message ".MSG" ".IDX"))) (buffer-name (concat " *nnsoup " file "*"))) (or (get-buffer buffer-name) ; File already loaded. - (when (file-exists-p (concat nnsoup-directory file)) + (when (file-exists-p (expand-file-name file nnsoup-directory)) (save-excursion ; Load the file. (set-buffer (get-buffer-create buffer-name)) - (buffer-disable-undo (current-buffer)) + (buffer-disable-undo) (push (cons nnsoup-current-group (current-buffer)) nnsoup-buffers) - (nnheader-insert-file-contents (concat nnsoup-directory file)) + (nnheader-insert-file-contents + (expand-file-name file nnsoup-directory)) (current-buffer)))))) (defun nnsoup-file (prefix &optional message) (expand-file-name - (concat nnsoup-directory prefix (if message ".MSG" ".IDX")))) + (concat prefix (if message ".MSG" ".IDX")) + nnsoup-directory)) (defun nnsoup-message-buffer (prefix) (nnsoup-index-buffer prefix 'msg)) @@ -541,16 +554,15 @@ The SOUP packet file name will be inserted at the %s.") (defun nnsoup-unpack-packets () "Unpack all packets in `nnsoup-packet-directory'." (let ((packets (directory-files - nnsoup-packet-directory t nnsoup-packet-regexp)) - packet) - (while (setq packet (pop packets)) - (message "nnsoup: unpacking %s..." packet) - (if (not (gnus-soup-unpack-packet + nnsoup-packet-directory t nnsoup-packet-regexp))) + (dolist (packet packets) + (nnheader-message 5 "nnsoup: unpacking %s..." packet) + (if (not (gnus-soup-unpack-packet nnsoup-tmp-directory nnsoup-unpacker packet)) - (message "Couldn't unpack %s" packet) + (nnheader-message 5 "Couldn't unpack %s" packet) (delete-file packet) (nnsoup-read-areas) - (message "Unpacking...done"))))) + (nnheader-message 5 "Unpacking...done"))))) (defun nnsoup-narrow-to-article (article &optional area head) (let* ((area (or area (nnsoup-article-to-area article nnsoup-current-group))) @@ -563,9 +575,9 @@ The SOUP packet file name will be inserted at the %s.") ;; There is no MSG file. ((null msg-buf) nil) - ;; We use the index file to find out where the article - ;; begins and ends. - ((and (= (gnus-soup-encoding-index + ;; We use the index file to find out where the article + ;; begins and ends. + ((and (= (gnus-soup-encoding-index (gnus-soup-area-encoding (nth 1 area))) ?c) (file-exists-p (nnsoup-file prefix))) @@ -583,7 +595,7 @@ The SOUP packet file name will be inserted at the %s.") (let ((format (gnus-soup-encoding-format (gnus-soup-area-encoding (nth 1 area))))) (goto-char end) - (when (or (= format ?n) (= format ?m)) + (when (or (= format ?u) (= format ?n) (= format ?m)) (setq end (progn (forward-line -1) (point)))))) (set-buffer msg-buf)) (widen) @@ -614,7 +626,7 @@ The SOUP packet file name will be inserted at the %s.") "Make an outbound package of SOUP replies." (interactive) (unless (file-exists-p nnsoup-replies-directory) - (message "No such directory: %s" nnsoup-replies-directory)) + (nnheader-message 5 "No such directory: %s" nnsoup-replies-directory)) ;; Write all data buffers. (gnus-soup-save-areas) ;; Write the active file. @@ -623,7 +635,7 @@ The SOUP packet file name will be inserted at the %s.") (nnsoup-write-replies) ;; Check whether there is anything here. (when (null (directory-files nnsoup-replies-directory nil "\\.MSG$")) - (error "No files to pack.")) + (error "No files to pack")) ;; Pack all these files into a SOUP packet. (gnus-soup-pack nnsoup-replies-directory nnsoup-packer)) @@ -636,25 +648,25 @@ The SOUP packet file name will be inserted at the %s.") (defun nnsoup-article-to-area (article group) "Return the area that ARTICLE in GROUP is located in." (let ((areas (cddr (assoc group nnsoup-group-alist)))) - (while (and areas (< (cdaar areas) article)) + (while (and areas (< (cdar (car areas)) article)) (setq areas (cdr areas))) (and areas (car areas)))) (defvar nnsoup-old-functions - (list message-send-mail-function message-send-news-function)) + (list message-send-mail-real-function message-send-news-function)) ;;;###autoload (defun nnsoup-set-variables () "Use the SOUP methods for posting news and mailing mail." (interactive) (setq message-send-news-function 'nnsoup-request-post) - (setq message-send-mail-function 'nnsoup-request-mail)) + (setq message-send-mail-real-function 'nnsoup-request-mail)) ;;;###autoload (defun nnsoup-revert-variables () "Revert posting and mailing methods to the standard Emacs methods." (interactive) - (setq message-send-mail-function (car nnsoup-old-functions)) + (setq message-send-mail-real-function (car nnsoup-old-functions)) (setq message-send-news-function (cadr nnsoup-old-functions))) (defun nnsoup-store-reply (kind) @@ -691,14 +703,10 @@ The SOUP packet file name will be inserted at the %s.") (replace-match "\n") (backward-char 1) (setq delimline (point-marker)) - ;; Insert an extra newline if we need it to work around - ;; Sun's bug that swallows newlines. (goto-char (1+ delimline)) - (when (eval message-mailer-swallows-blank-line) - (newline)) (let ((msg-buf - (gnus-soup-store - nnsoup-replies-directory + (gnus-soup-store + nnsoup-replies-directory (nnsoup-kind-to-prefix kind) nil nnsoup-replies-format-type nnsoup-replies-index-type)) (num 0)) @@ -707,24 +715,26 @@ The SOUP packet file name will be inserted at the %s.") (set-buffer msg-buf) (goto-char (point-min)) (while (re-search-forward "^#! *rnews" nil t) - (incf num))) - (message "Stored %d messages" num))) + (incf num)) + (when nnsoup-always-save + (save-buffer))) + (nnheader-message 5 "Stored %d messages" num))) (nnsoup-write-replies) (kill-buffer tembuf)))))) (defun nnsoup-kind-to-prefix (kind) (unless nnsoup-replies-list (setq nnsoup-replies-list - (gnus-soup-parse-replies - (concat nnsoup-replies-directory "REPLIES")))) + (gnus-soup-parse-replies + (expand-file-name "REPLIES" nnsoup-replies-directory)))) (let ((replies nnsoup-replies-list)) - (while (and replies + (while (and replies (not (string= kind (gnus-soup-reply-kind (car replies))))) (setq replies (cdr replies))) (if replies (gnus-soup-reply-prefix (car replies)) (push (vector (gnus-soup-unique-prefix nnsoup-replies-directory) - kind + kind (format "%c%c%c" nnsoup-replies-format-type nnsoup-replies-index-type @@ -739,46 +749,42 @@ The SOUP packet file name will be inserted at the %s.") (let ((files (sort (directory-files nnsoup-directory t "IDX$") (lambda (f1 f2) (< (progn (string-match "/\\([0-9]+\\)\\." f1) - (string-to-int (match-string 1 f1))) + (string-to-number (match-string 1 f1))) (progn (string-match "/\\([0-9]+\\)\\." f2) - (string-to-int (match-string 1 f2))))))) + (string-to-number (match-string 1 f2))))))) active group lines ident elem min) (set-buffer (get-buffer-create " *nnsoup work*")) - (buffer-disable-undo (current-buffer)) - (while files - (message "Doing %s..." (car files)) + (dolist (file files) + (nnheader-message 5 "Doing %s..." file) (erase-buffer) - (nnheader-insert-file-contents (car files)) + (nnheader-insert-file-contents file) (goto-char (point-min)) (if (not (re-search-forward "^[^\t]*\t[^\t]*\t[^\t]*\t[^\t]*\t[^\t]*\t[^\t]*\t[^\t]*\t[^\t]*\t *\\(Xref: \\)? *[^ ]* \\([^ ]+\\):[0-9]" nil t)) (setq group "unknown") (setq group (match-string 2))) (setq lines (count-lines (point-min) (point-max))) (setq ident (progn (string-match - "/\\([0-9]+\\)\\." (car files)) - (substring - (car files) (match-beginning 1) - (match-end 1)))) + "/\\([0-9]+\\)\\." file) + (match-string 1 file))) (if (not (setq elem (assoc group active))) (push (list group (cons 1 lines) (list (cons 1 lines) - (vector ident group "ncm" "" lines))) + (vector ident group "ucm" "" lines))) active) (nconc elem (list (list (cons (1+ (setq min (cdadr elem))) (+ min lines)) - (vector ident group "ncm" "" lines)))) - (setcdr (cadr elem) (+ min lines))) - (setq files (cdr files))) - (message "") + (vector ident group "ucm" "" lines)))) + (setcdr (cadr elem) (+ min lines)))) + (nnheader-message 5 "") (setq nnsoup-group-alist active) (nnsoup-write-active-file t))) (defun nnsoup-delete-unreferenced-message-files () "Delete any *.MSG and *.IDX files that aren't known by nnsoup." (interactive) - (let* ((known (apply 'nconc (mapcar + (let* ((known (apply 'nconc (mapcar (lambda (ga) (mapcar (lambda (area) @@ -787,18 +793,20 @@ The SOUP packet file name will be inserted at the %s.") nnsoup-group-alist))) (regexp "\\.MSG$\\|\\.IDX$") (files (directory-files nnsoup-directory nil regexp)) - non-files file) + non-files) ;; Find all files that aren't known by nnsoup. - (while (setq file (pop files)) + (dolist (file files) (string-match regexp file) (unless (member (substring file 0 (match-beginning 0)) known) (push file non-files))) ;; Sort and delete the files. (setq non-files (sort non-files 'string<)) (map-y-or-n-p "Delete file %s? " - (lambda (file) (delete-file (concat nnsoup-directory file))) + (lambda (file) (delete-file + (expand-file-name file nnsoup-directory))) non-files))) (provide 'nnsoup) +;;; arch-tag: b0451389-5703-4450-9425-f66f6b38c828 ;;; nnsoup.el ends here