Remote bookmark sources

Bookmarks tagged "remotesource" are fetched and all links are treated as remote bookmarks.

Remote bookmarks are not saved locally.

3 files changed, 26 insertions, 6 deletions

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 },