Mercurial > emacs
changeset 110099:7a6012e13748
gnus-html.el: add and use gnus-html-image-url-blocked-p
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 02 Sep 2010 00:17:40 +0000 |
| parents | 3e3e1965a2c2 |
| children | 8f51744211eb |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-html.el |
| diffstat | 2 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Sep 02 00:13:51 2010 +0000 +++ b/lisp/gnus/ChangeLog Thu Sep 02 00:17:40 2010 +0000 @@ -1,3 +1,8 @@ +2010-09-01 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-html.el (gnus-html-image-url-blocked-p): New function. + (gnus-html-prefetch-images, gnus-html-wash-tags): Use it. + 2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-html.el (gnus-html-put-image): Use the deleted text as the image
--- a/lisp/gnus/gnus-html.el Thu Sep 02 00:13:51 2010 +0000 +++ b/lisp/gnus/gnus-html.el Thu Sep 02 00:17:40 2010 +0000 @@ -136,8 +136,7 @@ (delete-region start end) (gnus-put-image image (gnus-string-or string "*"))))) ;; Normal, external URL. - (when (or (null gnus-blocked-images) - (not (string-match gnus-blocked-images url))) + (unless (gnus-html-image-url-blocked-p url) (let ((file (gnus-html-image-id url))) (if (file-exists-p file) ;; It's already cached, so just insert it. @@ -284,6 +283,15 @@ (decf total-size (cadr file)) (delete-file (nth 2 file))))))) + +(defun gnus-html-image-url-blocked-p (url) +"Find out if URL is blocked by `gnus-blocked-images'." + (let ((ret (and gnus-blocked-images + (string-match gnus-blocked-images url)))) + (when ret + (gnus-message 8 "Image URL %s is blocked by gnus-blocked-images regex %s" url gnus-blocked-images)) + ret)) + ;;;###autoload (defun gnus-html-prefetch-images (summary) (let (blocked-images urls) @@ -293,13 +301,11 @@ (save-match-data (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t) (let ((url (match-string 1))) - (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)))) + (unless (gnus-html-image-url-blocked-p url) + (unless (file-exists-p (gnus-html-image-id url)) + (push url urls) + (push (gnus-html-image-id url) urls) + (push "-o" urls))))) (let ((process (apply 'start-process "images" nil "curl"