;;; nnspool.el --- spool access for GNU Emacs
-;; Copyright (C) 1988,89,90,93,94,95 Free Software Foundation, Inc.
+;; Copyright (C) 1988,89,90,93,94,95,96 Free Software Foundation, Inc.
;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
;; Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
;; 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:
(require 'nnheader)
(require 'nntp)
(require 'timezone)
+(eval-when-compile (require 'cl))
(defvar nnspool-inews-program news-inews-program
"Program to post news.
(defvar nnspool-current-server nil)
(defvar nnspool-server-alist nil)
(defvar nnspool-server-variables
- (list
- (list 'nnspool-inews-program nnspool-inews-program)
- (list 'nnspool-inews-switches nnspool-inews-switches)
- (list 'nnspool-spool-directory nnspool-spool-directory)
- (list 'nnspool-nov-directory nnspool-nov-directory)
- (list 'nnspool-lib-dir nnspool-lib-dir)
- (list 'nnspool-active-file nnspool-active-file)
- (list 'nnspool-newsgroups-file nnspool-newsgroups-file)
- (list 'nnspool-distributions-file nnspool-distributions-file)
- (list 'nnspool-history-file nnspool-history-file)
- (list 'nnspool-active-times-file nnspool-active-times-file)
- (list 'nnspool-large-newsgroup nnspool-large-newsgroup)
- (list 'nnspool-nov-is-evil nnspool-nov-is-evil)
- (list 'nnspool-sift-nov-with-sed nnspool-sift-nov-with-sed)
- '(nnspool-current-directory nil)
- '(nnspool-current-group nil)
- '(nnspool-status-string "")))
+ `((nnspool-inews-program ,nnspool-inews-program)
+ (nnspool-inews-switches ,nnspool-inews-switches)
+ (nnspool-spool-directory ,nnspool-spool-directory)
+ (nnspool-nov-directory ,nnspool-nov-directory)
+ (nnspool-lib-dir ,nnspool-lib-dir)
+ (nnspool-active-file ,nnspool-active-file)
+ (nnspool-newsgroups-file ,nnspool-newsgroups-file)
+ (nnspool-distributions-file ,nnspool-distributions-file)
+ (nnspool-rejected-article-hook nil)
+ (nnspool-history-file ,nnspool-history-file)
+ (nnspool-active-times-file ,nnspool-active-times-file)
+ (nnspool-large-newsgroup ,nnspool-large-newsgroup)
+ (nnspool-nov-is-evil ,nnspool-nov-is-evil)
+ (nnspool-sift-nov-with-sed ,nnspool-sift-nov-with-sed)
+ (nnspool-current-directory nil)
+ (nnspool-current-group nil)
+ (nnspool-status-string "")))
\f
;;; Interface functions.
-(defun nnspool-retrieve-headers (sequence &optional newsgroup server fetch-old)
- "Retrieve the headers for the articles in SEQUENCE.
-Newsgroup must be selected before calling this function."
+(defun nnspool-retrieve-headers (articles &optional group server fetch-old)
+ "Retrieve the headers of ARTICLES."
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
- (let* ((number (length sequence))
- (count 0)
- (do-message (and (numberp nnspool-large-newsgroup)
- (> number nnspool-large-newsgroup)))
- file beg article)
- (if (not (nnspool-possibly-change-directory newsgroup))
- ()
- (if (and (numberp (car sequence))
- (nnspool-retrieve-headers-with-nov sequence fetch-old))
+ (when (nnspool-possibly-change-directory group)
+ (let* ((number (length articles))
+ (count 0)
+ (default-directory nnspool-current-directory)
+ (do-message (and (numberp nnspool-large-newsgroup)
+ (> number nnspool-large-newsgroup)))
+ file beg article ag)
+ (if (and (numberp (car articles))
+ (nnspool-retrieve-headers-with-nov articles fetch-old))
+ ;; We successfully retrieved the NOV headers.
'nov
- (while sequence
- (setq article (car sequence))
+ ;; No NOV headers here, so we do it the hard way.
+ (while (setq article (pop articles))
(if (stringp article)
- (progn
- (setq file (nnspool-find-article-by-message-id article))
- (setq article 0))
- (setq file (concat nnspool-current-directory
- (int-to-string article))))
- (and file (file-exists-p file)
- (progn
- (insert (format "221 %d Article retrieved.\n" article))
- (setq beg (point))
- (nnheader-insert-head file)
- (goto-char beg)
- (search-forward "\n\n" nil t)
- (forward-char -1)
- (insert ".\n")
- (delete-region (point) (point-max))))
- (setq sequence (cdr sequence))
+ ;; This is a Message-ID.
+ (setq ag (nnspool-find-id article)
+ file (and ag (nnspool-article-pathname
+ (car ag) (cdr ag)))
+ article (cdr ag))
+ ;; This is an article in the current group.
+ (setq file (int-to-string article)))
+ ;; Insert the head of the article.
+ (when (and file
+ (file-exists-p file))
+ (insert "221 ")
+ (princ article (current-buffer))
+ (insert " Article retrieved.\n")
+ (setq beg (point))
+ (inline (nnheader-insert-head file))
+ (goto-char beg)
+ (search-forward "\n\n" nil t)
+ (forward-char -1)
+ (insert ".\n")
+ (delete-region (point) (point-max)))
(and do-message
- (zerop (% (setq count (1+ count)) 20))
- (message "NNSPOOL: Receiving headers... %d%%"
+ (zerop (% (incf count) 20))
+ (message "nnspool: Receiving headers... %d%%"
(/ (* count 100) number))))
- (and do-message (message "NNSPOOL: Receiving headers...done"))
+ (and do-message
+ (message "nnspool: Receiving headers...done"))
;; Fold continuation lines.
- (goto-char (point-min))
- (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
- (replace-match " " t t))
+ (nnheader-fold-continuation-lines)
'headers)))))
(defun nnspool-open-server (server &optional defs)
- (nnheader-init-server-buffer)
- (if (equal server nnspool-current-server)
- t
- (if nnspool-current-server
- (setq nnspool-server-alist
- (cons (list nnspool-current-server
- (nnheader-save-variables nnspool-server-variables))
- nnspool-server-alist)))
- (let ((state (assoc server nnspool-server-alist)))
- (if state
- (progn
- (nnheader-restore-variables (nth 1 state))
- (setq nnspool-server-alist (delq state nnspool-server-alist)))
- (nnheader-set-init-variables nnspool-server-variables defs)))
- (setq nnspool-current-server server)))
+ (nnheader-change-server 'nnspool server defs)
+ (cond
+ ((not (file-exists-p nnspool-spool-directory))
+ (nnspool-close-server)
+ (nnheader-report 'nnspool "Spool directory doesn't exist: %s"
+ nnspool-spool-directory))
+ ((not (file-directory-p (file-truename nnspool-spool-directory)))
+ (nnspool-close-server)
+ (nnheader-report 'nnspool "Not a directory: %s" nnspool-spool-directory))
+ (t
+ (nnheader-report 'nnspool "Opened server %s using directory %s"
+ server nnspool-spool-directory)
+ t)))
(defun nnspool-close-server (&optional server)
+ (setq nnspool-current-server nil)
t)
(defun nnspool-server-opened (&optional server)
"Return server status response as string."
nnspool-status-string)
-(defun nnspool-request-article (id &optional newsgroup server buffer)
+(defun nnspool-request-article (id &optional group server buffer)
"Select article by message ID (or number)."
- (nnspool-possibly-change-directory newsgroup)
- (let* ((group (if (stringp id)
- (nnspool-find-article-by-message-id id)
- nnspool-current-group))
- (file (and group (nnspool-article-pathname group id)))
- (nntp-server-buffer (or buffer nntp-server-buffer)))
+ (nnspool-possibly-change-directory group)
+ (let ((nntp-server-buffer (or buffer nntp-server-buffer))
+ file ag)
+ (if (stringp id)
+ ;; This is a Message-ID.
+ (when (setq ag (nnspool-find-id id))
+ (setq file (nnspool-article-pathname (car ag) (cdr ag))))
+ (setq file (nnspool-article-pathname nnspool-current-group id)))
(and file
(file-exists-p file)
(not (file-directory-p file))
(save-excursion (nnspool-find-file file))
- ;; We return the article number.
+ ;; We return the article number and group name.
(if (numberp id)
- (cons newsgroup id)
- (cons group id)))))
+ (cons nnspool-current-group id)
+ ag))))
-(defun nnspool-request-body (id &optional newsgroup server)
+(defun nnspool-request-body (id &optional group server)
"Select article body by message ID (or number)."
- (nnspool-possibly-change-directory newsgroup)
- (if (nnspool-request-article id)
+ (nnspool-possibly-change-directory group)
+ (let ((res (nnspool-request-article id)))
+ (when res
(save-excursion
(set-buffer nntp-server-buffer)
(goto-char (point-min))
- (if (search-forward "\n\n" nil t)
- (delete-region (point-min) (point)))
- t)))
+ (when (search-forward "\n\n" nil t)
+ (delete-region (point-min) (point)))
+ res))))
-(defun nnspool-request-head (id &optional newsgroup server)
+(defun nnspool-request-head (id &optional group server)
"Select article head by message ID (or number)."
- (nnspool-possibly-change-directory newsgroup)
- (if (nnspool-request-article id)
+ (nnspool-possibly-change-directory group)
+ (let ((res (nnspool-request-article id)))
+ (when res
(save-excursion
(set-buffer nntp-server-buffer)
(goto-char (point-min))
- (if (search-forward "\n\n" nil t)
- (delete-region (1- (point)) (point-max)))
- t)))
+ (when (search-forward "\n\n" nil t)
+ (delete-region (1- (point)) (point-max)))))
+ res))
(defun nnspool-request-group (group &optional server dont-check)
"Select news GROUP."
(let ((pathname (nnspool-article-pathname group))
dir)
(if (not (file-directory-p pathname))
- (progn
- (setq nnspool-status-string
- "Invalid group name (no such directory)")
- nil)
+ (nnheader-report
+ 'nnspool "Invalid group name (no such directory): %s" group)
(setq nnspool-current-directory pathname)
- (setq nnspool-status-string "")
- (if (not dont-check)
+ (nnheader-report 'nnspool "Selected group %s" group)
+ (if dont-check
(progn
- (setq dir (directory-files pathname nil "^[0-9]+$" t))
- ;; yes, completely empty spool directories *are* possible
- ;; Fix by Sudish Joseph <joseph@cis.ohio-state.edu>
- (and dir
- (setq dir
- (sort
- (mapcar
- (function
- (lambda (name)
- (string-to-int name)))
- dir)
- '<)))
- (save-excursion
- (set-buffer nntp-server-buffer)
- (erase-buffer)
- (if dir
- (insert
- (format "211 %d %d %d %s\n" (length dir) (car dir)
- (progn (while (cdr dir) (setq dir (cdr dir)))
- (car dir))
- group))
- (insert (format "211 0 0 0 %s\n" group))))))
- t)))
+ (nnheader-report 'nnspool "Selected group %s" group)
+ t)
+ ;; Yes, completely empty spool directories *are* possible.
+ ;; Fix by Sudish Joseph <joseph@cis.ohio-state.edu>
+ (when (setq dir (directory-files pathname nil "^[0-9]+$" t))
+ (setq dir
+ (sort (mapcar (lambda (name) (string-to-int name)) dir) '<)))
+ (if dir
+ (nnheader-insert
+ "211 %d %d %d %s\n" (length dir) (car dir)
+ (progn (while (cdr dir) (setq dir (cdr dir))) (car dir))
+ group)
+ (nnheader-report 'nnspool "Empty group %s" group)
+ (nnheader-insert "211 0 0 0 %s\n" group))))))
+
+(defun nnspool-request-type (group &optional article)
+ 'news)
(defun nnspool-close-group (group &optional server)
t)
(apply 'start-process "*nnspool inews*" inews-buffer
nnspool-inews-program nnspool-inews-switches)
(error
- (setq nnspool-status-string (format "inews error: %S" err))
- nil))))
+ (nnheader-report 'nnspool "inews error: %S" err)))))
(if (not proc)
;; The inews program failed.
()
- (setq nnspool-status-string "")
+ (nnheader-report 'nnspool "")
(set-process-sentinel proc 'nnspool-inews-sentinel)
(process-send-region proc (point-min) (point-max))
;; We slap a condition-case around this, because the process may
;; Make status message by folding lines.
(while (re-search-forward "[ \t\n]+" nil t)
(replace-match " " t t))
- (setq nnspool-status-string (buffer-string))
+ (nnheader-report 'nnspool "%s" (buffer-string))
(message "nnspool: %s" nnspool-status-string)
(ding)
(run-hooks 'nnspool-rejected-article-hook))))
(defun nnspool-retrieve-headers-with-nov (articles &optional fetch-old)
(if (or gnus-nov-is-evil nnspool-nov-is-evil)
nil
- (let ((nov (concat (file-name-as-directory nnspool-nov-directory)
- (nnspool-replace-chars-in-string
- nnspool-current-group ?. ?/)
- "/.overview")))
+ (let ((nov (nnheader-group-pathname
+ nnspool-current-group nnspool-nov-directory ".overview")))
(if (not (file-exists-p nov))
()
(save-excursion
(cur (current-buffer))
(prev (point-min))
num found)
- (if (or (eobp)
- (>= (read cur) article))
- (beginning-of-line)
- (while (not found)
- (goto-char (/ (+ max min) 2))
+ (while (not found)
+ (goto-char (/ (+ max min) 2))
+ (beginning-of-line)
+ (if (or (= (point) prev)
+ (eobp))
+ (setq found t)
+ (setq prev (point))
+ (cond ((> (setq num (read cur)) article)
+ (setq max (point)))
+ ((< num article)
+ (setq min (point)))
+ (t
+ (setq found 'yes)))))
+ ;; Now we may have found the article we're looking for, or we
+ ;; may be somewhere near it.
+ (when (and (not (eq found 'yes))
+ (not (eq num article)))
+ (setq found (point))
+ (while (and (< (point) max)
+ (or (not (numberp num))
+ (< num article)))
(forward-line 1)
- (if (or (= (point) prev)
- (eobp))
- (setq found t)
- (setq prev (point))
- (cond ((> (setq num (read cur)) article)
- (setq max (point)))
- ((< num article)
- (setq min (point)))
- (t
- (setq found t))))
- (beginning-of-line))
- (or (not num) (= num article)))))
+ (setq found (point))
+ (or (eobp)
+ (= (setq num (read cur)) article)))
+ (unless (eq num article)
+ (goto-char found)))
+ (beginning-of-line)
+ (eq num article)))
-
(defun nnspool-sift-nov-with-sed (articles file)
(let ((first (car articles))
(last (progn (while (cdr articles) (setq articles (cdr articles)))
;; Fixed by fdc@cliwe.ping.de (Frank D. Cringle).
;; Find out what group an article identified by a Message-ID is in.
-(defun nnspool-find-article-by-message-id (id)
+(defun nnspool-find-id (id)
(save-excursion
(set-buffer (get-buffer-create " *nnspool work*"))
(buffer-disable-undo (current-buffer))
(erase-buffer)
- (call-process "grep" nil t nil id nnspool-history-file)
+ (condition-case ()
+ (call-process "grep" nil t nil id nnspool-history-file)
+ (error nil))
(goto-char (point-min))
(prog1
- (if (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ \t\n]*\\)")
- (buffer-substring (match-beginning 1) (match-end 1)))
+ (if (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ /\t\n]+\\)/\\([0-9]+\\)[ \t\n]")
+ (cons (match-string 1) (string-to-int (match-string 2))))
(kill-buffer (current-buffer)))))
(defun nnspool-find-file (file)
(progn (insert-file-contents file) t)
(file-error nil)))
-(defun nnspool-possibly-change-directory (newsgroup)
- (if newsgroup
- (let ((pathname (nnspool-article-pathname newsgroup)))
- (if (file-directory-p pathname)
- (progn
- (setq nnspool-current-directory pathname)
- (setq nnspool-current-group newsgroup))
- (setq nnspool-status-string
- (format "No such newsgroup: %s" newsgroup))
- nil))
- t))
+(defun nnspool-possibly-change-directory (group)
+ (if (not group)
+ t
+ (let ((pathname (nnspool-article-pathname group)))
+ (if (file-directory-p pathname)
+ (setq nnspool-current-directory pathname
+ nnspool-current-group group)
+ (nnheader-report 'nnspool "No such newsgroup: %s" group)))))
(defun nnspool-article-pathname (group &optional article)
"Find the path for GROUP."
- (concat
- (file-name-as-directory nnspool-spool-directory)
- (nnspool-replace-chars-in-string group ?. ?/)
- "/"
- (if article (int-to-string article) "")))
-
-(defun nnspool-replace-chars-in-string (string from to)
- "Replace characters in STRING from FROM to TO."
- (let ((string (substring string 0)) ;Copy string.
- (len (length string))
- (idx 0))
- ;; Replace all occurrences of FROM with TO.
- (while (< idx len)
- (if (= (aref string idx) from)
- (aset string idx to))
- (setq idx (1+ idx)))
- string))
-
-(defun nnspool-number-base-10 (num pos)
- (if (<= pos 0) ""
- (setcdr num (+ (* (% (car num) 10) 65536) (cdr num)))
- (apply
- 'concat
- (reverse
- (list
- (char-to-string
- (aref "0123456789" (% (cdr num) 10)))
- (progn
- (setcdr num (/ (cdr num) 10))
- (setcar num (/ (car num) 10))
- (nnspool-number-base-10 num (1- pos))))))))
+ (nnheader-group-pathname group nnspool-spool-directory article))
(defun nnspool-seconds-since-epoch (date)
(let* ((tdate (mapcar (lambda (ti) (and ti (string-to-int ti)))
(nth 2 tdate) (nth 1 tdate) (nth 0 tdate)
(nth 4 tdate))))
(+ (* (car unix) 65536.0)
- (car (cdr unix)))))
+ (cadr unix))))
(provide 'nnspool)
projects / gnus / blobdiff