[PATCH] org-protocol: fixes open-source and extends rewriting of URLs

[Mario Martelli <tlmtr@schnuddelhuddel.de>]

[-- Attachment #1: Type: text/plain, Size: 968 bytes --]

Hi list,

Doing the tests for the documentation I encountered some issues with org-protocol.

[0001-url-is-sanitized-before-processing]
I’ve got trouble to get sub-protocol “open-source” working in some cases. By sanitising the URL it works for me in all cases.



[0002-tests-open-source-uri-against-uri-and-not-filename]
This changes the test of the URI which was tested against the resulting filename. It’s now tested against the base-url.

I’m still unsure with this because the code is there for more than seven years. Maybe I’m not seeing something obvious here. But all tests I made so far are succeeding with this change.



[0003-org-protocol-open-source-can-open-hugo-sources-with-date-url]

Enables “open-source” to open hugo sources from a blog which is using date URLs like:

https://cool-blog.com/2017/05/20/cool-post/ <https://cool-blog.com/2017/05/20/cool-post/>



WDYT of this?

Kind regards
Mario
— 


[-- Attachment #2.1: Type: text/html, Size: 3099 bytes --]

[-- Attachment #2.2: 0001-url-is-sanitized-before-processing.patch --]
[-- Type: application/octet-stream, Size: 1014 bytes --]

From 572a9fb03b62aa989752104898318096fa8809e4 Mon Sep 17 00:00:00 2001
From: Mario Martelli <cocoa@schnuddelhuddel.de>
Date: Fri, 23 Jun 2017 18:32:49 +0200
Subject: [PATCH 1/3] url is sanitized before processing

---
 lisp/org-protocol.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 825435674..7e986a9ed 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -520,7 +520,7 @@ The location for a browser's bookmark should look like this:
   ;; As we enter this function for a match on our protocol, the return value
   ;; defaults to nil.
   (let ((result nil)
-        (f (plist-get (org-protocol-parse-parameters fname nil '(:url)) :url)))
+	(f (org-protocol-sanitize-uri (plist-get (org-protocol-parse-parameters fname nil '(:url)) :url))))
     (catch 'result
       (dolist (prolist org-protocol-project-alist)
         (let* ((base-url (plist-get (cdr prolist) :base-url))
-- 
2.11.0 (Apple Git-81)


[-- Attachment #2.3: Type: text/html, Size: 2167 bytes --]

[-- Attachment #2.4: 0002-tests-open-source-uri-against-uri-and-not-filename.patch --]
[-- Type: application/octet-stream, Size: 903 bytes --]

From f7562e781de0331231d5e369280a2f710c240ca4 Mon Sep 17 00:00:00 2001
From: Mario Martelli <cocoa@schnuddelhuddel.de>
Date: Sat, 24 Jun 2017 16:01:20 +0200
Subject: [PATCH 2/3] tests open-source uri against uri and not filename

---
 lisp/org-protocol.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 7e986a9ed..6744fc0ac 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -554,7 +554,7 @@ The location for a browser's bookmark should look like this:
 		      ;; Try to match a rewritten URL and map it to
 		      ;; a real file.  Compare redirects without
 		      ;; suffix.
-		      (when (string-match-p (car rewrite) f2)
+		      (when (string-match-p (car rewrite) f1)
 			(throw 'result (concat wdir (cdr rewrite))))))))
 	      ;; -- end of redirects --
 
-- 
2.11.0 (Apple Git-81)


[-- Attachment #2.5: Type: text/html, Size: 3067 bytes --]