From 37583170eff4858b6bd288cc78e2ec967ee0073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 20 Sep 2022 22:27:56 +0200 Subject: [PATCH] Fix a bug where PDF thumbnails were stored with PDF extension * lisp/image/image-dired-util.el (image-dired-file-name-extension): New function to compute the filename extension for a thumbnail. This new function ensures that the extension of a PDF thumbnail is either JPG or PNG. * lisp/image/image-dired-util.el (image-dired-thumb-name): Use the new function. --- lisp/image/image-dired-util.el | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lisp/image/image-dired-util.el b/lisp/image/image-dired-util.el index dcf0b22cfe..89513f9441 100644 --- a/lisp/image/image-dired-util.el +++ b/lisp/image/image-dired-util.el @@ -57,6 +57,19 @@ image-dired-dir (message "Thumbnail directory created: %s" image-dired-dir)) image-dired-dir)) +(defun image-dired-file-name-extension (file) + "Return the filename extension for thumbnail FILE. +Return the value of `file-name-extension', but for PDF files +return PNG or JPG, depending on the thumbnail storage +configuration." + (let ((extension (file-name-extension file))) + (cond ((string-equal extension "pdf") + (cond ((memq image-dired-thumbnail-storage + image-dired--thumbnail-standard-sizes) + "png") + (t "jpg"))) + (t extension)))) + (defun image-dired-thumb-name (file) "Return absolute file name for thumbnail FILE. Depending on the value of `image-dired-thumbnail-storage', the @@ -91,13 +104,13 @@ image-dired-thumb-name (file-name-as-directory (expand-file-name (image-dired-dir))) (file-name-base f) (if hash (concat "_" hash) "") - (file-name-extension f)))) + (image-dired-file-name-extension f)))) ((eq 'per-directory image-dired-thumbnail-storage) (let ((f (expand-file-name file))) (format "%s.image-dired/%s.thumb.%s" (file-name-directory f) (file-name-base f) - (file-name-extension f)))))) + (image-dired-file-name-extension f)))))) (defvar image-dired-thumbnail-buffer "*image-dired*" "Image-Dired's thumbnail buffer.") -- 2.34.1