Re: [PATCH] org-protocol: decode "+" in query part as space (v3)

[Max Nikulin <manikulin@gmail.com>]

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

On 27/09/2021 21:31, Max Nikulin wrote:
> On 27/09/2021 17:38, Bastien wrote:
>> Maxim Nikulin writes:
>>
>>> I have realized that only a half of new apostrophes in doc strings
>>> were properly escaped, so I am attaching updated patch. I still
>>> consider the change as a minor improvement.
>>
>> Probably given the delay, the patch does not apply anymore.
>>
>> Would you be able to reformat and resend it?
> 
> Surprisingly there is no conflicts during rebase. I expected changed 
> context in ORG-NEWS.

I had some test cases for decoding of "+" in org-protocol URIs, so I 
have put them to test-org-protocol.el.


[-- Attachment #2: 0001-test-org-protocol.el-Decode-to-tests.patch --]
[-- Type: text/x-patch, Size: 2564 bytes --]

From 55d5128add97e7ef73f41eb52f4dccfedbeabc6b Mon Sep 17 00:00:00 2001
From: Max Nikulin <manikulin@gmail.com>
Date: Mon, 27 Sep 2021 22:02:09 +0700
Subject: [PATCH] test-org-protocol.el: Decode "+" to " " tests

testing/lisp/test-org-protocol.el
(test-org-protocol/org-protocol-store-link)
(test-org-protocol/org-protocol-capture): Cases to check that "+" is
decoded to space in query parameters (new style of URIs) but preserved
in path components (old style of org-protocol links).
---
 testing/lisp/test-org-protocol.el | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/testing/lisp/test-org-protocol.el b/testing/lisp/test-org-protocol.el
index d33052b30..95fc7f862 100644
--- a/testing/lisp/test-org-protocol.el
+++ b/testing/lisp/test-org-protocol.el
@@ -76,7 +76,15 @@
   ;; New link style
   (let ((uri "/some/directory/org-protocol://store-link?url=URL3&title=TITLE3"))
     (should (null (org-protocol-check-filename-for-protocol uri (list uri) nil)))
-    (should (equal (car org-stored-links) '("URL3" "TITLE3")))))
+    (should (equal (car org-stored-links) '("URL3" "TITLE3"))))
+  ;; Do not decode "+" in old-style link
+  (let ((uri "/org-protocol:/store-link:/one+one/plus+preserved"))
+    (should (null (org-protocol-check-filename-for-protocol uri (list uri) nil)))
+    (should (equal (car org-stored-links) '("one+one" "plus+preserved"))))
+  ;; Decode "+" to space in new-style link
+  (let ((uri "/org-protocol:/store-link/?url=one+two&title=plus+is+space"))
+    (should (null (org-protocol-check-filename-for-protocol uri (list uri) nil)))
+    (should (equal (car org-stored-links) '("one two" "plus is space")))))
 
 (ert-deftest test-org-protocol/org-protocol-store-link-file ()
   "store-link: `org-protocol-sanitize-uri' could distort URL."
@@ -133,6 +141,12 @@
 	    ;; - query parameters, not sure how to include them in template
 	    ("/some/directory/org-protocol:/capture?template=x&url=URL&title=TITLE&body=BODY&from=example"
 	     . "** SOMEDAY\n\nBODY\n\n[[URL][TITLE]]\n")
+            ;; - "+" is not decoded to space in old-style URIs
+            ("/org-protocol:/capture:/t/https%3A%2F%2Forgmode.org%2Fsome+thing/org+mode/Body+plus"
+             . "** TODO\n\nBody+plus\n\n[[https://orgmode.org/some+thing][org+mode]]\n")
+            ;; - decode "+" to space
+            ("/org-protocol:/capture?template=t&url=URL&title=Mailing+list&body=Body+no+plus"
+             . "** TODO\n\nBody no plus\n\n[[URL][Mailing list]]\n")
 	    )))
     ;; Old link style
     (mapc
-- 
2.25.1