Commit 95fa1ff7 authored by ShengHuo ZHU's avatar ShengHuo ZHU
Browse files

* mm-util.el, nnultimate.el, nnweb.el, nnslashdot.el: Sync with

	the Gnus CVS.

	* mm-util.el (mm-mime-mule-charset-alist): Move down and call
	mm-coding-system-p. Don't correct it only in XEmacs.
	(mm-charset-to-coding-system): Use mm-coding-system-p and
	mm-get-coding-system-list.
	(mm-emacs-mule, mm-mule4-p): New.
	(mm-enable-multibyte, mm-disable-multibyte,
	mm-enable-multibyte-mule4, mm-disable-multibyte-mule4,
	mm-with-unibyte-current-buffer,
	mm-with-unibyte-current-buffer-mule4): Use them.
	(mm-find-mime-charset-region): Treat iso-2022-jp.

	From  Dave Love  <fx@gnu.org>:

	* mm-util.el (mm-mime-mule-charset-alist): Make it correct by
	construction.
	(mm-charset-synonym-alist): Remove windows-125[02].  Make other
	entries conditional on not having a coding system defined for
	them.
	(mm-mule-charset-to-mime-charset): Use
	find-coding-systems-for-charsets if defined.
	(mm-charset-to-coding-system): Don't use
	mm-get-coding-system-list.  Look in mm-charset-synonym-alist
	later.  Add last resort search of coding systems.
	(mm-enable-multibyte-mule4, mm-disable-multibyte-mule4)
	(mm-with-unibyte-current-buffer-mule4): Just treat Mule 5 like
	Mule 4.
	(mm-find-mime-charset-region): Re-write.
	(mm-with-unibyte-current-buffer): Restore buffer as well as
	multibyteness.
parent bf9bb76f
2001-10-30 ShengHuo ZHU <zsh@cs.rochester.edu>
* mm-util.el, nnultimate.el, nnweb.el, nnslashdot.el: Sync with
the Gnus CVS.
* mm-util.el (mm-mime-mule-charset-alist): Move down and call
mm-coding-system-p. Don't correct it only in XEmacs.
(mm-charset-to-coding-system): Use mm-coding-system-p and
mm-get-coding-system-list.
(mm-emacs-mule, mm-mule4-p): New.
(mm-enable-multibyte, mm-disable-multibyte,
mm-enable-multibyte-mule4, mm-disable-multibyte-mule4,
mm-with-unibyte-current-buffer,
mm-with-unibyte-current-buffer-mule4): Use them.
(mm-find-mime-charset-region): Treat iso-2022-jp.
From Dave Love <fx@gnu.org>:
* mm-util.el (mm-mime-mule-charset-alist): Make it correct by
construction.
(mm-charset-synonym-alist): Remove windows-125[02]. Make other
entries conditional on not having a coding system defined for
them.
(mm-mule-charset-to-mime-charset): Use
find-coding-systems-for-charsets if defined.
(mm-charset-to-coding-system): Don't use
mm-get-coding-system-list. Look in mm-charset-synonym-alist
later. Add last resort search of coding systems.
(mm-enable-multibyte-mule4, mm-disable-multibyte-mule4)
(mm-with-unibyte-current-buffer-mule4): Just treat Mule 5 like
Mule 4.
(mm-find-mime-charset-region): Re-write.
(mm-with-unibyte-current-buffer): Restore buffer as well as
multibyteness.
2001-10-30 Simon Josefsson <jas@extundo.com>
* nnimap.el (nnimap-date-days-ago): Defeat locale.
......
This diff is collapsed.
;;; nnslashdot.el --- interfacing with Slashdot
;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
......@@ -57,6 +57,9 @@
"http://slashdot.org/article.pl?sid=%s&mode=nocomment"
"Where nnslashdot will fetch the article from.")
(defvoo nnslashdot-backslash-url "http://slashdot.org/slashdot.xml"
"Where nnslashdot will fetch the stories from.")
(defvoo nnslashdot-threshold -1
"The article threshold.")
......@@ -86,19 +89,17 @@
(nnslashdot-possibly-change-server group server)
(condition-case why
(unless gnus-nov-is-evil
(if nnslashdot-threaded
(nnslashdot-threaded-retrieve-headers articles group)
(nnslashdot-sane-retrieve-headers articles group)))
(nnslashdot-retrieve-headers-1 articles group))
(search-failed (nnslashdot-lose why))))
(deffoo nnslashdot-threaded-retrieve-headers (articles group)
(let ((last (car (last articles)))
(did nil)
(start 1)
(sid (caddr (assoc group nnslashdot-groups)))
(first-comments t)
(startats '(1))
headers article subject score from date lines parent point s)
(deffoo nnslashdot-retrieve-headers-1 (articles group)
(let* ((last (car (last articles)))
(start (if nnslashdot-threaded 1 (pop articles)))
(entry (assoc group nnslashdot-groups))
(sid (nth 2 entry))
(first-comments t)
headers article subject score from date lines parent point cid
s startats changed)
(save-excursion
(set-buffer nnslashdot-buffer)
(let ((case-fold-search t))
......@@ -107,10 +108,10 @@
(nnweb-insert (format nnslashdot-article-url
(nnslashdot-sid-strip sid)) t)
(goto-char (point-min))
(search-forward "Posted by ")
(when (looking-at "<a[^>]+>\\([^<]+\\)")
(setq from (nnweb-decode-entities-string (match-string 1))))
(search-forward " on ")
(re-search-forward "Posted by[ \t\r\n]+")
(when (looking-at "\\(<a[^>]+>\\)?[ \t\r\n]*\\([^<\r\n]+\\)")
(setq from (nnweb-decode-entities-string (match-string 2))))
(search-forward "on ")
(setq date (nnslashdot-date-to-date
(buffer-substring (point) (1- (search-forward "<")))))
(setq lines (/ (- (point)
......@@ -123,16 +124,16 @@
1 group from date
(concat "<" (nnslashdot-sid-strip sid) "%1@slashdot>")
"" 0 lines nil nil))
headers))
(while (and (setq start (pop startats))
(< start last))
headers)
(setq start (if nnslashdot-threaded 2 (pop articles))))
(while (and start (<= start last))
(setq point (goto-char (point-max)))
(nnweb-insert
(format nnslashdot-comments-url
(nnslashdot-sid-strip sid)
nnslashdot-threshold 0 start)
nnslashdot-threshold 0 (- start 2))
t)
(when first-comments
(when (and nnslashdot-threaded first-comments)
(setq first-comments nil)
(goto-char (point-max))
(while (re-search-backward "startat=\\([0-9]+\\)" nil t)
......@@ -140,58 +141,68 @@
(unless (memq s startats)
(push s startats)))
(setq startats (sort startats '<)))
(setq article (if (and article (< start article)) article start))
(goto-char point)
(while (re-search-forward
"<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
nil t)
(setq article (string-to-number (match-string 1))
(setq cid (match-string 1)
subject (match-string 3)
score (match-string 5))
(unless (assq article (nth 4 entry))
(setcar (nthcdr 4 entry) (cons (cons article cid) (nth 4 entry)))
(setq changed t))
(when (string-match "^Re: *" subject)
(setq subject (concat "Re: " (substring subject (match-end 0)))))
(setq subject (nnweb-decode-entities-string subject))
(forward-line 1)
(setq subject (nnweb-decode-entities-string subject))
(search-forward "<BR>")
(if (looking-at
"by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
"by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))")
(progn
(goto-char (- (match-end 0) 5))
(setq from (concat
(setq from (concat
(nnweb-decode-entities-string (match-string 1))
" <" (match-string 2) ">")))
" <" (match-string 3) ">")))
(setq from "")
(when (looking-at "by \\(.+\\) on ")
(when (looking-at "by \\([^<>]*\\) on ")
(goto-char (- (match-end 0) 5))
(setq from (nnweb-decode-entities-string (match-string 1)))))
(search-forward " on ")
(setq date
(nnslashdot-date-to-date
(buffer-substring (point) (progn (end-of-line) (point)))))
(setq lines (/ (abs (- (search-forward "<td ")
(buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))
(setq lines (/ (abs (- (search-forward "<td")
(search-forward "</td>")))
70))
(forward-line 4)
(setq parent
(if (looking-at ".*cid=\\([0-9]+\\)")
(match-string 1)
nil))
(setq did t)
(if (not
(re-search-forward ".*cid=\\([0-9]+\\)\">Parent</A>" nil t))
(setq parent nil)
(setq parent (match-string 1))
(when (string= parent "0")
(setq parent nil)))
(push
(cons
(1+ article)
article
(make-full-mail-header
(1+ article)
article
(concat subject " (" score ")")
from date
(concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ article))
"@slashdot>")
(concat "<" (nnslashdot-sid-strip sid) "%" cid "@slashdot>")
(if parent
(concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ (string-to-number parent)))
"@slashdot>")
(concat "<" (nnslashdot-sid-strip sid) "%"
parent "@slashdot>")
"")
0 lines nil nil))
headers)))))
headers)
(while (and articles (<= (car articles) article))
(pop articles))
(setq article (1+ article)))
(if nnslashdot-threaded
(progn
(setq start (pop startats))
(if start (setq start (+ start 2))))
(setq start (pop articles))))))
(if changed (nnslashdot-write-groups))
(setq nnslashdot-headers (sort headers 'car-less-than-car))
(save-excursion
(set-buffer nntp-server-buffer)
......@@ -201,108 +212,6 @@
(nnheader-insert-nov (cdr header)))))
'nov))
(deffoo nnslashdot-sane-retrieve-headers (articles group)
(let ((last (car (last articles)))
(did nil)
(start (max (1- (car articles)) 1))
(sid (caddr (assoc group nnslashdot-groups)))
headers article subject score from date lines parent point)
(save-excursion
(set-buffer nnslashdot-buffer)
(erase-buffer)
(when (= start 1)
(nnweb-insert (format nnslashdot-article-url
(nnslashdot-sid-strip sid)) t)
(goto-char (point-min))
(search-forward "Posted by ")
(when (looking-at "<a[^>]+>\\([^<]+\\)")
(setq from (nnweb-decode-entities-string (match-string 1))))
(search-forward " on ")
(setq date (nnslashdot-date-to-date
(buffer-substring (point) (1- (search-forward "<")))))
(forward-line 2)
(setq lines (count-lines (point)
(re-search-forward
"A href=\"\\(http://slashdot.org\\)?/article")))
(push
(cons
1
(make-full-mail-header
1 group from date (concat "<" (nnslashdot-sid-strip sid)
"%1@slashdot>")
"" 0 lines nil nil))
headers))
(while (or (not article)
(and did
(< article last)))
(when article
(setq start (1+ article)))
(setq point (goto-char (point-max)))
(nnweb-insert
(format nnslashdot-comments-url (nnslashdot-sid-strip sid)
nnslashdot-threshold 4 start)
t)
(goto-char point)
(while (re-search-forward
"<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
nil t)
(setq article (string-to-number (match-string 1))
subject (match-string 3)
score (match-string 5))
(when (string-match "^Re: *" subject)
(setq subject (concat "Re: " (substring subject (match-end 0)))))
(setq subject (nnweb-decode-entities-string subject))
(forward-line 1)
(if (looking-at
"by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
(progn
(goto-char (- (match-end 0) 5))
(setq from (concat
(nnweb-decode-entities-string (match-string 1))
" <" (match-string 2) ">")))
(setq from "")
(when (looking-at "by \\(.+\\) on ")
(goto-char (- (match-end 0) 5))
(setq from (nnweb-decode-entities-string (match-string 1)))))
(search-forward " on ")
(setq date
(nnslashdot-date-to-date
(buffer-substring (point) (progn (end-of-line) (point)))))
(setq lines (/ (abs (- (search-forward "<td ")
(search-forward "</td>")))
70))
(forward-line 2)
(setq parent
(if (looking-at ".*cid=\\([0-9]+\\)")
(match-string 1)
nil))
(setq did t)
(push
(cons
(1+ article)
(make-full-mail-header
(1+ article) (concat subject " (" score ")")
from date
(concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ article))
"@slashdot>")
(if parent
(concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ (string-to-number parent)))
"@slashdot>")
"")
0 lines nil nil))
headers))))
(setq nnslashdot-headers
(sort headers (lambda (s1 s2) (< (car s1) (car s2)))))
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
(mm-with-unibyte-current-buffer
(dolist (header nnslashdot-headers)
(nnheader-insert-nov (cdr header)))))
'nov))
(deffoo nnslashdot-request-group (group &optional server dont-check)
(nnslashdot-possibly-change-server nil server)
(let ((elem (assoc group nnslashdot-groups)))
......@@ -325,7 +234,7 @@
(deffoo nnslashdot-request-article (article &optional group server buffer)
(nnslashdot-possibly-change-server group server)
(let (contents)
(let (contents cid)
(condition-case why
(save-excursion
(set-buffer nnslashdot-buffer)
......@@ -333,23 +242,32 @@
(goto-char (point-min))
(when (and (stringp article)
(string-match "%\\([0-9]+\\)@" article))
(setq article (string-to-number (match-string 1 article))))
(setq cid (match-string 1 article))
(let ((map (nth 4 (assoc group nnslashdot-groups))))
(while map
(if (equal (cdar map) cid)
(setq article (caar map)
map nil)
(setq map (cdr map))))))
(when (numberp article)
(if (= article 1)
(progn
(re-search-forward "Posted by *<[^>]+>[^>]*<[^>]+> *on ")
(re-search-forward
"Posted by")
(search-forward "<BR>")
(setq contents
(buffer-substring
(point)
(progn
(re-search-forward
"<p>.*A href=\"\\(http://slashdot.org\\)?/article")
"&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
(match-beginning 0)))))
(search-forward (format "<a name=\"%d\">" (1- article)))
(setq cid (cdr (assq article
(nth 4 (assoc group nnslashdot-groups)))))
(search-forward (format "<a name=\"%s\">" cid))
(setq contents
(buffer-substring
(re-search-forward "<td[^>]+>")
(re-search-forward "<td[^>]*>")
(search-forward "</td>")))))))
(search-failed (nnslashdot-lose why)))
......@@ -384,10 +302,10 @@
(let ((number 0)
sid elem description articles gname)
(condition-case why
;; First we do the Ultramode to get info on all the latest groups.
(progn
;; First we do the Ultramode to get info on all the latest groups.
(progn
(mm-with-unibyte-buffer
(nnweb-insert "http://slashdot.org/slashdot.xml" t)
(nnweb-insert nnslashdot-backslash-url t)
(goto-char (point-min))
(while (search-forward "<story>" nil t)
(narrow-to-region (point) (search-forward "</story>"))
......@@ -404,7 +322,8 @@
(setq gname (concat description " (" sid ")"))
(if (setq elem (assoc gname nnslashdot-groups))
(setcar (cdr elem) articles)
(push (list gname articles sid) nnslashdot-groups))
(push (list gname articles sid (current-time) nil)
nnslashdot-groups))
(goto-char (point-max))
(widen)))
;; Then do the older groups.
......@@ -425,13 +344,14 @@
(setq gname (concat description " (" sid ")"))
(if (setq elem (assoc gname nnslashdot-groups))
(setcar (cdr elem) articles)
(push (list gname articles sid) nnslashdot-groups)))))
(push (list gname articles sid (current-time) nil)
nnslashdot-groups)))))
(incf number 30)))
(search-failed (nnslashdot-lose why)))
(nnslashdot-write-groups)
(nnslashdot-generate-active)
t))
(deffoo nnslashdot-request-newgroups (date &optional server)
(nnslashdot-possibly-change-server nil server)
(nnslashdot-generate-active)
......@@ -496,6 +416,24 @@
(setq nnslashdot-headers nil
nnslashdot-groups nil))
(deffoo nnslashdot-request-expire-articles
(articles group &optional server force)
(nnslashdot-possibly-change-server group server)
(let ((item (assoc group nnslashdot-groups)))
(when item
(if (fourth item)
(when (and (>= (length articles) (cadr item)) ;; All are expirable.
(nnmail-expired-article-p
group
(fourth item)
force))
(setq nnslashdot-groups (delq item nnslashdot-groups))
(nnslashdot-write-groups)
(setq articles nil)) ;; all expired.
(setcdr (cddr item) (list (current-time)))
(nnslashdot-write-groups))))
articles)
(nnoo-define-skeleton nnslashdot)
;;; Internal functions
......@@ -508,18 +446,32 @@
(unless nnslashdot-groups
(nnslashdot-read-groups)))
(defun nnslashdot-make-tuple (tuple n)
(prog1
tuple
(while (> n 1)
(unless (cdr tuple)
(setcdr tuple (list nil)))
(setq tuple (cdr tuple)
n (1- n)))))
(defun nnslashdot-read-groups ()
(let ((file (expand-file-name "groups" nnslashdot-directory)))
(when (file-exists-p file)
(mm-with-unibyte-buffer
(insert-file-contents file)
(goto-char (point-min))
(setq nnslashdot-groups (read (current-buffer)))))))
(setq nnslashdot-groups (read (current-buffer))))
(if (and nnslashdot-groups (< (length (car nnslashdot-groups)) 5))
(let ((groups nnslashdot-groups))
(while groups
(nnslashdot-make-tuple (car groups) 5)
(setq groups (cdr groups))))))))
(defun nnslashdot-write-groups ()
(with-temp-file (expand-file-name "groups" nnslashdot-directory)
(prin1 nnslashdot-groups (current-buffer))))
(gnus-prin1 nnslashdot-groups)))
(defun nnslashdot-init (server)
"Initialize buffers and such."
(unless (file-exists-p nnslashdot-directory)
......@@ -528,7 +480,8 @@
(setq nnslashdot-buffer
(save-excursion
(nnheader-set-temp-buffer
(format " *nnslashdot %s*" server))))))
(format " *nnslashdot %s*" server))))
(push nnslashdot-buffer gnus-buffers)))
(defun nnslashdot-date-to-date (sdate)
(condition-case err
......@@ -552,11 +505,6 @@
(defun nnslashdot-lose (why)
(error "Slashdot HTML has changed; please get a new version of nnslashdot"))
;(defun nnslashdot-sid-strip (sid)
; (if (string-match "^00/" sid)
; (substring sid (match-end 0))
; sid))
(defalias 'nnslashdot-sid-strip 'identity)
(provide 'nnslashdot)
......
......@@ -56,6 +56,8 @@
(defvoo nnultimate-groups nil)
(defvoo nnultimate-headers nil)
(defvoo nnultimate-articles nil)
(defvar nnultimate-table-regexp
"postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
;;; Interface functions
......@@ -74,13 +76,17 @@
(old-total (or (nth 6 entry) 1))
(furl "forumdisplay.cgi?action=topics&number=%d&DaysPrune=1000")
(furls (list (concat nnultimate-address (format furl sid))))
(nnultimate-table-regexp
"postings.*editpost\\|forumdisplay\\|getbio")
headers article subject score from date lines parent point
contents tinfo fetchers map elem a href garticles topic old-max
inc datel table string current-page total-contents pages
inc datel table current-page total-contents pages
farticles forum-contents parse furl-fetched mmap farticle)
(setq map mapping)
(while (and (setq article (car articles))
map)
;; Skip past the articles in the map until we reach the
;; article we're looking for.
(while (and map
(or (> article (caar map))
(< (cadar map) (caar map))))
......@@ -101,7 +107,7 @@
fetchers))
(pop articles)
(setq article (car articles)))))
;; Now we have the mapping from/to Gnus/nnultimate article numbers,
;; Now we have the mapping from/to Gnus/nnultimate article numbers,
;; so we start fetching the topics that we need to satisfy the
;; request.
(if (not fetchers)
......@@ -128,22 +134,27 @@
(setq contents
(ignore-errors (w3-parse-buffer (current-buffer))))
(setq table (nnultimate-find-forum-table contents))
(setq string (mapconcat 'identity (nnweb-text table) ""))
(when (string-match "topic is \\([0-9]\\) pages" string)
(setq pages (string-to-number (match-string 1 string)))
(setcdr table nil)
(setq table (nnultimate-find-forum-table contents)))
(goto-char (point-min))
(when (re-search-forward "topic is \\([0-9]+\\) pages" nil t)
(setq pages (string-to-number (match-string 1))))
(setq contents (cdr (nth 2 (car (nth 2 table)))))
(setq total-contents (nconc total-contents contents))
(incf current-page))
;;(setq total-contents (nreverse total-contents))
(dolist (art (cdr elem))
(if (not (nth (1- (cdr art)) total-contents))
() ;(debug)
(push (list (car art)
(nth (1- (cdr art)) total-contents)
subject)
nnultimate-articles)))))
(when t
(let ((i 0))
(dolist (co total-contents)
(push (list (or (nnultimate-topic-article-to-article
group (car elem) (incf i))
1)
co subject)
nnultimate-articles))))
(when nil
(dolist (art (cdr elem))
(when (nth (1- (cdr art)) total-contents)
(push (list (car art)
(nth (1- (cdr art)) total-contents)
subject)
nnultimate-articles))))))
(setq nnultimate-articles
(sort nnultimate-articles 'car-less-than-car))
;; Now we have all the articles, conveniently in an alist
......@@ -161,17 +172,26 @@
(setq date (substring (car datel) (match-end 0))
datel nil))
(pop datel))
(setq date (delete "" (split-string date "[- \n\t\r ]")))
(if (or (member "AM" date)
(member "PM" date))
(when date
(setq date (delete "" (split-string
date "[-, \n\t\r ]")))
(if (or (member "AM" date)
(member "PM" date))
(setq date (format
"%s %s %s %s"
(nth 1 date)
(if (and (>= (length (nth 0 date)) 3)
(assoc (downcase
(substring (nth 0 date) 0 3))
parse-time-months))
(substring (nth 0 date) 0 3)
(car (rassq (string-to-number (nth 0 date))
parse-time-months)))
(nth 2 date) (nth 3 date)))
(setq date (format "%s %s %s %s"
(car (rassq (string-to-number (nth 0 date))
(car (rassq (string-to-number (nth 1 date))
parse-time-months))
(nth 1 date) (nth 2 date) (nth 3 date)))
(setq date (format "%s %s %s %s"
(car (rassq (string-to-number (nth 1 date))
parse-time-months))
(nth 0 date) (nth 2 date) (nth 3 date))))
(nth 0 date) (nth 2 date) (nth 3 date)))))
(push
(cons
article
......@@ -180,7 +200,7 @@
from (or date "")
(concat "<" (number-to-string sid) "%"
(number-to-string article)
"@ultimate>")
"@ultimate." server ">")
"" 0
(/ (length (mapconcat
'identity
......@@ -199,6 +219,16 @@