org-download

commit 28cf6193a777e9d4302dc97409118dbf4db7ebb0
parent f7f75e465b11a36ad7146b4c29d97587caed2747
Author: david-sitsky <david.sitsky@gmail.com>
Date:   Sun, 23 Aug 2015 09:04:13 +1000

Support for Windows

Added support so local image files can be drag and dropped successfully
when using Windows.

Windows filenames can't use ':', so I changed the default
org-download-timestamp value so this will work out of the box for all
setups.

Updated org-download--image so the "cp" Unix command is replaced with
the elisp copy-file function so this code is portable.

Also updated various regexps and URL parsing to handle Window local file
URLs which are typically of this form:
file:C%3A/Users/sits/Desktop/check.png (for file
C:\Users\sits\Desktop\check.png).

Diffstat:
M
org-download.el
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/org-download.el b/org-download.el
@@ -107,7 +107,7 @@ See `org-download--dir-1' for more info."
           (const :tag "url-retrieve" t))
   :group 'org-download)
 
-(defcustom org-download-timestamp "_%Y-%m-%d_%H:%M:%S"
+(defcustom org-download-timestamp "_%Y-%m-%d_%H-%M-%S"
   "This `format-time-string'-style string will be appended to the file name.
 Set this to \"\" if you don't want time stamps."
   :type 'string
@@ -198,11 +198,11 @@ It's affected by `org-download-timestamp' and `org-download--dir'."
 
 (defun org-download--image (link filename)
   "Save LINK to FILENAME asynchronously and show inline images in current buffer."
-  (when (string-match "^file://\\(.*\\)" link)
-    (setq link (url-unhex-string (match-string 1 link))))
+  (when (string= "file" (url-type (url-generic-parse-url link)))
+    (setq link (url-unhex-string (url-filename (url-generic-parse-url link)))))
   (cond ((and (not (file-remote-p link))
               (file-exists-p link))
-         (org-download--image/command "cp \"%s\" \"%s\"" link filename))
+         (copy-file link (expand-file-name filename)))
         ((eq org-download-backend t)
          (org-download--image/url-retrieve link filename))
         (t
@@ -385,10 +385,10 @@ Otherwise, pass URI and ACTION back to dnd dispatch."
 ;;;###autoload
 (defun org-download-enable ()
   "Enable org-download."
-  (unless (eq (cdr (assoc "^\\(https?\\|ftp\\|file\\|nfs\\)://" dnd-protocol-alist))
+  (unless (eq (cdr (assoc "^\\(https?\\|ftp\\|file\\|nfs\\):" dnd-protocol-alist))
               'org-download-dnd)
     (setq dnd-protocol-alist
-          `(("^\\(https?\\|ftp\\|file\\|nfs\\)://" . org-download-dnd) ,@dnd-protocol-alist))))
+          `(("^\\(https?\\|ftp\\|file\\|nfs\\):" . org-download-dnd) ,@dnd-protocol-alist))))
 
 (defun org-download-disable ()
   "Disable org-download."