Subscribing to new headings on a page

When "subscribed" and "headings" tags are used, the subscribed page is tracked for newly added headings (of any kind).

This works for the weiph/pikkulogs out there.

2 files changed, 43 insertions, 14 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index cca77c15..96440feb 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -171,6 +171,7 @@ struct Impl_DocumentWidget {
     const iGmRun * firstVisibleRun;
     const iGmRun * lastVisibleRun;
     iClick         click;
+    iString        pendingGotoHeading;
     float          initNormScrollY;
     iAnim          scrollY;
     iAnim          sideOpacity;
@@ -230,6 +231,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
     init_PtrArray(&d->visiblePlayers);
     d->grabbedPlayer = NULL;
     d->playerTimer   = 0;
+    init_String(&d->pendingGotoHeading);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
     d->menu         = NULL; /* created when clicking */
@@ -259,6 +261,7 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     deinit_Array(&d->outline);
     iRelease(d->media);
     iRelease(d->request);
+    deinit_String(&d->pendingGotoHeading);
     deinit_Block(&d->sourceContent);
     deinit_String(&d->sourceMime);
     iRelease(d->doc);
@@ -1070,6 +1073,16 @@ static void scrollTo_DocumentWidget_(iDocumentWidget *d, int documentY, iBool ce
     scroll_DocumentWidget_(d, 0); /* clamp it */
 }
 
+static void scrollToHeading_DocumentWidget_(iDocumentWidget *d, const char *heading) {
+    iConstForEach(Array, h, headings_GmDocument(d->doc)) {
+        const iGmHeading *head = h.value;
+        if (startsWithCase_Rangecc(head->text, heading)) {
+            postCommandf_App("document.goto loc:%p", head->text.start);
+            break;
+        }
+    }
+}
+
 static void scrollWideBlock_DocumentWidget_(iDocumentWidget *d, iInt2 mousePos, int delta,
                                             int duration) {
     if (delta == 0) {
@@ -1623,6 +1636,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateSideIconBuf_DocumentWidget_(d);
         updateOutline_DocumentWidget_(d);
         postCommandf_App("document.changed url:%s", cstr_String(d->mod.url));
+        /* Check for a pending goto. */
+        if (!isEmpty_String(&d->pendingGotoHeading)) {
+            scrollToHeading_DocumentWidget_(d, cstr_String(&d->pendingGotoHeading));
+            clear_String(&d->pendingGotoHeading);
+        }
         return iFalse;
     }
     else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
@@ -1779,17 +1797,14 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "document.goto") && document_App() == d) {
-        const iRangecc heading = range_Command(cmd, "heading");
-        if (heading.start) {
-            const char *target = cstr_Rangecc(heading);
-            iConstForEach(Array, h, headings_GmDocument(d->doc)) {
-                const iGmHeading *head = h.value;
-                if (startsWithCase_Rangecc(head->text, target)) {
-                    /* TODO: A bit lazy here, the code is right down below. */
-                    postCommandf_App("document.goto loc:%p", head->text.start);
-                    break;
-                }
+        const char *heading = suffixPtr_Command(cmd, "heading");
+        if (heading) {
+            if (isRequestOngoing_DocumentWidget(d)) {
+                /* Scroll position set when request finishes. */
+                setCStr_String(&d->pendingGotoHeading, heading);
+                return iTrue;
             }
+            scrollToHeading_DocumentWidget_(d, heading);
             return iTrue;
         }
         const char *loc = pointerLabel_Command(cmd, "loc");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6bb6d7a1..5baa08f7 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -123,6 +123,9 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             iZap(on);
             iConstForEach(PtrArray, i, listEntries_Feeds()) {
                 const iFeedEntry *entry = i.ptr;
+                if (isHidden_FeedEntry(entry)) {
+                    continue; /* A hidden entry. */
+                }
                 /* For more items, one can always see "about:feeds". A large number of items
                    is a bit difficult to navigate in the sidebar. */
                 if (numItems_ListWidget(d->list) == 100) {
@@ -151,9 +154,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 if (equal_String(docUrl, &entry->url)) {
                     item->listItem.isSelected = iTrue; /* currently being viewed */
                 }
-                if (!containsUrl_Visited(visited_App(), &entry->url)) {
-                    item->indent = 1; /* unread */
-                }
+                item->indent = isUnread_FeedEntry(entry);
                 set_String(&item->url, &entry->url);
                 set_String(&item->label, &entry->title);
                 const iBookmark *bm = get_Bookmarks(bookmarks_App(), entry->bookmarkId);
@@ -498,7 +499,20 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
         }
         case feeds_SidebarMode:
             if (!isEmpty_String(&item->url)) {
-                postCommandf_App("open url:%s", cstr_String(&item->url));
+                const size_t fragPos = indexOf_String(&item->url, '#');
+                if (fragPos != iInvalidPos) {
+                    iString *head = collect_String(
+                        newRange_String((iRangecc){ constBegin_String(&item->url) + fragPos + 1,
+                                                    constEnd_String(&item->url) }));
+                    postCommandf_App(
+                        "open gotourlheading:%s url:%s",
+                        cstr_String(head),
+                        cstr_Rangecc((iRangecc){ constBegin_String(&item->url),
+                                                 constBegin_String(&item->url) + fragPos }));
+                }
+                else {
+                    postCommandf_App("open url:%s", cstr_String(&item->url));
+                }
             }
             break;
         case bookmarks_SidebarMode: