6 files changed, 147 insertions, 9 deletions

diff --git a/src/app.c b/src/app.c
index 77fbf430..4ea37cd4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1363,6 +1363,14 @@ iBool handleCommand_App(const char *cmd) {
         makeFeedSettings_Widget(findUrl_Bookmarks(d->bookmarks, url));
         return iTrue;
     }
+    else if (equal_Command(cmd, "bookmarks.reload.remote")) {
+        fetchRemote_Bookmarks(bookmarks_App());
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "bookmarks.request.finished")) {
+        requestFinished_Bookmarks(bookmarks_App(), pointerLabel_Command(cmd, "req"));
+        return iTrue;
+    }
     else if (equal_Command(cmd, "bookmarks.changed")) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
         return iFalse;
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 72c5ad04..27909349 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "bookmarks.h"
 #include "visited.h"
+#include "gmrequest.h"
 #include "app.h"
 
 #include <the_Foundation/file.h>
@@ -82,9 +83,10 @@ static int cmpTitleAscending_Bookmark_(const iBookmark **a, const iBookmark **b)
 static const char *fileName_Bookmarks_ = "bookmarks.txt";
 
 struct Impl_Bookmarks {
-    iMutex *mtx;
-    int     idEnum;
-    iHash   bookmarks; /* bookmark ID is the hash key */
+    iMutex *  mtx;
+    int       idEnum;
+    iHash     bookmarks; /* bookmark ID is the hash key */
+    iPtrArray remoteRequests;
 };
 
 iDefineTypeConstruction(Bookmarks)
@@ -93,9 +95,15 @@ void init_Bookmarks(iBookmarks *d) {
     d->mtx = new_Mutex();
     d->idEnum = 0;
     init_Hash(&d->bookmarks);
+    init_PtrArray(&d->remoteRequests);
 }
 
 void deinit_Bookmarks(iBookmarks *d) {
+    iForEach(PtrArray, i, &d->remoteRequests) {
+        cancel_GmRequest(i.ptr);
+        iRelease(i.ptr);
+    }
+    deinit_PtrArray(&d->remoteRequests);
     clear_Bookmarks(d);
     deinit_Hash(&d->bookmarks);
     delete_Mutex(d->mtx);
@@ -154,15 +162,23 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
         }
     }
     iRelease(f);
+    fetchRemote_Bookmarks(d);
 }
 
 void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
     lock_Mutex(d->mtx);
+    iRegExp *remotePattern = iClob(new_RegExp("\\bremote\\b", caseSensitive_RegExpOption));
     iFile *f = newCStr_File(concatPath_CStr(dirPath, fileName_Bookmarks_));
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {
         iString *str = collectNew_String();
         iConstForEach(Hash, i, &d->bookmarks) {
             const iBookmark *bm = (const iBookmark *) i.value;
+            iRegExpMatch m;
+            init_RegExpMatch(&m);
+            if (matchString_RegExp(remotePattern, &bm->tags, &m)) {
+                /* Remote bookmarks are not saved. */
+                continue;
+            }
             format_String(str,
                           "%08x %lf %s\n%s\n%s\n",
                           bm->icon,
@@ -327,3 +343,92 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
     }
     return str;
 }
+
+static iBool isRemoteSource_Bookmark_(void *context, const iBookmark *d) {
+    iUnused(context);
+    return hasTag_Bookmark(d, "remotesource");
+}
+
+void remoteRequestFinished_Bookmarks_(iBookmarks *d, iGmRequest *req) {
+    iUnused(d);
+    postCommandf_App("bookmarks.request.finished req:%p", req);
+}
+
+void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
+    iBool found = iFalse;
+    iForEach(PtrArray, i, &d->remoteRequests) {
+        if (i.ptr == req) {
+            remove_PtrArrayIterator(&i);
+            found = iTrue;
+            break;
+        }
+    }
+    iAssert(found);
+    /* Parse all links in the result. */
+    if (isSuccess_GmStatusCode(status_GmRequest(req))) {
+        iTime now;
+        initCurrent_Time(&now);
+        iRegExp *linkPattern = new_RegExp("^=>\\s*([^\\s]+)\\s+(.*)", 0);
+        iString src;
+        const iString *remoteTag = collectNewCStr_String("remote");
+        initBlock_String(&src, body_GmRequest(req));
+        iRangecc srcLine = iNullRange;
+        while (nextSplit_Rangecc(range_String(&src), "\n", &srcLine)) {
+            iRangecc line = srcLine;
+            trimEnd_Rangecc(&line);
+            iRegExpMatch m;
+            init_RegExpMatch(&m);            
+            if (matchRange_RegExp(linkPattern, line, &m)) {
+                const iRangecc url    = capturedRange_RegExpMatch(&m, 1);
+                const iRangecc title  = capturedRange_RegExpMatch(&m, 2);
+                iString *      urlStr = newRange_String(url);
+                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, 0x2601 /* cloud */);
+                    delete_String(titleStr);
+                }
+                delete_String(urlStr);
+            }
+        }
+        deinit_String(&src);
+        iRelease(linkPattern);
+    }
+    else {
+        /* TODO: Show error? */
+    }
+    iRelease(req);
+    if (isEmpty_PtrArray(&d->remoteRequests)) {
+        postCommand_App("bookmarks.changed");
+    }
+}
+
+void fetchRemote_Bookmarks(iBookmarks *d) {
+    if (!isEmpty_PtrArray(&d->remoteRequests)) {
+        return; /* Already ongoing. */
+    }
+    lock_Mutex(d->mtx);
+    /* Remove all current remote bookmarks. */ {
+        size_t numRemoved = 0;
+        iForEach(Hash, i, &d->bookmarks) {
+            iBookmark *bm = (iBookmark *) i.value;
+            if (hasTag_Bookmark(bm, "remote")) {
+                delete_Bookmark(bm);
+                remove_HashIterator(&i);
+                numRemoved++;
+            }
+        }
+        if (numRemoved) {
+            postCommand_App("bookmarks.changed");
+        }
+    }
+    iConstForEach(PtrArray, i, list_Bookmarks(d, NULL, isRemoteSource_Bookmark_, NULL)) {
+        const iBookmark *bm = i.ptr;
+        iGmRequest *req = new_GmRequest(certs_App());
+        pushBack_PtrArray(&d->remoteRequests, req);
+        setUrl_GmRequest(req, &bm->url);
+        iConnect(GmRequest, req, finished, req, remoteRequestFinished_Bookmarks_);
+        submit_GmRequest(req);
+    }
+    unlock_Mutex(d->mtx);
+}
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 8273d7bc..2975b082 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -27,6 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
+iDeclareType(GmRequest)
+
 iDeclareType(Bookmark)
 iDeclareTypeConstruction(Bookmark)
 
@@ -54,6 +56,9 @@ void        clear_Bookmarks     (iBookmarks *);
 void        load_Bookmarks      (iBookmarks *, const char *dirPath);
 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,
                                  const iString *tags, iChar icon);
 iBool       remove_Bookmarks    (iBookmarks *, uint32_t id);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index c2672646..3b7e7d4b 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -199,6 +199,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
         case bookmarks_SidebarMode: {
             iRegExp *homeTag = iClob(new_RegExp("\\bhomepage\\b", caseSensitive_RegExpOption));
             iRegExp *subTag  = iClob(new_RegExp("\\bsubscribed\\b", caseSensitive_RegExpOption));
+            iRegExp *remoteSourceTag = iClob(new_RegExp("\\bremotesource\\b", caseSensitive_RegExpOption));
             iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), cmpTitle_Bookmark_, NULL, NULL)) {
                 const iBookmark *bm = i.ptr;
                 iSidebarItem *item = new_SidebarItem();
@@ -216,6 +217,10 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                     if (matchString_RegExp(homeTag, &bm->tags, &m)) {
                         appendChar_String(&item->meta, 0x1f3e0);
                     }
+                    init_RegExpMatch(&m);
+                    if (matchString_RegExp(remoteSourceTag, &bm->tags, &m)) {
+                        appendChar_String(&item->meta, 0x2601);
+                    }
                 }
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
@@ -228,11 +233,14 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                                { "Edit Bookmark...", 0, 0, "bookmark.edit" },
                                { "Copy URL", 0, 0, "bookmark.copy" },
                                { "---", 0, 0, NULL },
-                               { "Subscribe to Feed", 0, 0, "bookmark.tag tag:subscribed" },
-                               { "", 0, 0, "bookmark.tag tag:homepage" },
+                               { "?", 0, 0, "bookmark.tag tag:subscribed" },
+                               { "?", 0, 0, "bookmark.tag tag:homepage" },
+                               { "?", 0, 0, "bookmark.tag tag:remotesource" },
+                               { "---", 0, 0, NULL },
+                               { uiTextCaution_ColorEscape "Delete Bookmark", 0, 0, "bookmark.delete" },
                                { "---", 0, 0, NULL },
-                               { uiTextCaution_ColorEscape "Delete Bookmark", 0, 0, "bookmark.delete" } },
-               10);
+                               { "Refresh Remote Bookmarks", 0, 0, "bookmarks.reload.remote" } },
+               13);
             break;
         }
         case history_SidebarMode: {
@@ -1006,6 +1014,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                                         ? "Unsubscribe from Feed"
                                                         : "Subscribe to Feed");
                         }
+                        menuItem = findMenuItem_Widget(d->menu, "bookmark.tag tag:remotesource");
+                        if (menuItem) {
+                            setTextCStr_LabelWidget(menuItem,
+                                                    hasTag_Bookmark(bm, "remotesource")
+                                                        ? "Remove Bookmark Source"
+                                                        : "Use as Bookmark Source");
+                        }
                     }
                 }
                 else if (d->mode == feeds_SidebarMode && d->contextItem) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 9bd40e80..1118758b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -376,7 +376,9 @@ iWidget *addAction_Widget(iWidget *parent, int key, int kmods, const char *comma
 static iBool isCommandIgnoredByMenus_(const char *cmd) {
     return equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.player.update") ||
            startsWith_CStr(cmd, "feeds.update.") ||
-           equal_Command(cmd, "document.request.updated") || equal_Command(cmd, "window.resized") ||
+           equal_Command(cmd, "document.request.updated") ||
+           equal_Command(cmd, "bookmarks.request.finished") ||
+           equal_Command(cmd, "window.resized") ||
            equal_Command(cmd, "window.reload.update") ||
            (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
 }
@@ -893,7 +895,9 @@ void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt)
 
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Almost any command dismisses the sheet. */
-    if (!(equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.player.update") ||
+    if (!(equal_Command(cmd, "media.updated") ||
+          equal_Command(cmd, "media.player.update") ||
+          equal_Command(cmd, "bookmarks.request.finished") ||
           equal_Command(cmd, "document.request.updated") || startsWith_CStr(cmd, "window."))) {
         destroy_Widget(msg);
     }
diff --git a/src/ui/window.c b/src/ui/window.c
index 6ec4a4f1..bc0a622e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -167,6 +167,7 @@ static iMenuItem bookmarksMenuItems_[] = {
     { "List All", 0, 0, "open url:about:bookmarks" },
     { "List by Tag", 0, 0, "open url:about:bookmarks?tags" },
     { "List by Creation Time", 0, 0, "open url:about:bookmarks?created" },
+    { "Refresh Remote Bookmarks", 0, 0, "bookmarks.reload.remote" },
     { "---", 0, 0, NULL },
     { "Subscribe to This Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
     { "---", 0, 0, NULL },