Mercurial > emacs
changeset 110093:cb103d02d7f5
gnus-html.el: Add extra logging.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 01 Sep 2010 23:46:59 +0000 |
| parents | 1e526716f8fc |
| children | b9d6d7f1d89f |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el |
| diffstat | 2 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Sep 01 23:40:39 2010 +0000 +++ b/lisp/gnus/ChangeLog Wed Sep 01 23:46:59 2010 +0000 @@ -1,3 +1,9 @@ +2010-09-01 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-html.el (gnus-html-wash-tags) + (gnus-html-schedule-image-fetching, gnus-html-prefetch-images): Add + extra logging. + 2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-html.el (gnus-html-wash-tags): Delete the IMG_ALT region.
--- a/lisp/gnus/gnus-html.el Wed Sep 01 23:40:39 2010 +0000 +++ b/lisp/gnus/gnus-html.el Wed Sep 01 23:46:59 2010 +0000 @@ -107,8 +107,9 @@ (cond ;; Fetch and insert a picture. ((equal tag "img_alt") - (when (string-match "src=\"\\([^\"]+\\)" parameters) + (when (string-match "src=\"\\([^\"]+\\)" parameters) (setq url (match-string 1 parameters)) + (gnus-message 8 "Fetching image URL %s" url) (if (string-match "^cid:\\(.*\\)" url) ;; URLs with cid: have their content stashed in other ;; parts of the MIME structure, so just insert them @@ -142,6 +143,7 @@ ((equal tag "a") (when (string-match "href=\"\\([^\"]+\\)" parameters) (setq url (match-string 1 parameters)) + (gnus-message 8 "Fetching link URL %s" url) (gnus-article-add-button start end 'browse-url url url) @@ -167,6 +169,7 @@ (gnus-html-schedule-image-fetching (current-buffer) (nreverse images))))) (defun gnus-html-schedule-image-fetching (buffer images) + (gnus-message 8 "Scheduling image fetching in buffer %s, images %s" buffer images) (let* ((url (caar images)) (process (start-process "images" nil "curl" @@ -250,12 +253,13 @@ (save-match-data (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t) (let ((url (match-string 1))) - (when (or (null blocked-images) - (not (string-match blocked-images url))) - (unless (file-exists-p (gnus-html-image-id url)) - (push url urls) - (push (gnus-html-image-id url) urls) - (push "-o" urls))))) + (if (or (null blocked-images) + (not (string-match blocked-images url))) + (unless (file-exists-p (gnus-html-image-id url)) + (push url urls) + (push (gnus-html-image-id url) urls) + (push "-o" urls)) + (gnus-message 8 "Image URL %s is blocked" url)))) (let ((process (apply 'start-process "images" nil "curl"