Bookmarks: Remote bookmarks grouped under source

Rather than mix remote bookmarks with local ones, group them under the source bookmark in "pseudo-folder" fashion. The source is shown as bold.

3 files changed, 38 insertions, 9 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index 7cf7f5a1..9c63710a 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -37,6 +37,7 @@ void init_Bookmark(iBookmark *d) {
     init_String(&d->title);
     init_String(&d->tags);
     iZap(d->when);
+    d->sourceId = 0;
 }
 
 void deinit_Bookmark(iBookmark *d) {
@@ -101,6 +102,7 @@ void init_Bookmarks(iBookmarks *d) {
 void deinit_Bookmarks(iBookmarks *d) {
     iForEach(PtrArray, i, &d->remoteRequests) {
         cancel_GmRequest(i.ptr);
+        free(userData_Object(i.ptr));
         iRelease(i.ptr);
     }
     deinit_PtrArray(&d->remoteRequests);
@@ -193,8 +195,8 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
     unlock_Mutex(d->mtx);
 }
 
-void add_Bookmarks(iBookmarks *d, const iString *url, const iString *title, const iString *tags,
-                   iChar icon) {
+uint32_t add_Bookmarks(iBookmarks *d, const iString *url, const iString *title,
+                               const iString *tags, iChar icon) {
     lock_Mutex(d->mtx);
     iBookmark *bm = new_Bookmark();
     set_String(&bm->url, url);
@@ -204,6 +206,7 @@ void add_Bookmarks(iBookmarks *d, const iString *url, const iString *title, cons
     initCurrent_Time(&bm->when);
     insert_Bookmarks_(d, bm);
     unlock_Mutex(d->mtx);
+    return id_Bookmark(bm);
 }
 
 iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
@@ -402,7 +405,9 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
                 const iString *absUrl = absoluteUrl_String(url_GmRequest(req), urlStr);
                 if (!findUrl_Bookmarks(d, absUrl)) {
                     iString *titleStr = newRange_String(title);
-                    add_Bookmarks(d, absUrl, titleStr, remoteTag, 0x2913 /* arrow down */);
+                    const uint32_t bmId = add_Bookmarks(d, absUrl, titleStr, remoteTag, 0x2913);
+                    iBookmark *bm = get_Bookmarks(d, bmId);
+                    bm->sourceId = *(uint32_t *) userData_Object(req);
                     delete_String(titleStr);
                 }
                 delete_String(urlStr);
@@ -414,6 +419,7 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
     else {
         /* TODO: Show error? */
     }
+    free(userData_Object(req));
     iRelease(req);
     if (isEmpty_PtrArray(&d->remoteRequests)) {
         postCommand_App("bookmarks.changed");
@@ -440,8 +446,11 @@ void fetchRemote_Bookmarks(iBookmarks *d) {
         }
     }
     iConstForEach(PtrArray, i, list_Bookmarks(d, NULL, isRemoteSource_Bookmark_, NULL)) {
-        const iBookmark *bm = i.ptr;
-        iGmRequest *req = new_GmRequest(certs_App());
+        const iBookmark *bm   = i.ptr;
+        iGmRequest *     req  = new_GmRequest(certs_App());
+        uint32_t *       bmId = malloc(4);
+        *bmId                 = id_Bookmark(bm);
+        setUserData_Object(req, bmId);
         pushBack_PtrArray(&d->remoteRequests, req);
         setUrl_GmRequest(req, &bm->url);
         iConnect(GmRequest, req, finished, req, remoteRequestFinished_Bookmarks_);
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 26bd9a47..be2a4cfd 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -39,6 +39,7 @@ struct Impl_Bookmark {
     iString tags;
     iChar icon;
     iTime when;
+    uint32_t sourceId; /* remote */
 };
 
 iLocalDef uint32_t  id_Bookmark (const iBookmark *d) { return d->node.key; }
@@ -59,7 +60,7 @@ void        save_Bookmarks      (const iBookmarks *, const char *dirPath);
 void        fetchRemote_Bookmarks       (iBookmarks *);
 void        requestFinished_Bookmarks   (iBookmarks *, iGmRequest *req);
 
-void        add_Bookmarks       (iBookmarks *, const iString *url, const iString *title,
+uint32_t    add_Bookmarks       (iBookmarks *, const iString *url, const iString *title,
                                  const iString *tags, iChar icon);
 iBool       remove_Bookmarks    (iBookmarks *, uint32_t id);
 iBool       updateBookmarkIcon_Bookmarks    (iBookmarks *, const iString *url, iChar icon);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 317e74bd..e28f86f9 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -52,6 +52,7 @@ struct Impl_SidebarItem {
     uint32_t  id;
     int       indent;
     iChar     icon;
+    iBool     isBold;
     iString   label;
     iString   meta;
     iString   url;
@@ -62,6 +63,7 @@ void init_SidebarItem(iSidebarItem *d) {
     d->id     = 0;
     d->indent = 0;
     d->icon   = 0;
+    d->isBold = iFalse;
     init_String(&d->label);
     init_String(&d->meta);
     init_String(&d->url);
@@ -106,7 +108,23 @@ static iBool isResizing_SidebarWidget_(const iSidebarWidget *d) {
 }
 
 static int cmpTitle_Bookmark_(const iBookmark **a, const iBookmark **b) {
-    return cmpStringCase_String(&(*a)->title, &(*b)->title);
+    const iBookmark *bm1 = *a, *bm2 = *b;
+    if (bm2->sourceId == id_Bookmark(bm1)) {
+        return -1;
+    }
+    if (bm1->sourceId == id_Bookmark(bm2)) {
+        return 1;
+    }
+    if (bm1->sourceId == bm2->sourceId) {
+        return cmpStringCase_String(&bm1->title, &bm2->title);
+    }
+    if (bm1->sourceId) {
+        bm1 = get_Bookmarks(bookmarks_App(), bm1->sourceId);
+    }
+    if (bm2->sourceId) {
+        bm2 = get_Bookmarks(bookmarks_App(), bm2->sourceId);
+    }
+    return cmpStringCase_String(&bm1->title, &bm2->title);
 }
 
 static void updateItems_SidebarWidget_(iSidebarWidget *d) {
@@ -220,6 +238,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                     init_RegExpMatch(&m);
                     if (matchString_RegExp(remoteSourceTag, &bm->tags, &m)) {
                         appendChar_String(&item->meta, 0x2913);
+                        item->isBold = iTrue;
                     }
                 }
                 addItem_ListWidget(d->list, item);
@@ -1132,8 +1151,8 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
     const int itemHeight     = height_Rect(itemRect);
     const int iconColor      = isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
                                        : uiIcon_ColorId;
-    const int font = uiContent_FontId;
-    int       bg   = uiBackground_ColorId;
+    const int font = d->isBold ? uiContentBold_FontId : uiContent_FontId;
+    int bg         = uiBackground_ColorId;
     if (isHover) {
         bg = isPressing ? uiBackgroundPressed_ColorId
                         : uiBackgroundFramelessHover_ColorId;