X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndoc.el;h=602d38d2b945eb7fbef5624af626a403c6c229ee;hb=9d7777f783379fb9ded93baf0dc530ca2345610b;hp=b71acf7a6d3c33cc10560235cb29bd32430cf409;hpb=4bad21ab534e6d823faa7955082a9a2fb11f65cd;p=gnus diff --git a/lisp/nndoc.el b/lisp/nndoc.el index b71acf7a6..602d38d2b 100644 --- a/lisp/nndoc.el +++ b/lisp/nndoc.el @@ -1,7 +1,7 @@ ;;; nndoc.el --- single file access for Gnus -;; Copyright (C) 1995,96 Free Software Foundation, Inc. +;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Author: Lars Magne Ingebrigtsen ;; Masanobu UMEDA ;; Keywords: news @@ -27,124 +27,154 @@ ;;; Code: (require 'nnheader) -(require 'rmail) +(require 'message) (require 'nnmail) +(require 'nnoo) +(require 'gnus-util) +(require 'mm-util) (eval-when-compile (require 'cl)) -(defvar nndoc-article-type 'guess +(nnoo-declare nndoc) + +(defvoo nndoc-article-type 'guess "*Type of the file. One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', -`mime-digest', `standard-digest', `slack-digest', `clari-briefs' or -`guess'.") +`rfc934', `rfc822-forward', `mime-parts', `standard-digest', +`slack-digest', `clari-briefs', `nsmail' or `guess'.") -(defvar nndoc-post-type 'mail +(defvoo nndoc-post-type 'mail "*Whether the nndoc group is `mail' or `post'.") -(defvar nndoc-type-alist - `((mmdf +(defvoo nndoc-open-document-hook 'nnheader-ms-strip-cr + "Hook run after opening a document. +The default function removes all trailing carriage returns +from the document.") + +(defvar nndoc-type-alist + `((mmdf (article-begin . "^\^A\^A\^A\^A\n") (body-end . "^\^A\^A\^A\^A\n")) + (nsmail + (article-begin . "^From - ")) (news (article-begin . "^Path:")) (rnews (article-begin . "^#! *rnews +\\([0-9]+\\) *\n") (body-end-function . nndoc-rnews-body-end)) - (mbox - (article-begin . - ,(let ((delim (concat "^" rmail-unix-mail-delimiter))) - (if (string-match "\n\\'" delim) - (substring delim 0 (match-beginning 0)) - delim))) + (mbox + (article-begin-function . nndoc-mbox-article-begin) (body-end-function . nndoc-mbox-body-end)) - (babyl + (babyl (article-begin . "\^_\^L *\n") (body-end . "\^_") (body-begin-function . nndoc-babyl-body-begin) - (head-begin . "^[0-9].*\n")) + (head-begin-function . nndoc-babyl-head-begin)) (forward (article-begin . "^-+ Start of forwarded message -+\n+") - (body-end . "^-+ End of forwarded message -+\n")) + (body-end . "^-+ End of forwarded message -+$") + (prepare-body-function . nndoc-unquote-dashes)) + (rfc934 + (article-begin . "^--.*\n+") + (body-end . "^--.*$") + (prepare-body-function . nndoc-unquote-dashes)) (clari-briefs (article-begin . "^ \\*") (body-end . "^\t------*[ \t]^*\n^ \\*") (body-begin . "^\t") (head-end . "^\t") - (generate-head . nndoc-generate-clari-briefs-head) - (article-transform . nndoc-transform-clari-briefs)) - (slack-digest - (article-begin . "^------------------------------*[\n \t]+") - (head-end . "^ ?$") - (body-end-function . nndoc-digest-body-end) - (body-begin . "^ ?$") - (file-end . "^End of") - (prepare-body . nndoc-prepare-digest-body)) + (generate-head-function . nndoc-generate-clari-briefs-head) + (article-transform-function . nndoc-transform-clari-briefs)) (mime-digest (article-begin . "") (head-end . "^ ?$") (body-end . "") - (file-end . "")) + (file-end . "") + (subtype digest guess)) + (mime-parts + (generate-head-function . nndoc-generate-mime-parts-head) + (article-transform-function . nndoc-transform-mime-parts)) (standard-digest - (first-article . ,(concat "^" (make-string 70 ?-) "\n\n+")) - (article-begin . ,(concat "\n\n" (make-string 30 ?-) "\n\n+")) - (prepare-body . nndoc-prepare-digest-body) + (first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+")) + (article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+")) + (prepare-body-function . nndoc-unquote-dashes) + (body-end-function . nndoc-digest-body-end) + (head-end . "^ *$") + (body-begin . "^ *\n") + (file-end . "^End of .*digest.*[0-9].*\n\\*\\*\\|^End of.*Digest *$") + (subtype digest guess)) + (slack-digest + (article-begin . "^------------------------------*[\n \t]+") + (head-end . "^ ?$") (body-end-function . nndoc-digest-body-end) - (file-end . "^End of .*digest.*[0-9].*\n\\*\\*\\|^End of.*Digest *$")) - (guess - (guess . nndoc-guess-type)) + (body-begin . "^ ?$") + (file-end . "^End of") + (prepare-body-function . nndoc-unquote-dashes) + (subtype digest guess)) + (lanl-gov-announce + (article-begin . "^\\\\\\\\\n") + (head-begin . "^Paper.*:") + (head-end . "\\(^\\\\\\\\.*\n\\|-----------------\\)") + (body-begin . "") + (body-end . "-------------------------------------------------") + (file-end . "^Title: Recent Seminal") + (generate-head-function . nndoc-generate-lanl-gov-head) + (article-transform-function . nndoc-transform-lanl-gov-announce) + (subtype preprints guess)) + (rfc822-forward + (article-begin . "^\n") + (body-end-function . nndoc-rfc822-forward-body-end-function)) + (guess + (guess . t) + (subtype nil)) (digest - (guess . nndoc-guess-digest-type)) - )) + (guess . t) + (subtype nil)) + (preprints + (guess . t) + (subtype nil)))) - -(defvar nndoc-file-begin nil) -(defvar nndoc-first-article nil) -(defvar nndoc-article-end nil) -(defvar nndoc-article-begin nil) -(defvar nndoc-head-begin nil) -(defvar nndoc-head-end nil) -(defvar nndoc-file-end nil) -(defvar nndoc-body-begin nil) -(defvar nndoc-body-end-function nil) -(defvar nndoc-body-begin-function nil) -(defvar nndoc-body-end nil) -(defvar nndoc-dissection-alist nil) -(defvar nndoc-prepare-body nil) -(defvar nndoc-generate-head nil) -(defvar nndoc-article-transform nil) - -(defvar nndoc-current-server nil) -(defvar nndoc-server-alist nil) -(defvar nndoc-server-variables - `((nndoc-article-type ,nndoc-article-type) - (nndoc-article-begin nil) - (nndoc-article-end nil) - (nndoc-head-begin nil) - (nndoc-head-end nil) - (nndoc-first-article nil) - (nndoc-current-buffer nil) - (nndoc-group-alist nil) - (nndoc-end-of-file nil) - (nndoc-body-begin nil) - (nndoc-address nil))) +(defvoo nndoc-file-begin nil) +(defvoo nndoc-first-article nil) +(defvoo nndoc-article-begin nil) +(defvoo nndoc-head-begin nil) +(defvoo nndoc-head-end nil) +(defvoo nndoc-file-end nil) +(defvoo nndoc-body-begin nil) +(defvoo nndoc-body-end-function nil) +(defvoo nndoc-body-begin-function nil) +(defvoo nndoc-head-begin-function nil) +(defvoo nndoc-body-end nil) +;; nndoc-dissection-alist is a list of sublists. Each sublist holds the +;; following items. ARTICLE acts as the association key and is an ordinal +;; starting at 1. HEAD-BEGIN [0], HEAD-END [1], BODY-BEGIN [2] and BODY-END +;; [3] are positions in the `nndoc' buffer. LINE-COUNT [4] is a count of +;; lines in the body. For MIME dissections only, ARTICLE-INSERT [5] and +;; SUMMARY-INSERT [6] give headers to insert for full article or summary line +;; generation, respectively. Other headers usually follow directly from the +;; buffer. Value `nil' means no insert. +(defvoo nndoc-dissection-alist nil) +(defvoo nndoc-prepare-body-function nil) +(defvoo nndoc-generate-head-function nil) +(defvoo nndoc-article-transform-function nil) +(defvoo nndoc-article-begin-function nil) + +(defvoo nndoc-status-string "") +(defvoo nndoc-group-alist nil) +(defvoo nndoc-current-buffer nil + "Current nndoc news buffer.") +(defvoo nndoc-address nil) (defconst nndoc-version "nndoc 1.0" "nndoc version.") -(defvar nndoc-current-buffer nil - "Current nndoc news buffer.") - -(defvar nndoc-address nil) - -(defvar nndoc-status-string "") - -(defvar nndoc-group-alist nil) - ;;; Interface functions -(defun nndoc-retrieve-headers (articles &optional newsgroup server fetch-old) +(nnoo-define-basics nndoc) + +(deffoo nndoc-retrieve-headers (articles &optional newsgroup server fetch-old) (when (nndoc-possibly-change-buffer newsgroup server) (save-excursion (set-buffer nntp-server-buffer) @@ -156,34 +186,20 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (when (setq entry (cdr (assq (setq article (pop articles)) nndoc-dissection-alist))) (insert (format "221 %d Article retrieved.\n" article)) - (if nndoc-generate-head - (funcall nndoc-generate-head article) + (if nndoc-generate-head-function + (funcall nndoc-generate-head-function article) (insert-buffer-substring nndoc-current-buffer (car entry) (nth 1 entry))) (goto-char (point-max)) - (or (= (char-after (1- (point))) ?\n) (insert "\n")) + (unless (eq (char-after (1- (point))) ?\n) + (insert "\n")) (insert (format "Lines: %d\n" (nth 4 entry))) (insert ".\n"))) (nnheader-fold-continuation-lines) 'headers))))) -(defun nndoc-open-server (server &optional defs) - (nnheader-change-server 'nndoc server defs)) - -(defun nndoc-close-server (&optional server) - (setq nndoc-current-server nil) - t) - -(defun nndoc-server-opened (&optional server) - (and (equal server nndoc-current-server) - nntp-server-buffer - (buffer-name nntp-server-buffer))) - -(defun nndoc-status-message (&optional server) - nndoc-status-string) - -(defun nndoc-request-article (article &optional newsgroup server buffer) +(deffoo nndoc-request-article (article &optional newsgroup server buffer) (nndoc-possibly-change-buffer newsgroup server) (save-excursion (let ((buffer (or buffer nntp-server-buffer)) @@ -191,25 +207,26 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', beg) (set-buffer buffer) (erase-buffer) - (if (stringp article) - nil - (insert-buffer-substring - nndoc-current-buffer (car entry) (nth 1 entry)) - (insert "\n") - (setq beg (point)) - (insert-buffer-substring - nndoc-current-buffer (nth 2 entry) (nth 3 entry)) - (goto-char beg) - (when nndoc-prepare-body - (funcall nndoc-prepare-body)) - (when nndoc-article-transform - (funcall nndoc-article-transform article)) - t)))) - -(defun nndoc-request-group (group &optional server dont-check) + (when entry + (if (stringp article) + nil + (insert-buffer-substring + nndoc-current-buffer (car entry) (nth 1 entry)) + (insert "\n") + (setq beg (point)) + (insert-buffer-substring + nndoc-current-buffer (nth 2 entry) (nth 3 entry)) + (goto-char beg) + (when nndoc-prepare-body-function + (funcall nndoc-prepare-body-function)) + (when nndoc-article-transform-function + (funcall nndoc-article-transform-function article)) + t))))) + +(deffoo nndoc-request-group (group &optional server dont-check) "Select news GROUP." (let (number) - (cond + (cond ((not (nndoc-possibly-change-buffer group server)) (nnheader-report 'nndoc "No such file or buffer: %s" nndoc-address)) @@ -222,12 +239,12 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (t (nnheader-insert "211 %d %d %d %s\n" number 1 number group))))) -(defun nndoc-request-type (group &optional article) +(deffoo nndoc-request-type (group &optional article) (cond ((not article) 'unknown) (nndoc-post-type nndoc-post-type) (t 'unknown))) -(defun nndoc-close-group (group &optional server) +(deffoo nndoc-close-group (group &optional server) (nndoc-possibly-change-buffer group server) (and nndoc-current-buffer (buffer-name nndoc-current-buffer) @@ -235,80 +252,278 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (setq nndoc-group-alist (delq (assoc group nndoc-group-alist) nndoc-group-alist)) (setq nndoc-current-buffer nil) - (setq nndoc-current-server nil) + (nnoo-close-server 'nndoc server) (setq nndoc-dissection-alist nil) t) -(defun nndoc-request-list (&optional server) +(deffoo nndoc-request-list (&optional server) nil) -(defun nndoc-request-newgroups (date &optional server) +(deffoo nndoc-request-newgroups (date &optional server) nil) -(defun nndoc-request-list-newsgroups (&optional server) +(deffoo nndoc-request-list-newsgroups (&optional server) nil) -(defalias 'nndoc-request-post 'nnmail-request-post) - ;;; Internal functions. (defun nndoc-possibly-change-buffer (group source) (let (buf) - (cond + (cond ;; The current buffer is this group's buffer. ((and nndoc-current-buffer (buffer-name nndoc-current-buffer) - (eq nndoc-current-buffer + (eq nndoc-current-buffer (setq buf (cdr (assoc group nndoc-group-alist)))))) ;; We change buffers by taking an old from the group alist. - ;; `source' is either a string (a file name) or a buffer object. + ;; `source' is either a string (a file name) or a buffer object. (buf (setq nndoc-current-buffer buf)) - ;; It's a totally new group. + ;; It's a totally new group. ((or (and (bufferp nndoc-address) (buffer-name nndoc-address)) (and (stringp nndoc-address) (file-exists-p nndoc-address) (not (file-directory-p nndoc-address)))) - (push (cons group (setq nndoc-current-buffer - (get-buffer-create + (push (cons group (setq nndoc-current-buffer + (get-buffer-create (concat " *nndoc " group "*")))) nndoc-group-alist) (setq nndoc-dissection-alist nil) (save-excursion (set-buffer nndoc-current-buffer) - (buffer-disable-undo (current-buffer)) (erase-buffer) (if (stringp nndoc-address) - (insert-file-contents nndoc-address) - (insert-buffer-substring nndoc-address))))) + (nnheader-insert-file-contents nndoc-address) + (insert-buffer-substring nndoc-address)) + (run-hooks 'nndoc-open-document-hook)))) ;; Initialize the nndoc structures according to this new document. (when (and nndoc-current-buffer (not nndoc-dissection-alist)) (save-excursion (set-buffer nndoc-current-buffer) (nndoc-set-delims) - (nndoc-dissect-buffer))) + (if (eq nndoc-article-type 'mime-parts) + (nndoc-dissect-mime-parts) + (nndoc-dissect-buffer)))) (unless nndoc-current-buffer (nndoc-close-server)) ;; Return whether we managed to select a file. nndoc-current-buffer)) -;; MIME (RFC 1341) digest hack by Ulrik Dickow . -(defun nndoc-guess-digest-type () - "Guess what digest type the current document is." - (let ((case-fold-search t) ; We match a bit too much, keep it simple. - boundary-id b-delimiter entry) +;;; +;;; Deciding what document type we have +;;; + +(defun nndoc-set-delims () + "Set the nndoc delimiter variables according to the type of the document." + (let ((vars '(nndoc-file-begin + nndoc-first-article + nndoc-article-begin-function + nndoc-head-begin nndoc-head-end + nndoc-file-end nndoc-article-begin + nndoc-body-begin nndoc-body-end-function nndoc-body-end + nndoc-prepare-body-function nndoc-article-transform-function + nndoc-generate-head-function nndoc-body-begin-function + nndoc-head-begin-function))) + (while vars + (set (pop vars) nil))) + (let (defs) + ;; Guess away until we find the real file type. + (while (assq 'guess (setq defs (cdr (assq nndoc-article-type + nndoc-type-alist)))) + (setq nndoc-article-type (nndoc-guess-type nndoc-article-type))) + ;; Set the nndoc variables. + (while defs + (set (intern (format "nndoc-%s" (caar defs))) + (cdr (pop defs)))))) + +(defun nndoc-guess-type (subtype) + (let ((alist nndoc-type-alist) + results result entry) + (while (and (not result) + (setq entry (pop alist))) + (when (memq subtype (or (cdr (assq 'subtype entry)) '(guess))) + (goto-char (point-min)) + ;; Remove blank lines. + (while (eq (following-char) ?\n) + (delete-char 1)) + (when (numberp (setq result (funcall (intern + (format "nndoc-%s-type-p" + (car entry)))))) + (push (cons result entry) results) + (setq result nil)))) + (unless (or result results) + (error "Document is not of any recognized type")) + (if result + (car entry) + (cadar (sort results 'car-less-than-car))))) + +;;; +;;; Built-in type predicates and functions +;;; + +(defun nndoc-mbox-type-p () + (when (looking-at message-unix-mail-delimiter) + t)) + +(defun nndoc-mbox-article-begin () + (when (re-search-forward (concat "^" message-unix-mail-delimiter) nil t) + (goto-char (match-beginning 0)))) + +(defun nndoc-mbox-body-end () + (let ((beg (point)) + len end) + (when + (save-excursion + (and (re-search-backward + (concat "^" message-unix-mail-delimiter) nil t) + (setq end (point)) + (search-forward "\n\n" beg t) + (re-search-backward + "^Content-Length:[ \t]*\\([0-9]+\\) *$" end t) + (setq len (string-to-int (match-string 1))) + (search-forward "\n\n" beg t) + (unless (= (setq len (+ (point) len)) (point-max)) + (and (< len (point-max)) + (goto-char len) + (looking-at message-unix-mail-delimiter))))) + (goto-char len)))) + +(defun nndoc-mmdf-type-p () + (when (looking-at "\^A\^A\^A\^A$") + t)) + +(defun nndoc-news-type-p () + (when (looking-at "^Path:.*\n") + t)) + +(defun nndoc-rnews-type-p () + (when (looking-at "#! *rnews") + t)) + +(defun nndoc-rnews-body-end () + (and (re-search-backward nndoc-article-begin nil t) + (forward-line 1) + (goto-char (+ (point) (string-to-int (match-string 1)))))) + +(defun nndoc-babyl-type-p () + (when (re-search-forward "\^_\^L *\n" nil t) + t)) + +(defun nndoc-babyl-body-begin () + (re-search-forward "^\n" nil t) + (when (looking-at "\\*\\*\\* EOOH \\*\\*\\*") + (let ((next (or (save-excursion + (re-search-forward nndoc-article-begin nil t)) + (point-max)))) + (unless (re-search-forward "^\n" next t) + (goto-char next) + (forward-line -1) + (insert "\n") + (forward-line -1))))) + +(defun nndoc-babyl-head-begin () + (when (re-search-forward "^[0-9].*\n" nil t) + (when (looking-at "\\*\\*\\* EOOH \\*\\*\\*") + (forward-line 1)) + t)) + +(defun nndoc-forward-type-p () + (when (and (re-search-forward "^-+ Start of forwarded message -+\n+" nil t) + (not (re-search-forward "^Subject:.*digest" nil t)) + (not (re-search-backward "^From:" nil t 2)) + (not (re-search-forward "^From:" nil t 2))) + t)) + +(defun nndoc-rfc934-type-p () + (when (and (re-search-forward "^-+ Start of forwarded.*\n+" nil t) + (not (re-search-forward "^Subject:.*digest" nil t)) + (not (re-search-backward "^From:" nil t 2)) + (not (re-search-forward "^From:" nil t 2))) + t)) + +(defun nndoc-rfc822-forward-type-p () + (save-restriction + (message-narrow-to-head) + (when (re-search-forward "^Content-Type: *message/rfc822" nil t) + t))) + +(defun nndoc-rfc822-forward-body-end-function () + (goto-char (point-max))) + +(defun nndoc-mime-parts-type-p () + (let ((case-fold-search t) + (limit (search-forward "\n\n" nil t))) (goto-char (point-min)) - (cond - ;; MIME digest. - ((and - (re-search-forward - (concat "^Content-Type: *multipart/digest;[ \t\n]*[ \t]" - "boundary=\"\\([^\"\n]*[^\" \t\n]\\)\"") - nil t) - (match-beginning 1)) + (when (and limit + (re-search-forward + (concat "\ +^Content-Type:[ \t]*multipart/[a-z]+ *; *\\(\\(\n[ \t]\\)?.*;\\)*" + "\\(\n[ \t]\\)?[ \t]*boundary=\"?[^\"\n]*[^\" \t\n]") + limit t)) + t))) + +(defun nndoc-transform-mime-parts (article) + (let* ((entry (cdr (assq article nndoc-dissection-alist))) + (headers (nth 5 entry))) + (when headers + (goto-char (point-min)) + (insert headers)))) + +(defun nndoc-generate-mime-parts-head (article) + (let* ((entry (cdr (assq article nndoc-dissection-alist))) + (headers (nth 6 entry))) + (save-restriction + (narrow-to-region (point) (point)) + (insert-buffer-substring + nndoc-current-buffer (car entry) (nth 1 entry)) + (goto-char (point-max))) + (when headers + (insert headers)))) + +(defun nndoc-clari-briefs-type-p () + (when (let ((case-fold-search nil)) + (re-search-forward "^\t[^a-z]+ ([^a-z]+) --" nil t)) + t)) + +(defun nndoc-transform-clari-briefs (article) + (goto-char (point-min)) + (when (looking-at " *\\*\\(.*\\)\n") + (replace-match "" t t)) + (nndoc-generate-clari-briefs-head article)) + +(defun nndoc-generate-clari-briefs-head (article) + (let ((entry (cdr (assq article nndoc-dissection-alist))) + subject from) + (save-excursion + (set-buffer nndoc-current-buffer) + (save-restriction + (narrow-to-region (car entry) (nth 3 entry)) + (goto-char (point-min)) + (when (looking-at " *\\*\\(.*\\)$") + (setq subject (match-string 1)) + (when (string-match "[ \t]+$" subject) + (setq subject (substring subject 0 (match-beginning 0))))) + (when + (let ((case-fold-search nil)) + (re-search-forward + "^\t\\([^a-z]+\\(,[^(]+\\)? ([^a-z]+)\\) --" nil t)) + (setq from (match-string 1))))) + (insert "From: " "clari@clari.net (" (or from "unknown") ")" + "\nSubject: " (or subject "(no subject)") "\n"))) + + +(defun nndoc-mime-digest-type-p () + (let ((case-fold-search t) + boundary-id b-delimiter entry) + (when (and + (re-search-forward + (concat "^Content-Type: *multipart/digest;[ \t\n]*[ \t]" + "boundary=\"?\\([^\"\n]*[^\" \t\n]\\)") + nil t) + (match-beginning 1)) (setq boundary-id (match-string 1) b-delimiter (concat "\n--" boundary-id "[\n \t]+")) (setq entry (assq 'mime-digest nndoc-type-alist)) @@ -318,63 +533,69 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (cons 'body-begin "^ ?\n") (cons 'article-begin b-delimiter) (cons 'body-end-function 'nndoc-digest-body-end) -; (cons 'body-end -; (concat "\n--" boundary-id "\\(--\\)?[\n \t]+")) (cons 'file-end (concat "\n--" boundary-id "--[ \t]*$")))) - 'mime-digest) - ;; Standard digest. - ((and (re-search-forward (concat "^" (make-string 70 ?-) "\n\n") nil t) - (re-search-forward - (concat "\n\n" (make-string 30 ?-) "\n\n") nil t)) - 'standard-digest) - ;; Stupid digest. - (t - 'slack-digest)))) + t))) -(defun nndoc-guess-type () - "Guess what document type is in the current buffer." - (goto-char (point-min)) - (cond - ((looking-at rmail-unix-mail-delimiter) - 'mbox) - ((looking-at "\^A\^A\^A\^A$") - 'mmdf) - ((looking-at "^Path:.*\n") - 'news) - ((looking-at "#! *rnews") - 'rnews) - ((re-search-forward "\^_\^L *\n" nil t) - 'babyl) - ((save-excursion - (and (re-search-forward "^-+ Start of forwarded message -+\n+" nil t) - (not (re-search-forward "^Subject:.*digest" nil t)))) - 'forward) - ((let ((case-fold-search nil)) - (re-search-forward "^\t[^a-z]+ ([^a-z]+) --" nil t)) - 'clari-briefs) - (t - 'digest))) +(defun nndoc-standard-digest-type-p () + (when (and (re-search-forward (concat "^" (make-string 70 ?-) "\n\n") nil t) + (re-search-forward + (concat "\n\n" (make-string 30 ?-) "\n\n") nil t)) + t)) -(defun nndoc-set-delims () - "Set the nndoc delimiter variables according to the type of the document." - (let ((vars '(nndoc-file-begin - nndoc-first-article - nndoc-article-end nndoc-head-begin nndoc-head-end - nndoc-file-end nndoc-article-begin - nndoc-body-begin nndoc-body-end-function nndoc-body-end - nndoc-prepare-body nndoc-article-transform - nndoc-generate-head nndoc-body-begin-function))) - (while vars - (set (pop vars) nil))) - (let* (defs guess) - ;; Guess away until we find the real file type. - (while (setq defs (cdr (assq nndoc-article-type nndoc-type-alist)) - guess (assq 'guess defs)) - (setq nndoc-article-type (funcall (cdr guess)))) - ;; Set the nndoc variables. - (while defs - (set (intern (format "nndoc-%s" (car (car defs)))) - (cdr (pop defs)))))) +(defun nndoc-digest-body-end () + (and (re-search-forward nndoc-article-begin nil t) + (goto-char (match-beginning 0)))) + +(defun nndoc-slack-digest-type-p () + 0) + +(defun nndoc-lanl-gov-announce-type-p () + (when (let ((case-fold-search nil)) + (re-search-forward "^\\\\\\\\\nPaper: [a-z-]+/[0-9]+" nil t)) + t)) + +(defun nndoc-transform-lanl-gov-announce (article) + (goto-char (point-max)) + (when (re-search-backward "^\\\\\\\\ +(\\([^ ]*\\) , *\\([^ ]*\\))" nil t) + (replace-match "\n\nGet it at \\1 (\\2)" t nil)) + ;; (when (re-search-backward "^\\\\\\\\$" nil t) + ;; (replace-match "" t t)) + ) + +(defun nndoc-generate-lanl-gov-head (article) + (let ((entry (cdr (assq article nndoc-dissection-alist))) + (e-mail "no address given") + subject from) + (save-excursion + (set-buffer nndoc-current-buffer) + (save-restriction + (narrow-to-region (car entry) (nth 1 entry)) + (goto-char (point-min)) + (when (looking-at "^Paper.*: \\([a-z-]+/[0-9]+\\)") + (setq subject (concat " (" (match-string 1) ")")) + (when (re-search-forward "^From: \\([^ ]+\\)" nil t) + (setq e-mail (match-string 1))) + (when (re-search-forward "^Title: \\([^\f]*\\)\nAuthors?: \\(.*\\)" + nil t) + (setq subject (concat (match-string 1) subject)) + (setq from (concat (match-string 2) " <" e-mail ">")))) + )) + (while (and from (string-match "(\[^)\]*)" from)) + (setq from (replace-match "" t t from))) + (insert "From: " (or from "unknown") + "\nSubject: " (or subject "(no subject)") "\n"))) + +(defun nndoc-nsmail-type-p () + (when (looking-at "From - ") + t)) + +(deffoo nndoc-request-accept-article (group &optional server last) + nil) + + +;;; +;;; Functions for dissecting the documents +;;; (defun nndoc-search (regexp) (prog1 @@ -390,18 +611,24 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (save-excursion (set-buffer nndoc-current-buffer) (goto-char (point-min)) + ;; Remove blank lines. + (while (eq (following-char) ?\n) + (delete-char 1)) ;; Find the beginning of the file. (when nndoc-file-begin (nndoc-search nndoc-file-begin)) ;; Go through the file. (while (if (and first nndoc-first-article) (nndoc-search nndoc-first-article) - (nndoc-search nndoc-article-begin)) + (nndoc-article-begin)) (setq first nil) - (when nndoc-head-begin - (nndoc-search nndoc-head-begin)) - (if (and nndoc-file-end - (looking-at nndoc-file-end)) + (cond (nndoc-head-begin-function + (funcall nndoc-head-begin-function)) + (nndoc-head-begin + (nndoc-search nndoc-head-begin))) + (if (or (eobp) + (and nndoc-file-end + (looking-at nndoc-file-end))) (goto-char (point-max)) (setq head-begin (point)) (nndoc-search (or nndoc-head-end "^$")) @@ -414,7 +641,7 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (funcall nndoc-body-end-function)) (and nndoc-body-end (nndoc-search nndoc-body-end)) - (nndoc-search nndoc-article-begin) + (nndoc-article-begin) (progn (goto-char (point-max)) (when nndoc-file-end @@ -425,66 +652,172 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward', (count-lines body-begin body-end)) nndoc-dissection-alist)))))) -(defun nndoc-prepare-digest-body () +(defun nndoc-article-begin () + (if nndoc-article-begin-function + (funcall nndoc-article-begin-function) + (ignore-errors + (nndoc-search nndoc-article-begin)))) + +(defun nndoc-unquote-dashes () "Unquote quoted non-separators in digests." (while (re-search-forward "^- -"nil t) (replace-match "-" t t))) -(defun nndoc-digest-body-end () - (and (re-search-forward nndoc-article-begin nil t) - (goto-char (match-beginning 0)))) +;; Against compiler warnings. +(defvar nndoc-mime-split-ordinal) -(defun nndoc-mbox-body-end () - (let ((beg (point)) - len end) - (when - (save-excursion - (and (re-search-backward nndoc-article-begin nil t) - (setq end (point)) - (search-forward "\n\n" beg t) - (re-search-backward - "^Content-Length:[ \t]*\\([0-9]+\\) *$" end t) - (setq len (string-to-int (match-string 1))) - (search-forward "\n\n" beg t) - (or (= (setq len (+ (point) len)) (point-max)) - (and (< len (point-max)) - (goto-char len) - (looking-at nndoc-article-begin))))) - (goto-char len)))) - -(defun nndoc-rnews-body-end () - (and (re-search-backward nndoc-article-begin nil t) - (forward-line 1) - (goto-char (+ (point) (string-to-int (match-string 1)))))) - -(defun nndoc-transform-clari-briefs (article) - (goto-char (point-min)) - (when (looking-at " *\\*\\(.*\\)\n") - (replace-match "" t t)) - (nndoc-generate-clari-briefs-head article)) - -(defun nndoc-generate-clari-briefs-head (article) - (let ((entry (cdr (assq article nndoc-dissection-alist))) - subject from) - (save-excursion - (set-buffer nndoc-current-buffer) - (save-restriction - (narrow-to-region (car entry) (nth 3 entry)) - (goto-char (point-min)) - (when (looking-at " *\\*\\(.*\\)$") - (setq subject (match-string 1))) - (when - (let ((case-fold-search nil)) - (re-search-forward - "^\t\\([^a-z]+\\(,[^(]+\\)? ([^a-z]+)\\) --" nil t)) - (setq from (match-string 1))))) - (insert "From: " "clari@clari.net (" (or from "unknown") ")" - "\nSubject: " (or subject "(no subject)") "\n"))) - -(defun nndoc-babyl-body-begin () - (re-search-forward "^\n" nil t) - (when (looking-at "\*\*\* EOOH \*\*\*") - (re-search-forward "^\n" nil t))) +(defun nndoc-dissect-mime-parts () + "Go through a MIME composite article and partition it into sub-articles. +When a MIME entity contains sub-entities, dissection produces one article for +the header of this entity, and one article per sub-entity." + (setq nndoc-dissection-alist nil + nndoc-mime-split-ordinal 0) + (save-excursion + (set-buffer nndoc-current-buffer) + (nndoc-dissect-mime-parts-sub (point-min) (point-max) nil nil nil))) + +(defun nndoc-dissect-mime-parts-sub (head-begin body-end article-insert + position parent) + "Dissect an entity, within a composite MIME message. +The complete message or MIME entity extends from HEAD-BEGIN to BODY-END. +ARTICLE-INSERT should be added at beginning for generating a full article. +The string POSITION holds a dotted decimal representation of the article +position in the hierarchical structure, it is nil for the outer entity. +PARENT is the message-ID of the parent summary line, or nil for none." + (let ((case-fold-search t) + (message-id (nnmail-message-id)) + head-end body-begin summary-insert message-rfc822 multipart-any + subject content-type type subtype boundary-regexp) + ;; Gracefully handle a missing body. + (goto-char head-begin) + (if (search-forward "\n\n" body-end t) + (setq head-end (1- (point)) + body-begin (point)) + (setq head-end body-end + body-begin body-end)) + (narrow-to-region head-begin head-end) + ;; Save MIME attributes. + (goto-char head-begin) + (setq content-type (message-fetch-field "Content-Type")) + (when content-type + (when (string-match + "^ *\\([^ \t\n/;]+\\)/\\([^ \t\n/;]+\\)" content-type) + (setq type (downcase (match-string 1 content-type)) + subtype (downcase (match-string 2 content-type)) + message-rfc822 (and (string= type "message") + (string= subtype "rfc822")) + multipart-any (string= type "multipart"))) + (when (string-match ";[ \t\n]*name=\\([^ \t\n;]+\\)" content-type) + (setq subject (match-string 1 content-type))) + (when (string-match "boundary=\"?\\([^\"\n]*[^\" \t\n]\\)" content-type) + (setq boundary-regexp (concat "^--" + (regexp-quote + (match-string 1 content-type)) + "\\(--\\)?[ \t]*\n")))) + (unless subject + (when (or multipart-any (not article-insert)) + (setq subject (message-fetch-field "Subject")))) + (unless type + (setq type "text" + subtype "plain")) + ;; Prepare the article and summary inserts. + (unless article-insert + (setq article-insert (buffer-substring (point-min) (point-max)) + head-end head-begin)) + (setq summary-insert article-insert) + ;; - summary Subject. + (setq summary-insert + (let ((line (concat "Subject: <" position + (and position multipart-any ".") + (and multipart-any "*") + (and (or position multipart-any) " ") + (cond ((string= subtype "plain") type) + ((string= subtype "basic") type) + (t subtype)) + ">" + (and subject " ") + subject + "\n"))) + (if (string-match "Subject:.*\n\\([ \t].*\n\\)*" summary-insert) + (replace-match line t t summary-insert) + (concat summary-insert line)))) + ;; - summary Message-ID. + (setq summary-insert + (let ((line (concat "Message-ID: " message-id "\n"))) + (if (string-match "Message-ID:.*\n\\([ \t].*\n\\)*" summary-insert) + (replace-match line t t summary-insert) + (concat summary-insert line)))) + ;; - summary References. + (when parent + (setq summary-insert + (let ((line (concat "References: " parent "\n"))) + (if (string-match "References:.*\n\\([ \t].*\n\\)*" + summary-insert) + (replace-match line t t summary-insert) + (concat summary-insert line))))) + ;; Generate dissection information for this entity. + (push (list (incf nndoc-mime-split-ordinal) + head-begin head-end body-begin body-end + (count-lines body-begin body-end) + article-insert summary-insert) + nndoc-dissection-alist) + ;; Recurse for all sub-entities, if any. + (widen) + (cond + (message-rfc822 + (save-excursion + (nndoc-dissect-mime-parts-sub body-begin body-end nil + position message-id))) + ((and multipart-any boundary-regexp) + (let ((part-counter 0) + part-begin part-end eof-flag) + (while (string-match "\ +^\\(Lines\\|Content-\\(Type\\|Transfer-Encoding\\)\\):.*\n\\([ \t].*\n\\)*" + article-insert) + (setq article-insert (replace-match "" t t article-insert))) + (let ((case-fold-search nil)) + (goto-char body-begin) + (setq eof-flag (not (re-search-forward boundary-regexp body-end t))) + (while (not eof-flag) + (setq part-begin (point)) + (cond ((re-search-forward boundary-regexp body-end t) + (or (not (match-string 1)) + (string= (match-string 1) "") + (setq eof-flag t)) + (forward-line -1) + (setq part-end (point)) + (forward-line 1)) + (t (setq part-end body-end + eof-flag t))) + (save-excursion + (nndoc-dissect-mime-parts-sub + part-begin part-end article-insert + (concat position + (and position ".") + (format "%d" (incf part-counter))) + message-id))))))))) + +;;;###autoload +(defun nndoc-add-type (definition &optional position) + "Add document DEFINITION to the list of nndoc document definitions. +If POSITION is nil or `last', the definition will be added +as the last checked definition, if t or `first', add as the +first definition, and if any other symbol, add after that +symbol in the alist." + ;; First remove any old instances. + (gnus-pull (car definition) nndoc-type-alist) + ;; Then enter the new definition in the proper place. + (cond + ((or (null position) (eq position 'last)) + (setq nndoc-type-alist (nconc nndoc-type-alist (list definition)))) + ((or (eq position t) (eq position 'first)) + (push definition nndoc-type-alist)) + (t + (let ((list (memq (assq position nndoc-type-alist) + nndoc-type-alist))) + (unless list + (error "No such position: %s" position)) + (setcdr list (cons definition (cdr list))))))) (provide 'nndoc)