(require 'timezone)
(defvar nnspool-inews-program news-inews-program
- "Program to post news.")
+ "Program to post news.
+This is most commonly `inews' or `injnews'.")
-(defvar nnspool-inews-switches '("-S" "-h")
- "Switches for nnspool-request-post to pass to `inews' for posting news.")
+(defvar nnspool-inews-switches '("-h")
+ "Switches for nnspool-request-post to pass to `inews' for posting news.
+If you are using Cnews, you probably should set this variable to nil.")
-(defvar nnspool-spool-directory news-path
+(defvar nnspool-spool-directory (file-name-as-directory news-path)
"Local news spool directory.")
(defvar nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
(defvar nnspool-nov-is-evil nil
"Non-nil means that nnspool will never return NOV lines instead of headers.")
-(defvar nnspool-sift-nov-with-sed t
+(defconst nnspool-sift-nov-with-sed nil
"If non-nil, use sed to get the relevant portion from the overview file.
If nil, nnspool will load the entire file into a buffer and process it
there.")
+(defvar nnspool-rejected-article-hook nil
+ "*A hook that will be run when an article has been rejected by the server.")
+
\f
(defconst nnspool-version "nnspool 2.0"
\f
;;; Interface functions.
-(defun nnspool-retrieve-headers (sequence &optional newsgroup server)
+(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."
(save-excursion
file beg article)
(if (not (nnspool-possibly-change-directory newsgroup))
()
- (if (nnspool-retrieve-headers-with-nov sequence)
+ (if (and (numberp (car sequence))
+ (nnspool-retrieve-headers-with-nov sequence fetch-old))
'nov
(while sequence
(setq article (car sequence))
(if (stringp article)
(progn
- (format "221 %d Article retrieved.\n" 0)
- (nnspool-request-article article))
+ (setq file (nnspool-find-article-by-message-id article))
+ (setq article 0))
(setq file (concat nnspool-current-directory
- (int-to-string article)))
- (and (file-exists-p file)
- (progn
- (insert (format "221 %d Article retrieved.\n" article))
- (setq beg (point))
- (insert-file-contents file)
- (goto-char beg)
- (search-forward "\n\n" nil t)
- (forward-char -1)
- (insert ".\n")
- (delete-region (point) (point-max)))))
+ (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))
(and do-message
(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))
(setq nnspool-current-server server)))
(defun nnspool-close-server (&optional server)
+ (setq nnspool-current-server nil)
t)
(defun nnspool-server-opened (&optional server)
(defun nnspool-request-article (id &optional newsgroup server buffer)
"Select article by message ID (or number)."
(nnspool-possibly-change-directory newsgroup)
- (let ((file (if (stringp id)
- (nnspool-find-article-by-message-id id)
- (concat nnspool-current-directory (prin1-to-string id))))
- (nntp-server-buffer (or buffer nntp-server-buffer)))
- (if (and (stringp file)
- (file-exists-p file)
- (not (file-directory-p file)))
- (save-excursion
- (nnspool-find-file file)))))
-
+ (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)))
+ (and file
+ (file-exists-p file)
+ (not (file-directory-p file))
+ (save-excursion (nnspool-find-file file))
+ ;; We return the article number.
+ (if (numberp id)
+ (cons newsgroup id)
+ (cons group id)))))
+
(defun nnspool-request-body (id &optional newsgroup server)
"Select article body by message ID (or number)."
(nnspool-possibly-change-directory newsgroup)
(defun nnspool-request-group (group &optional server dont-check)
"Select news GROUP."
- (let ((pathname (nnspool-article-pathname
- (nnspool-replace-chars-in-string group ?. ?/)))
+ (let ((pathname (nnspool-article-pathname group))
dir)
(if (not (file-directory-p pathname))
(progn
t)
(defun nnspool-request-list (&optional server)
- "List active newsgoups."
+ "List active newsgroups."
(save-excursion
(nnspool-find-file nnspool-active-file)))
(defun nnspool-request-post (&optional server)
"Post a new news in current buffer."
(save-excursion
- (let* ((inews-buffer (generate-new-buffer " *nnspool post*"))
- (proc (apply 'start-process "*nnspool inews*" inews-buffer
- nnspool-inews-program nnspool-inews-switches)))
- (set-process-sentinel proc 'nnspool-inews-sentinel)
- (process-send-region proc (point-min) (point-max))
- (process-send-eof proc)
- t)))
+ (let* ((process-connection-type nil) ; t bugs out on Solaris
+ (inews-buffer (generate-new-buffer " *nnspool post*"))
+ (proc
+ (condition-case err
+ (apply 'start-process "*nnspool inews*" inews-buffer
+ nnspool-inews-program nnspool-inews-switches)
+ (error
+ (setq nnspool-status-string (format "inews error: %S" err))
+ nil))))
+ (if (not proc)
+ ;; The inews program failed.
+ ()
+ (setq nnspool-status-string "")
+ (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
+ ;; have exited already...
+ (condition-case nil
+ (process-send-eof proc)
+ (error nil))
+ t))))
(defun nnspool-inews-sentinel (proc status)
(save-excursion
(goto-char (point-min))
(if (or (zerop (buffer-size))
(search-forward "spooled" nil t))
- ()
- ;; Make status message by unfolding lines.
- (subst-char-in-region (point-min) (point-max) ?\n ?\\ 'noundo)
+ (kill-buffer (current-buffer))
+ ;; Make status message by folding lines.
+ (while (re-search-forward "[ \t\n]+" nil t)
+ (replace-match " " t t))
(setq nnspool-status-string (buffer-string))
(message "nnspool: %s" nnspool-status-string)
- (kill-buffer (current-buffer)))))
-
-(fset 'nnspool-request-post-buffer 'nntp-request-post-buffer)
+ (ding)
+ (run-hooks 'nnspool-rejected-article-hook))))
\f
;;; Internal functions.
-(defun nnspool-retrieve-headers-with-nov (articles)
+(defun nnspool-retrieve-headers-with-nov (articles &optional fetch-old)
(if (or gnus-nov-is-evil nnspool-nov-is-evil)
nil
- (let ((nov (concat nnspool-nov-directory
+ (let ((nov (concat (file-name-as-directory nnspool-nov-directory)
(nnspool-replace-chars-in-string
nnspool-current-group ?. ?/)
- "/.overview"))
- article)
- (if (file-exists-p nov)
- (save-excursion
- (set-buffer nntp-server-buffer)
- (erase-buffer)
- (if nnspool-sift-nov-with-sed
- (nnspool-sift-nov-with-sed articles nov)
- (insert-file-contents nov)
- ;; First we find the first wanted line. We issue a number
- ;; of search-forwards - the first article we are lookign
- ;; for may be expired, so we have to go on searching until
- ;; we find one of the articles we want.
- (while (and articles
- (setq article (concat (int-to-string
- (car articles)) "\t"))
- (not (or (looking-at article)
- (search-forward (concat "\n" article)
- nil t))))
- (setq articles (cdr articles)))
- (if (not articles)
- ()
- (beginning-of-line)
- (delete-region (point-min) (point))
- ;; Then we find the last wanted line. We go to the end
- ;; of the buffer and search backward much the same way
- ;; we did to find the first article.
- ;; !!! Perhaps it would be better just to do a (last articles),
- ;; and go forward successively over each line and
- ;; compare to avoid this (reverse), like this:
- ;; (while (and (>= last (read nntp-server-buffer)))
- ;; (zerop (forward-line 1))))
- (setq articles (reverse articles))
- (goto-char (point-max))
- (while (and articles
- (not (search-backward
- (concat "\n" (int-to-string (car articles))
- "\t") nil t)))
- (setq articles (cdr articles)))
- (if articles
- (progn
- (forward-line 2)
- (delete-region (point) (point-max)))))
- (or articles (progn (erase-buffer) nil))))))))
+ "/.overview")))
+ (if (not (file-exists-p nov))
+ ()
+ (save-excursion
+ (set-buffer nntp-server-buffer)
+ (erase-buffer)
+ (if nnspool-sift-nov-with-sed
+ (nnspool-sift-nov-with-sed articles nov)
+ (insert-file-contents nov)
+ (if (and fetch-old
+ (not (numberp fetch-old)))
+ t ; We want all the headers.
+ ;; First we find the first wanted line.
+ (nnspool-find-nov-line
+ (if fetch-old (max 1 (- (car articles) fetch-old))
+ (car articles)))
+ (delete-region (point-min) (point))
+ ;; Then we find the last wanted line.
+ (if (nnspool-find-nov-line
+ (progn (while (cdr articles) (setq articles (cdr articles)))
+ (car articles)))
+ (forward-line 1))
+ (delete-region (point) (point-max))
+ ;; If the buffer is empty, this wasn't very successful.
+ (not (zerop (buffer-size))))))))))
+
+(defun nnspool-find-nov-line (article)
+ (let ((max (point-max))
+ (min (goto-char (point-min)))
+ (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))
+ (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)))))
+
(defun nnspool-sift-nov-with-sed (articles file)
(let ((first (car articles))
(last (progn (while (cdr articles) (setq articles (cdr articles)))
(car articles))))
- (call-process "sed" nil t nil "-e"
- (format "1,/^%d\t/d\n/^%d\t/,$d"
- (1- first) (1+ last)) file)))
+ (call-process "awk" nil t nil
+ (format "BEGIN {firstmsg=%d; lastmsg=%d;}\n $1 >= firstmsg && $1 <= lastmsg {print;}"
+ (1- first) (1+ last))
+ file)))
+;; 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)
- "Return full pathname of an article identified by message-ID."
(save-excursion
- (set-buffer nntp-server-buffer)
+ (set-buffer (get-buffer-create " *nnspool work*"))
+ (buffer-disable-undo (current-buffer))
(erase-buffer)
(call-process "grep" nil t nil id nnspool-history-file)
(goto-char (point-min))
- (if (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\(.*\\)$")
- (concat nnspool-spool-directory
- (nnspool-replace-chars-in-string
- (buffer-substring (match-beginning 1) (match-end 1))
- ?. ?/)))))
+ (prog1
+ (if (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ \t\n]*\\)")
+ (buffer-substring (match-beginning 1) (match-end 1)))
+ (kill-buffer (current-buffer)))))
(defun nnspool-find-file (file)
"Insert FILE in server buffer safely."
(defun nnspool-possibly-change-directory (newsgroup)
(if newsgroup
- (let ((pathname (nnspool-article-pathname
- (nnspool-replace-chars-in-string newsgroup ?. ?/))))
+ (let ((pathname (nnspool-article-pathname newsgroup)))
(if (file-directory-p pathname)
(progn
(setq nnspool-current-directory pathname)
nil))
t))
-(defun nnspool-article-pathname (group)
- "Make pathname for GROUP."
- (concat (file-name-as-directory nnspool-spool-directory) 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."
(ttime (mapcar (lambda (ti) (and ti (string-to-int ti)))
(timezone-parse-time
(aref (timezone-parse-date date) 3))))
- (edate (mapcar (lambda (ti) (and ti (string-to-int ti)))
- (timezone-parse-date "Jan 1 12:00:00 1970")))
- (tday (- (timezone-absolute-from-gregorian
- (nth 1 tdate) (nth 2 tdate) (nth 0 tdate))
- (timezone-absolute-from-gregorian
- (nth 1 edate) (nth 2 edate) (nth 0 edate)))))
- (+ (nth 2 ttime)
- (* (nth 1 ttime) 60)
- (* 1.0 (nth 0 ttime) 60 60)
- (* 1.0 tday 60 60 24))))
+ (unix (encode-time (nth 2 ttime) (nth 1 ttime) (nth 0 ttime)
+ (nth 2 tdate) (nth 1 tdate) (nth 0 tdate)
+ (nth 4 tdate))))
+ (+ (* (car unix) 65536.0)
+ (car (cdr unix)))))
(provide 'nnspool)
projects / gnus / blobdiff