(not (eq charset 'ascii)))
(mm-decode-coding-region (point-min) (point-max) charset))
(call-process-region (point-min) (point-max)
- "w3m"
+ "w3m"
nil article-buffer nil
"-halfdump"
"-no-cookie"
"-o" "pre_conv=1"
"-t" (format "%s" tab-width)
"-cols" (format "%s" gnus-html-frame-width)
- "-o" "display_image=off"
+ "-o" "display_image=on"
"-T" "text/html"))))
(gnus-html-wash-tags))))
(let (tag parameters string start end images url)
(mm-url-decode-entities)
(goto-char (point-min))
+ (while (re-search-forward "<pre_int> *</pre_int>\n" nil t)
+ (replace-match "" t t))
+ (goto-char (point-min))
(while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
(setq tag (match-string 1)
parameters (match-string 2)
((equal tag "img_alt")
(when (string-match "src=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
- (gnus-message 8 "Fetching image URL %s" url)
+ (gnus-message 8 "gnus-html-wash-tags: 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
(setq image (gnus-create-image (buffer-string)
nil t))))
(when image
- (delete-region start end)
- (gnus-put-image image)))
+ (let ((string (buffer-substring start end)))
+ (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)))
- (let ((file (gnus-html-image-id url)))
- (if (file-exists-p file)
- ;; It's already cached, so just insert it.
- (when (gnus-html-put-image file (point))
- ;; Delete the ALT text.
- (delete-region start end))
- ;; We don't have it, so schedule it for fetching
- ;; asynchronously.
- (push (list url
- (set-marker (make-marker) start)
- (point-marker))
- images)))))))
+ (unless (gnus-html-image-url-blocked-p
+ url
+ (if (buffer-live-p gnus-summary-buffer)
+ (with-current-buffer gnus-summary-buffer
+ gnus-blocked-images)
+ gnus-blocked-images))
+ (let ((file (gnus-html-image-id url))
+ width height)
+ (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+ (setq height (string-to-number (match-string 1 parameters))))
+ (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+ (setq width (string-to-number (match-string 1 parameters))))
+ ;; Don't fetch images that are really small. They're
+ ;; probably tracking pictures.
+ (when (and (or (null height)
+ (> height 4))
+ (or (null width)
+ (> width 4)))
+ (if (file-exists-p file)
+ ;; It's already cached, so just insert it.
+ (let ((string (buffer-substring start end)))
+ ;; Delete the ALT text.
+ (delete-region start end)
+ (gnus-html-put-image file (point) string))
+ ;; We don't have it, so schedule it for fetching
+ ;; asynchronously.
+ (push (list url
+ (set-marker (make-marker) start)
+ (point-marker))
+ images))))))))
;; Add a link.
- ((equal tag "a")
+ ((or (equal tag "a")
+ (equal tag "A"))
(when (string-match "href=\"\\([^\"]+\\)" parameters)
(setq url (match-string 1 parameters))
- (gnus-message 8 "Fetching link URL %s" url)
+ (gnus-message 8 "gnus-html-wash-tags: fetching link URL %s" url)
(gnus-article-add-button start end
'browse-url url
url)
(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)
+ (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, images %s"
+ buffer images)
(let* ((url (caar images))
(process (start-process
"images" nil "curl"
;; article before the image arrived.
(not (= (marker-position (cadr spec)) (point-min))))
(with-current-buffer buffer
- (let ((inhibit-read-only t))
- (when (gnus-html-put-image file (cadr spec))
- (delete-region (1+ (cadr spec)) (caddr spec))))))
+ (let ((inhibit-read-only t)
+ (string (buffer-substring (cadr spec) (caddr spec))))
+ (delete-region (cadr spec) (caddr spec))
+ (gnus-html-put-image file (cadr spec) string))))
(when images
(gnus-html-schedule-image-fetching buffer images)))))
-(defun gnus-html-put-image (file point)
+(defun gnus-html-put-image (file point string)
(when (display-graphic-p)
(let ((image (ignore-errors
(gnus-create-image file))))
(= (car (image-size image t)) 30)
(= (cdr (image-size image t)) 30))))
(progn
- (gnus-put-image (gnus-html-rescale-image image))
+ (gnus-put-image (gnus-html-rescale-image image)
+ (gnus-string-or string "*"))
t)
+ (insert string)
(when (fboundp 'find-image)
(gnus-put-image (find-image
- '((:type xpm :file "lock-broken.xpm")))))
+ '((:type xpm :file "lock-broken.xpm")))
+ (gnus-string-or string "*")))
nil)))))
(defun gnus-html-rescale-image (image)
- (if (not (fboundp 'imagemagick-types))
+ (if (or (not (fboundp 'imagemagick-types))
+ (not (get-buffer-window (current-buffer))))
image
(let* ((width (car (image-size image t)))
(height (cdr (image-size image t)))
- (edges (window-pixel-edges))
+ (edges (window-pixel-edges (get-buffer-window (current-buffer))))
(window-width (truncate (* gnus-max-image-proportion
(- (nth 2 edges) (nth 0 edges)))))
(window-height (truncate (* gnus-max-image-proportion
(- (nth 3 edges) (nth 1 edges)))))
scaled-image)
- (when (> width window-width)
- (setq window-height (truncate (* window-height
- (/ (* 1.0 window-width) width)))))
- (if (> height window-height)
- (or (create-image file 'imagemagick nil
- :height window-height)
- image)
- image))))
+ (when (> height window-height)
+ (setq image (or (create-image file 'imagemagick nil
+ :height window-height)
+ image))
+ (when (> (car (image-size image t)) window-width)
+ (setq image (or
+ (create-image file 'imagemagick nil
+ :width window-width)
+ image))))
+ image)))
(defun gnus-html-prune-cache ()
(let ((total-size 0)
(decf total-size (cadr file))
(delete-file (nth 2 file)))))))
+(defun gnus-html-image-url-blocked-p (url blocked-images)
+"Find out if URL is blocked by BLOCKED-IMAGES."
+ (let ((ret (and blocked-images
+ (string-match blocked-images url))))
+ (if ret
+ (gnus-message 8 "gnus-html-image-url-blocked-p: %s blocked by regex %s"
+ url blocked-images)
+ (gnus-message 9 "gnus-html-image-url-blocked-p: %s passes regex %s"
+ url blocked-images))
+ ret))
+
;;;###autoload
(defun gnus-html-prefetch-images (summary)
(let (blocked-images urls)
(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 blocked-images)
+ (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
+ (apply 'start-process
"images" nil "curl"
"-s" "--create-dirs"
"--location"
projects / gnus / blobdiff