fix? url_encode aggressively encoding brackets

Author: chapmanjacobd

library/utils/web.py

@@ -838,7 +838,7 @@ def safe_quote(url):
 
     def selective_quote(component, restricted_chars):
         try:
-            quoted = quote(component, errors="strict")
+            quoted = quote(component, safe="/:[]@!$&'()*+,;=", errors="strict")
         except UnicodeDecodeError:
             return component
         return "".join(quote(char, safe="%") if char in restricted_chars else char for char in quoted)

tests/playback/test_links_open.py

@@ -18,3 +18,16 @@ def test_links_open(mock_souffle):
         {"path": "https://site1", "hostname": "site1", "category": "p1"},
         {"path": "https://site2", "hostname": "site2", "category": "p1"},
     ]
+
+@mock.patch("library.playback.links_open.make_souffle")
+@mock.patch("library.playback.links_open.play")
+def test_links_open_brackets(mock_play, mock_souffle, temp_db):
+    db_path = temp_db()
+    url = "https://example.com/test?page[]=107"
+    lb(["links-add", "--no-extract", db_path, url])
+    lb(["links-open", db_path, "-s", url])
+    
+    assert mock_souffle.called
+    media = mock_souffle.call_args[0][1]
+    assert len(media) == 1
+    assert media[0]["path"] == url

tests/playback/test_play_actions.py

@@ -20,11 +20,11 @@
     ("--downloaded-before '1 day'", 0, ""),
     ("--limit 1", 1, "corrupt.mp4"),
     ("-L 1", 1, "corrupt.mp4"),
-    ("--online-media-only", 1, "https://test/?tags%5B%5D="),
-    ("--no-fts -s https://test/?tags%5B%5D=", 1, "https://test/?tags%5B%5D="),
-    ("--no-fts -s https://test/?tags[]=", 1, "https://test/?tags%5B%5D="),
-    ("--no-url-encode-search --no-fts -s https://test/?tags%5B%5D=", 1, "https://test/?tags%5B%5D="),
-    ("--no-url-encode-search --no-fts -s https://test/?tags[]=", 0, ""),
+    ("--online-media-only", 1, "https://test/?tags[]="),
+    ("--no-fts -s https://test/?tags[]=", 1, "https://test/?tags[]="),
+    ("--no-fts -s https://test/?tags%5B%5D=", 1, "https://test/?tags[]="),
+    ("--no-url-encode-search --no-fts -s https://test/?tags[]=", 1, "https://test/?tags[]="),
+    ("--no-url-encode-search --no-fts -s https://test/?tags%5B%5D=", 0, ""),
     ("--offset 1", 4, "test.mp4"),
     ("-s tests -s 'tests AND data' -E 2 -s test -E 3", 4, "corrupt.mp4"),
     ("--created-within '30 years'", 5, "corrupt.mp4"),
@@ -83,7 +83,7 @@
     ("-O duration", 5, "test.gif"),
     ("-O locale_duration", 5, "test.gif"),
     ("-O locale_size", 5, "test_frame.gif"),
-    ("-O reverse_path_path", 5, "https://test/?tags%5B%5D="),
+    ("-O reverse_path_path", 5, "https://test/?tags[]="),
     ("-O size", 5, "test_frame.gif"),
     ("-w time_deleted=0", 5, "corrupt.mp4"),
 ]

tests/utils/__init__.py

@@ -70,7 +70,7 @@ def get_default_args(*funcs):
 v_db = p("tests/data/video.db")
 if not Path(v_db).exists():
     lb(["fs-add", v_db, "--scan-subtitles", p("tests/data/"), "-E", "Youtube"])
-    lb(["links-db", v_db, "--insert-only", "https://test/?tags%5B%5D="])
+    lb(["links-db", v_db, "--insert-only", "https://test/?tags[]="])
 
 
 tube_db = p("tests/data/tube.db")