From: Mario Martelli <tlmtr@schnuddelhuddel.de>
To: emacs-orgmode@gnu.org
Subject: [PATCH] org-protocol: fixes open-source and extends rewriting of URLs
Date: Sun, 25 Jun 2017 08:49:34 +0200 [thread overview]
Message-ID: <4427263B-5534-4FFD-AFA0-211EDA489001@schnuddelhuddel.de> (raw)
In-Reply-To: <5442AC7A-D45E-46FE-A3A7-3AB25679B3FE@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 --]
next prev parent reply other threads:[~2017-06-25 6:49 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 10:14 org-protocol documentation Mario Martelli
2017-06-19 10:41 ` Nicolas Goaziou
2017-06-19 12:37 ` Mario Martelli
2017-06-19 13:41 ` Chunyang Xu
2017-06-21 17:29 ` Nicolas Goaziou
2017-06-21 18:58 ` Mario Martelli
2017-06-21 19:12 ` Nicolas Goaziou
2017-06-22 8:40 ` Mario Martelli
2017-06-22 19:32 ` Mario Martelli
2017-06-22 20:03 ` Nicolas Goaziou
2017-06-23 7:50 ` Mario Martelli
2017-06-23 16:46 ` Mario Martelli
2017-06-25 6:49 ` Mario Martelli [this message]
2017-06-25 7:17 ` [PATCH] org-protocol: fixes open-source and extends rewriting of URLs Nicolas Goaziou
2017-06-25 8:21 ` Mario Martelli
2017-06-26 20:46 ` Nicolas Goaziou
2017-06-27 6:54 ` Mario Martelli
2017-06-28 9:32 ` Nicolas Goaziou
2017-06-28 14:44 ` Mario Martelli
2017-06-28 15:49 ` Nicolas Goaziou
2017-06-29 8:28 ` Mario Martelli
2017-06-29 12:47 ` Nicolas Goaziou
2017-06-25 10:15 ` org-protocol documentation Mario Martelli
2017-06-29 12:42 ` Nicolas Goaziou
2017-06-29 18:30 ` Mario Martelli
2017-06-30 12:05 ` Mario Martelli
2017-07-01 10:34 ` Nicolas Goaziou
2017-07-01 13:13 ` Mario Martelli
2017-07-01 16:42 ` Nicolas Goaziou
2017-07-01 16:44 ` Nicolas Goaziou
2017-07-01 19:24 ` Mario Martelli
2017-07-03 17:21 ` Nick Dokos
2017-07-03 18:09 ` Mario Martelli
2017-07-06 17:54 ` Nicolas Goaziou
2017-07-23 16:18 ` Mario Martelli
2017-07-23 20:49 ` Nicolas Goaziou
2017-07-23 22:39 ` Adam Porter
2017-07-24 6:17 ` Colin Baxter
2017-07-24 23:53 ` Adam Porter
2017-07-25 8:13 ` Colin Baxter
2017-06-30 4:42 ` Mario Martelli
2017-06-19 12:26 ` Chunyang Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4427263B-5534-4FFD-AFA0-211EDA489001@schnuddelhuddel.de \
--to=tlmtr@schnuddelhuddel.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).