Improved handling of bookmark icons

The effect of a bookmark icon is restricted to URLs that begin with the bookmarked URL.

TODO: Bookmark icon of an URL should affect the whole domain, but this should take into consideration user subdirectories ("~name" or "/users/name").

IssueID #140

3 files changed, 18 insertions, 6 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 7560a24c..60048d36 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -250,8 +250,12 @@ iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon
     return changed;
 }
 
-iChar siteIcon_Bookmarks(const iBookmarks *d, iRangecc hostName) {
+iChar siteIcon_Bookmarks(const iBookmarks *d, const iString *url) {
+    if (isEmpty_String(url)) {
+        return 0;
+    }
     iChar        icon         = 0;
+    iRangecc     hostName     = urlHost_String(url);
     const size_t hostSize     = size_Range(&hostName);
     size_t       matchingSize = iInvalidSize; /* we'll pick the shortest matching */
     lock_Mutex(d->mtx);
@@ -265,6 +269,9 @@ iChar siteIcon_Bookmarks(const iBookmarks *d, iRangecc hostName) {
         if (size_Range(&hostName) == size_Range(&parts.host) &&
             iCmpStrNCase(hostName.start, parts.host.start, hostSize) == 0) {
             const size_t n = size_String(&bm->url);
+            if (n > size_String(url)) {
+                continue; /* Bookmark must be higher up in the path tree. */
+            }
             if (n < matchingSize && bm->icon) {
                 matchingSize = n;
                 icon = bm->icon;
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 555ff58b..ab9c683b 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -62,7 +62,7 @@ iBookmark * get_Bookmarks               (iBookmarks *, uint32_t id);
 void        fetchRemote_Bookmarks       (iBookmarks *);
 void        requestFinished_Bookmarks   (iBookmarks *, iGmRequest *req);
 iBool       updateBookmarkIcon_Bookmarks(iBookmarks *, const iString *url, iChar icon);
-iChar       siteIcon_Bookmarks          (const iBookmarks *, iRangecc hostName);
+iChar       siteIcon_Bookmarks          (const iBookmarks *, const iString *url);
 
 void        save_Bookmarks              (const iBookmarks *, const char *dirPath);
 uint32_t    findUrl_Bookmarks           (const iBookmarks *, const iString *url); /* O(n) */
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 3298fecc..ff088ef7 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -720,6 +720,13 @@ static void setDerivedThemeColors_(enum iGmDocumentTheme theme) {
     }
 }
 
+static void updateIconBasedOnUrl_GmDocument_(iGmDocument *d) {
+    const iChar userIcon = siteIcon_Bookmarks(bookmarks_App(), &d->url);
+    if (userIcon) {
+        d->siteIcon = userIcon;
+    }
+}
+
 void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
     const iPrefs *        prefs = prefs_App();
     enum iGmDocumentTheme theme =
@@ -1092,10 +1099,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         if (equal_CStr(cstr_Block(seed), "gemini.circumlunar.space")) {
             d->siteIcon = 0x264a; /* gemini symbol */
         }
-        const iChar userIcon = siteIcon_Bookmarks(bookmarks_App(), urlHost_String(&d->url));
-        if (userIcon) {
-            d->siteIcon = userIcon;
-        }
+        updateIconBasedOnUrl_GmDocument_(d);
     }
 #if 0
     for (int i = tmFirst_ColorId; i < max_ColorId; ++i) {
@@ -1197,6 +1201,7 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     iUrl parts;
     init_Url(&parts, url);
     setRange_String(&d->localHost, parts.host);
+    updateIconBasedOnUrl_GmDocument_(d);
 }
 
 void setSource_GmDocument(iGmDocument *d, const iString *source, int width) {