X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnslashdot.el;h=23dae0d56e7e7b2b83a24d07b44886ff9bd8d341;hb=e4cd2c48b6a75de831dbe75d76ea3107c7062ba6;hp=126d79b261255bd48729885c1830364ef338dcea;hpb=d5f31cb0247cb04dcc2f12947b6bed5a8a04af69;p=gnus diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el index 126d79b26..23dae0d56 100644 --- a/lisp/nnslashdot.el +++ b/lisp/nnslashdot.el @@ -36,17 +36,11 @@ (require 'gnus) (require 'nnmail) (require 'mm-util) -(require 'nnweb) (eval-when-compile (ignore-errors - (require 'w3) - (require 'url) - (require 'w3-forms))) + (require 'nnweb))) ;; Report failure to find w3 at load time if appropriate. -(eval '(progn - (require 'w3) - (require 'url) - (require 'w3-forms))) +(eval '(require 'nnweb)) (nnoo-declare nnslashdot) @@ -56,18 +50,27 @@ (defvoo nnslashdot-active-url "http://slashdot.org/search.pl?section=&min=%d" "Where nnslashdot will fetch the active file from.") -(defvoo nnslashdot-comments-url "http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=0&mode=flat&startat=%d" +(defvoo nnslashdot-comments-url "http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d" "Where nnslashdot will fetch comments from.") (defvoo nnslashdot-article-url "http://slashdot.org/article.pl?sid=%s&mode=nocomment" "Where nnslashdot will fetch the article from.") -(defvoo nnslashdot-threshold 0 +(defvoo nnslashdot-threshold -1 "The article threshold.") -(defvoo nnslashdot-group-number 30 - "The number of groups to keep updated.") +(defvoo nnslashdot-threaded t + "Whether the nnslashdot groups should be threaded or not.") + +(defvoo nnslashdot-group-number 0 + "The number of non-fresh groups to keep updated.") + +(defvoo nnslashdot-login-name "" + "The login name to use when posting.") + +(defvoo nnslashdot-password "" + "The password to use when posting.") ;;; Internal variables @@ -81,96 +84,109 @@ (deffoo nnslashdot-retrieve-headers (articles &optional group server fetch-old) (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))) + (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))) - headers article subject score from date lines parent point - startats s) + (first-comments t) + (startats '(1)) + headers article subject score from date lines parent point s) (save-excursion (set-buffer nnslashdot-buffer) - (erase-buffer) - (when (= start 1) - (url-insert-file-contents (format nnslashdot-article-url sid)) - (setq buffer-file-name nil) - (goto-char (point-min)) - (search-forward "Posted by ") - (when (looking-at "]+>\\([^<]+\\)") - (setq from (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) - (search-forward - "A href=http://slashdot.org/article.pl"))) - (push - (cons - 1 - (make-full-mail-header - 1 group from date (concat "<" sid "%1@slashdot>") - "" 0 lines nil nil)) - headers) - (goto-char (point-max)) - (while (re-search-backward "startat=\\([0-9]+\\)" nil t) - (setq s (match-string 1)) - (unless (memq s startats) - (push s startats))) - (unless startats - (push 1 startats))) - (setq startats (sort startats '<)) - (while (and (setq start (pop startats)) - (< start last)) - (setq point (goto-char (point-max))) - (url-insert-file-contents - (format nnslashdot-comments-url sid nnslashdot-threshold start)) - (setq buffer-file-name nil) - (goto-char point) - (while (re-search-forward - "\\([^<]+\\).*score:\\([^)]+\\))" - nil t) - (setq article (string-to-number (match-string 1)) - subject (match-string 2) - score (match-string 3)) - (when (string-match "^Re: *" subject) - (setq subject (concat "Re: " (substring subject (match-end 0))))) - (forward-line 1) - (if (looking-at "by ]+>\\([^<]+\\)[ \t\n]*.*(\\([^)]+\\))") - (setq from (concat (match-string 1) " <" (match-string 2) ">")) - (looking-at "by \\(.+\\) on ") - (setq from (match-string 1))) - (goto-char (- (match-end 0) 5)) + (let ((case-fold-search t)) + (erase-buffer) + (when (= start 1) + (nnweb-insert (format nnslashdot-article-url sid) t) + (goto-char (point-min)) + (search-forward "Posted by ") + (when (looking-at "]+>\\([^<]+\\)") + (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 "
.*A href=http://slashdot.org/article.pl")))) - (search-forward (format "" (1- article))) - (setq contents - (buffer-substring - (re-search-forward "
.*A href=http://slashdot\\.org/article") + (match-beginning 0))))) + (search-forward (format "" (1- article))) + (setq contents + (buffer-substring + (re-search-forward "
" t t))
(goto-char (point-min))
(insert "Content-Type: text/html\nMIME-Version: 1.0\n")
+ (insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
+ "\n")
(let ((header (cdr (assq article nnslashdot-headers))))
(nnheader-insert-header header))
(nnheader-report 'nnslashdot "Fetched article %s" article)
@@ -338,37 +365,113 @@
(deffoo nnslashdot-request-list (&optional server)
(nnslashdot-possibly-change-server nil server)
- (let ((case-fold-search t)
- (number 0)
+ (let ((number 0)
sid elem description articles gname)
- (while (> (- nnslashdot-group-number number) 0)
- (with-temp-buffer
- (url-insert-file-contents (format nnslashdot-active-url number))
- (setq buffer-file-name nil)
- (goto-char (point-min))
- (while (re-search-forward
- "article.pl\\?sid=\\([^&]+\\).*\\([^<]+\\)" nil t)
- (setq sid (match-string 1)
- description (match-string 2))
- (forward-line 1)
- (when (re-search-forward "\\([0-9]+\\)" nil t)
- (setq articles (string-to-number (match-string 1))))
- (setq gname (concat description " (" sid ")"))
- (if (setq elem (assoc gname nnslashdot-groups))
- (setcar (cdr elem) articles)
- (push (list gname articles sid) nnslashdot-groups))))
- (incf number 30))
+ (condition-case why
+ ;; 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)
+ (goto-char (point-min))
+ (while (search-forward "
\n")) + (setq quoted t)) + (when quoted + (insert "\n") + (setq quoted nil))) + (forward-line 1)) + (goto-char (point-min)) + (while (re-search-forward "^ *\n" nil t) + (replace-match "
\n")) + (widen) + (when (message-goto-signature) + (forward-line -1) + (insert "
\n")
+ (while (not (eobp))
+ (end-of-line)
+ (insert "
")
+ (forward-line 1)))
+ (message-goto-body)
+ (setq body (buffer-substring (point) (point-max)))
+ (erase-buffer)
+ (nnweb-fetch-form
+ "http://slashdot.org/comments.pl"
+ `(("sid" . ,sid)
+ ("pid" . ,pid)
+ ("rlogin" . "userlogin")
+ ("unickname" . ,nnslashdot-login-name)
+ ("upasswd" . ,nnslashdot-password)
+ ("postersubj" . ,subject)
+ ("op" . "Submit")
+ ("postercomment" . ,body)
+ ("posttype" . "html")))))
+
+(deffoo nnslashdot-request-delete-group (group &optional force server)
+ (nnslashdot-possibly-change-server group server)
+ (setq nnslashdot-groups (delq (assoc group nnslashdot-groups)
+ nnslashdot-groups))
+ (nnslashdot-write-groups))
(nnoo-define-skeleton nnslashdot)
@@ -385,7 +488,7 @@
(defun nnslashdot-read-groups ()
(let ((file (expand-file-name "groups" nnslashdot-directory)))
(when (file-exists-p file)
- (with-temp-buffer
+ (mm-with-unibyte-buffer
(insert-file-contents file)
(goto-char (point-min))
(setq nnslashdot-groups (read (current-buffer)))))))
@@ -404,50 +507,16 @@
(nnheader-set-temp-buffer
(format " *nnslashdot %s*" server))))))
-(defun nnslashdot-encode-www-form-urlencoded (pairs)
- "Return PAIRS encoded for forms."
- (mapconcat
- (function
- (lambda (data)
- (concat (w3-form-encode-xwfu (car data)) "="
- (w3-form-encode-xwfu (cdr data)))))
- pairs "&"))
-
-(defun nnslashdot-fetch-form (url pairs)
- (let ((url-request-data (nnslashdot-encode-www-form-urlencoded pairs))
- (url-request-method "POST")
- (url-request-extra-headers
- '(("Content-type" . "application/x-www-form-urlencoded"))))
- (url-insert-file-contents url)
- (setq buffer-file-name nil))
- t)
-
-(defun nnslashdot-decode-entities ()
- (goto-char (point-min))
- (while (re-search-forward "&\\([a-z]+\\);" nil t)
- (replace-match (char-to-string (or (cdr (assq (intern (match-string 1))
- w3-html-entities))
- ?#))
- t t)))
-
-(defun nnslashdot-remove-markup ()
- (goto-char (point-min))
- (while (search-forward "" nil t)
- (point-max))))
- (goto-char (point-min))
- (while (re-search-forward "<[^>]+>" nil t)
- (replace-match "" t t)))
-
(defun nnslashdot-date-to-date (sdate)
- (let ((elem (split-string sdate)))
- (concat (substring (nth 0 elem) 0 3) " "
- (substring (nth 1 elem) 0 3) " "
- (substring (nth 2 elem) 0 2) " "
- (substring (nth 3 elem) 1 6) " "
- (format-time-string "%Y") " "
- (nth 4 elem))))
+ (condition-case err
+ (let ((elem (delete "" (split-string sdate))))
+ (concat (substring (nth 0 elem) 0 3) " "
+ (substring (nth 1 elem) 0 3) " "
+ (substring (nth 2 elem) 0 2) " "
+ (substring (nth 3 elem) 1 6) " "
+ (format-time-string "%Y") " "
+ (nth 4 elem)))
+ (error "")))
(defun nnslashdot-generate-active ()
(save-excursion
@@ -457,6 +526,9 @@
(insert (prin1-to-string (car elem))
" " (number-to-string (cadr elem)) " 1 y\n"))))
+(defun nnslashdot-lose (why)
+ (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
+
(provide 'nnslashdot)
;;; nnslashdot.el ends here