tec
/
screenshot.el
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

Move metadata setting to hook 

This ensures metadata is set after pngquant, which will destroy any
metadata.
This commit is contained in:
lunik1 2023-03-28 14:32:35 +01:00 committed by tecosaur
parent ac49dff18d
commit 5446e0f5a5
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
screenshot.el
View File

@ -414,8 +414,8 @@ More specifically, this function will:
(posframe-hide ss-buf)))
(defcustom screenshot-post-process-hook
(when (executable-find "pngquant")
(list #'screenshot--compress-file))
(append (and (executable-find "pngquant") (list #'screenshot--compress-file))
(list #'screenshot--set-metadata))
"Functions to be called on the output file after processing.
Must take a single argument, the file name, and operate in-place."
:type 'function
@ -425,6 +425,26 @@ Must take a single argument, the file name, and operate in-place."
"Compress FILE with pngquant."
(call-process "pngquant" nil nil nil "--force" "--skip-if-larger" "--output" file file))
(defun screenshot--set-metadata (file)
"Set requested metadata on FILE."
(let ((result (apply #'call-process "convert" nil nil nil
(append (list file)
(and screenshot-code-as-image-description-p
(list "-set" "description" (buffer-substring
screenshot--region-beginning
screenshot--region-end)))
(and screenshot-buffer-name-as-image-title-p
(list "-set" "title" (buffer-name)))
(and screenshot-user-full-name-as-image-author-p
(list "-set" "author" user-full-name))
(list
"-set" "software" (format "Emacs %s; screenshot.el %s"
emacs-version
(lm-version (symbol-file 'screenshot)))
file)))))
(unless (zerop result)
(error "Could not apply imagemagick commands to image (exit code %d)" result))))
(defun screenshot--post-process (file)
"Apply any image post-processing to FILE."
(when (or (> screenshot-radius 0)
@ -459,20 +479,9 @@ Must take a single argument, the file name, and operate in-place."
screenshot-shadow-offset-horizontal
screenshot-shadow-offset-vertical)
")" "+swap"))
(and screenshot-code-as-image-description-p
(list "-set" "description" (buffer-substring
screenshot--region-beginning
screenshot--region-end)))
(and screenshot-buffer-name-as-image-title-p
(list "-set" "title" (buffer-name)))
(and screenshot-user-full-name-as-image-author-p
(list "-set" "author" user-full-name))
(list
"-background" "none"
"-layers" "merge"
"-set" "software" (format "Emacs %s; screenshot.el %s"
emacs-version
(lm-version (symbol-file 'screenshot)))
file))))))
(unless (eq result 0)
(error "Could not apply imagemagick commands to image (exit code %d)" result))))