commit 38c9ff59dc191ca131fc9a52d9cd96861d42efe8 parent 1740b6815191c38c94ad9ec6dceb1bbb50972d84 Author: Oleh Krehel <ohwoeowho@gmail.com> Date: Sun, 18 Jan 2015 13:06:28 +0100 Fix links with trailing garbage, e.g."foo.png:large" * org-download.el (org-download--fullname): Fix. Diffstat:
| M | org-download.el | | | 14 | +++++++++----- |
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/org-download.el b/org-download.el @@ -173,11 +173,15 @@ It's affected by `org-download-timestamp' and `org-download--dir'." (car (url-path-and-query (url-generic-parse-url link))))) (dir (org-download--dir))) - (format "%s/%s%s.%s" - dir - (file-name-sans-extension filename) - (format-time-string org-download-timestamp) - (file-name-extension filename)))) + (when (string-match ".*?\\.\\(?:png\\|jpg\\)\\(.*\\)$" filename) + (setq filename (replace-match "" nil nil filename 1))) + (abbreviate-file-name + (expand-file-name + (format "%s%s.%s" + (file-name-sans-extension filename) + (format-time-string org-download-timestamp) + (file-name-extension filename)) + dir)))) (defun org-download--image (link filename) "Save LINK to FILENAME asynchronously and show inline images in current buffer."