feat: Add support for %s in URL path

bbugyi200 · Aug 29, 2024 · 154ba2a · 154ba2a
1 parent 3fd8fd6
commit 154ba2a
Show file tree

Hide file tree

Showing 8 changed files with 213 additions and 175 deletions.
diff --git a/src/zorg/grammar/ZorgFile.g4 b/src/zorg/grammar/ZorgFile.g4
@@ -107,4 +107,4 @@ h4_header  : H4_HEADER space_atoms eol ;
 eol        : NL | EOF ;
 
 // URL
-url : ('https://' | 'http://') ID ('.' ID)* (':' NUM_ID)? ('/' ID ((AMP | COLON | DASH | EQUAL | QMARK) PERCENT? (ID | FSLASH))*)* ;
+url : ('https://' | 'http://') ID ('.' ID)* (':' NUM_ID)? ('/' PERCENT? ID ((AMP | COLON | DASH | EQUAL | QMARK) PERCENT? (ID | FSLASH))*)* ;
diff --git a/src/zorg/grammar/zorg_file/ZorgFile.interp b/src/zorg/grammar/zorg_file/ZorgFile.interp
diff --git a/src/zorg/grammar/zorg_file/ZorgFileParser.py b/src/zorg/grammar/zorg_file/ZorgFileParser.py
diff --git a/tests/__snapshots__/test_run_action_open.ambr b/tests/__snapshots__/test_run_action_open.ambr
@@ -58,6 +58,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ################################ [[multiblocks]]
   - 240510#0E Note A2

diff --git a/tests/__snapshots__/test_run_compile.ambr b/tests/__snapshots__/test_run_compile.ambr
@@ -625,7 +625,20 @@
                                    'projects': [],
                                    'properties': {'ID': 'foo_with_url_arg'},
                                    'todo_payload': None,
-                                   'zid': '240828#03'}],
+                                   'zid': '240828#03'},
+                                  {'areas': [],
+                                   'block': None,
+                                   'body': '240828#04 ID::foo_slash_arg '
+                                           'https://go/foo/bar/%s',
+                                   'contexts': ['footnote'],
+                                   'create_date': FakeDate(2024, 8, 28),
+                                   'links': ['x:https://go/foo/bar/%s'],
+                                   'modify_date': FakeDate(2024, 8, 28),
+                                   'people': [],
+                                   'projects': [],
+                                   'properties': {'ID': 'foo_slash_arg'},
+                                   'todo_payload': None,
+                                   'zid': '240828#04'}],
                         'section': None}],
             'h2s': [],
             'page': None,

diff --git a/tests/__snapshots__/test_run_db.ambr b/tests/__snapshots__/test_run_db.ambr
@@ -53,6 +53,7 @@
     'ref:some_article',
     'x:http://www.example.com',
     'x:https://go/foo-bar-baz',
+    'x:https://go/foo/bar/%s',
     'x:https://go/foo:bar:baz',
     'x:https://go/foo?a=/&b=2&c=/',
     'x:https://go/foo?bar=%s',
@@ -65,7 +66,7 @@
   ])
 # ---
 # name: test_run_db_create__note_count[YAMLConfigFile]
-  122
+  123
 # ---
 # name: test_run_db_create__people[YAMLConfigFile]
   list([
@@ -289,6 +290,7 @@
     '240828#01',
     '240828#02',
     '240828#03',
+    '240828#04',
     '301231#X0',
     '301231#X1',
   ])

diff --git a/tests/__snapshots__/test_run_query.ambr b/tests/__snapshots__/test_run_query.ambr
@@ -25,6 +25,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   '''
 # ---
@@ -52,6 +53,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
   o P3 240510#21 Some foobar todo.
   o P3 240510#26 Some foobar todo.
 
@@ -83,6 +85,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   '''
 # ---
@@ -94,6 +97,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
   - 240629#00 A note with a bullet property that contains a sublist
     * url::
       - https://www.foobar.com
@@ -266,6 +270,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ################################ [[multiblocks]]
   o P3 240510#07 Some todo
@@ -782,6 +787,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ################################ @pomodoro
   - 240323#0J #gtd pomodoro
@@ -1006,6 +1012,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
   - 301231#X1 @READ Some article
     * RID::some_article
     * url::http://www.example.com
@@ -1181,6 +1188,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ++++++++++++++++ +arms
   - 240510#0L Sqtdicu Gfwebkj: fdxd://rd/czge-nxgz-vmuncaf
@@ -1393,6 +1401,7 @@
   - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
   - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ################################ [[multiblocks]]
   - 240510#0E Note A2
@@ -1602,6 +1611,7 @@
   - 240704#00 LID::2 https://go/foo-bar-baz
   - 240828#00 ID::foo_bar_baz https://go/foo:bar:baz
   - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+  - 240828#04 ID::foo_slash_arg https://go/foo/bar/%s
 
   ################################ [[priority]]
   o P0 240313#03 High Priority TODO
@@ -1735,6 +1745,7 @@
   tick_03
   x:http://www.example.com
   x:https://go/foo-bar-baz
+  x:https://go/foo/bar/%s
   x:https://go/foo:bar:baz
   x:https://go/foo?a=/&b=2&c=/
   x:https://go/foo?bar=%s
@@ -1767,6 +1778,7 @@
   x:https://go/foo?env=dev&bar=2&baz=3
   x:https://go/foo?a=/&b=2&c=/
   x:https://go/foo?bar=%s
+  x:https://go/foo/bar/%s
   bar.sh
   baz
   buz#fuzz

diff --git a/tests/data/links.zo b/tests/data/links.zo
@@ -25,3 +25,4 @@
 - 240828#01 ID::foo_with_url_query https://go/foo?env=dev&bar=2&baz=3
 - 240828#02 ID::foo_with_slashes_query https://go/foo?a=/&b=2&c=/
 - 240828#03 ID::foo_with_url_arg https://go/foo?bar=%s
+- 240828#04 ID::foo_slash_arg https://go/foo/bar/%s