Canonical URIs

Internally, all URIs should be converted to a canonical form so that they can be compared against each other.

The canonical form is an IRI with spaces and reserved characters percent-encoded.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 1f887c98..65cc7982 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -158,6 +158,7 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
                     appendChar_String(&bm->url, '/');
                 }
                 stripDefaultUrlPort_String(&bm->url);
+                set_String(&bm->url, canonicalUrl_String(&bm->url));
             }
             nextSplit_Rangecc(src, "\n", &line);
             setRange_String(&bm->title, line);
@@ -201,7 +202,7 @@ uint32_t add_Bookmarks(iBookmarks *d, const iString *url, const iString *title,
                        iChar icon) {
     lock_Mutex(d->mtx);
     iBookmark *bm = new_Bookmark();
-    set_String(&bm->url, url);
+    set_String(&bm->url, canonicalUrl_String(url));
     set_String(&bm->title, title);
     if (tags) {
         set_String(&bm->tags, tags);
@@ -298,6 +299,7 @@ static iBool matchUrl_(void *url, const iBookmark *bm) {
 
 uint32_t findUrl_Bookmarks(const iBookmarks *d, const iString *url) {
     /* TODO: O(n), boo */
+    url = canonicalUrl_String(url);
     const iPtrArray *found = list_Bookmarks(d, NULL, matchUrl_, (void *) url);
     if (isEmpty_PtrArray(found)) return 0;
     return id_Bookmark(constFront_PtrArray(found));
@@ -448,7 +450,7 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
                 const iRangecc url    = capturedRange_RegExpMatch(&m, 1);
                 const iRangecc title  = capturedRange_RegExpMatch(&m, 3);
                 iString *      urlStr = newRange_String(url);
-                const iString *absUrl = absoluteUrl_String(url_GmRequest(req), urlStr);
+                const iString *absUrl = canonicalUrl_String(absoluteUrl_String(url_GmRequest(req), urlStr));
                 if (!findUrl_Bookmarks(d, absUrl)) {
                     iString *titleStr = newRange_String(title);
                     if (isEmpty_String(titleStr)) {