Sidebar: Populate with feed entries

5 files changed, 113 insertions, 34 deletions

diff --git a/src/feeds.c b/src/feeds.c
index cbfc36d0..5034c616 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/stringset.h>
 #include <the_Foundation/thread.h>
 #include <SDL_timer.h>
+#include <ctype.h>
 
 iDeclareType(Feeds)
 iDeclareType(FeedJob)
@@ -109,12 +110,24 @@ static void submit_FeedJob_(iFeedJob *d) {
 }
 
 static iFeedJob *startNextJob_Feeds_(iFeeds *d) {
+    if (isEmpty_PtrArray(&d->jobs)) {
+        return NULL;
+    }
     iFeedJob *job;
-    if (take_PtrArray(&d->jobs, 0, (void **) &job)) {
-        submit_FeedJob_(job);
-        return job;
+    take_PtrArray(&d->jobs, 0, (void **) &job);
+    submit_FeedJob_(job);
+    return job;
+}
+
+static void trimTitle_(iString *title) {
+    const char *start = constBegin_String(title);
+    iConstForEach(String, i, title) {
+        start = i.pos;
+        if (!isSpace_Char(i.value) && !(i.value < 128 && ispunct(i.value))) {
+            break;
+        }
     }
-    return NULL;
+    remove_Block(&title->chars, 0, start - constBegin_String(title));
 }
 
 static void parseResult_FeedJob_(iFeedJob *d) {
@@ -123,7 +136,7 @@ static void parseResult_FeedJob_(iFeedJob *d) {
         iBeginCollect();
         iRegExp *linkPattern =
             new_RegExp("^=>\\s*([^\\s]+)\\s+"
-                       "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])"
+                       "([0-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9])"
                        "([^0-9].*)",
                        0);
         iString src;
@@ -141,8 +154,11 @@ static void parseResult_FeedJob_(iFeedJob *d) {
                 iFeedEntry *entry = new_FeedEntry();
                 entry->bookmarkId = d->bookmarkId;
                 setRange_String(&entry->url, url);
-                set_String(&entry->url, collect_String(lower_String(&entry->url)));
+                set_String(&entry->url,
+                           absoluteUrl_String(url_GmRequest(d->request),
+                                              collect_String(lower_String(&entry->url))));
                 setRange_String(&entry->title, title);
+                trimTitle_(&entry->title);
                 int year, month, day;
                 sscanf(date.start, "%04d-%02d-%02d", &year, &month, &day);
                 init_Time(
@@ -177,7 +193,7 @@ static iBool updateEntries_Feeds_(iFeeds *d, iPtrArray *incoming) {
             delete_FeedEntry(entry);
             if (changed) {
                 /* TODO: better to use a new flag for read feed entries? */
-                removeUrl_Visited(visited_App(), &entry->url);
+                removeUrl_Visited(visited_App(), &existing->url);
                 gotNew = iTrue;
             }
         }
@@ -206,6 +222,7 @@ static iThreadResult fetch_Feeds_(iThread *thread) {
             }
         }
         sleep_Thread(0.5); /* TODO: wait on a Condition so we can exit quickly */
+        if (d->stopWorker) break;
         size_t ongoing = 0;
         iForIndices(i, work) {
             if (work[i]) {
@@ -241,16 +258,18 @@ static iBool startWorker_Feeds_(iFeeds *d) {
     if (d->worker) {
         return iFalse; /* Oops? */
     }
-    d->worker = new_Thread(fetch_Feeds_);
     /* Queue up all the subscriptions for the worker. */
     iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), NULL, isSubscribed_, NULL)) {
-        iFeedJob job;
-        init_FeedJob(&job, i.ptr);
-        pushBack_Array(&d->jobs, &job);
+        iFeedJob* job = new_FeedJob(i.ptr);
+        pushBack_PtrArray(&d->jobs, job);
+    }
+    if (!isEmpty_Array(&d->jobs)) {
+        d->worker = new_Thread(fetch_Feeds_);
+        d->stopWorker = iFalse;
+        start_Thread(d->worker);
+        return iTrue;
     }
-    d->stopWorker = iFalse;
-    start_Thread(d->worker);
-    return iTrue;
+    return iFalse;
 }
 
 static uint32_t refresh_Feeds_(uint32_t interval, void *data) {
@@ -265,7 +284,11 @@ static void stopWorker_Feeds_(iFeeds *d) {
         join_Thread(d->worker);
         iReleasePtr(&d->worker);
     }
-    /* TODO: Clear jobs */
+    /* Clear remaining jobs. */
+    iForEach(PtrArray, i, &d->jobs) {
+        delete_FeedJob(i.ptr);
+    }
+    clear_PtrArray(&d->jobs);
 }
 
 static int cmp_FeedEntryPtr_(const void *a, const void *b) {
@@ -308,7 +331,7 @@ iDeclareType(FeedHashNode)
 
 struct Impl_FeedHashNode {
     iHashNode node;
-    uint32_t bookmarkId;
+    uint32_t  bookmarkId;
 };
 
 static void load_Feeds_(iFeeds *d) {
@@ -353,27 +376,26 @@ static void load_Feeds_(iFeeds *d) {
                 }
                 case 2: {
                     const uint32_t feedId = strtoul(line.start, NULL, 16);
-                    nextSplit_Rangecc(range_Block(src), "\n", &line);
+                    if (!nextSplit_Rangecc(range_Block(src), "\n", &line)) break;
                     const unsigned long long ts = strtoull(line.start, NULL, 10);
-                    nextSplit_Rangecc(range_Block(src), "\n", &line);
-                    iString url;
-                    initRange_String(&url, line);
-                    nextSplit_Rangecc(range_Block(src), "\n", &line);
-                    iString title;
-                    initRange_String(&title, line);
-                    nextSplit_Rangecc(range_Block(src), "\n", &line);
+                    if (!nextSplit_Rangecc(range_Block(src), "\n", &line)) break;
+                    const iRangecc urlRange = line;
+                    if (!nextSplit_Rangecc(range_Block(src), "\n", &line)) break;
+                    const iRangecc titleRange = line;
+                    iString *url   = newRange_String(urlRange);
+                    iString *title = newRange_String(titleRange);
                     /* Look it up in the hash. */
                     const iFeedHashNode *node = (iFeedHashNode *) value_Hash(feeds, feedId);
                     if (node) {
                         iFeedEntry *entry = new_FeedEntry();
                         entry->bookmarkId = node->bookmarkId;
                         entry->timestamp.ts.tv_sec = ts;
-                        set_String(&entry->url, &url);
-                        set_String(&entry->title, &title);
+                        set_String(&entry->url, url);
+                        set_String(&entry->title, title);
                         insert_SortedArray(&d->entries, &entry);
                     }
-                    deinit_String(&title);
-                    deinit_String(&url);
+                    delete_String(title);
+                    delete_String(url);
                     break;
                 }
             }
diff --git a/src/macos.m b/src/macos.m
index 24a6fecb..ceaf14f4 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -287,7 +287,7 @@ static void appearanceChanged_MacOS_(NSString *name) {
     else if ([identifier isEqualToString:sidebarMode_TouchId_]) {
         NSCustomTouchBarItem *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:sidebarMode_TouchId_];
         NSSegmentedControl *seg =
-            [NSSegmentedControl segmentedControlWithLabels:@[ @"Bookmarks", @"History", @"Identities", @"Outline"]
+            [NSSegmentedControl segmentedControlWithLabels:@[ @"Feeds", @"Bookmarks", @"History", @"Idents", @"Outline"]
                                               trackingMode:NSSegmentSwitchTrackingMomentary
                                                     target:[[NSApplication sharedApplication] delegate]
                                                     action:@selector(sidebarModePressed:)];
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index f17f82a1..aac7459e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include "command.h"
 #include "documentwidget.h"
+#include "feeds.h"
 #include "gmcerts.h"
 #include "gmdocument.h"
 #include "inputwidget.h"
@@ -111,6 +112,27 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
     destroy_Widget(d->menu);
     d->menu = NULL;
     switch (d->mode) {
+        case feeds_SidebarMode: {
+            iConstForEach(PtrArray, i, listEntries_Feeds()) {
+                const iFeedEntry *entry = i.ptr;
+                /* TODO: Insert date separators. */
+                iSidebarItem *item = new_SidebarItem();
+                item->icon = 0;
+                const iTime visitTime = urlVisitTime_Visited(visited_App(), &entry->url);
+                if (!isValid_Time(&visitTime)) {
+                    item->icon = 0x25cf; /* black circle */
+                }
+                set_String(&item->url, &entry->url);
+                set_String(&item->label, &entry->title);
+                const iBookmark *bm = get_Bookmarks(bookmarks_App(), entry->bookmarkId);
+                if (bm) {
+                    set_String(&item->meta, &bm->title);
+                }
+                addItem_ListWidget(d->list, item);
+                iRelease(item);
+            }
+            break;
+        }
         case documentOutline_SidebarMode: {
             const iGmDocument *doc = document_DocumentWidget(document_App());
             iConstForEach(Array, i, headings_GmDocument(doc)) {
@@ -281,7 +303,7 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
     for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) {
         setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode);
     }
-    const float heights[max_SidebarMode] = { 1.333f, 1.333f, 3.5f, 1.2f };
+    const float heights[max_SidebarMode] = { 2.5f, 1.333f, 1.333f, 3.5f, 1.2f };
     setBackgroundColor_Widget(as_Widget(d->list),
                               d->mode == documentOutline_SidebarMode ? tmBannerBackground_ColorId
                                                                      : uiBackground_ColorId);
@@ -300,6 +322,7 @@ int width_SidebarWidget(const iSidebarWidget *d) {
 }
 
 static const char *normalModeLabels_[max_SidebarMode] = {
+    "\U00002605 Feeds",
     "\U0001f588 Bookmarks",
     "\U0001f553 History",
     "\U0001f464 Identities",
@@ -307,6 +330,7 @@ static const char *normalModeLabels_[max_SidebarMode] = {
 };
 
 static const char *tightModeLabels_[max_SidebarMode] = {
+    "\U00002605",
     "\U0001f588",
     "\U0001f553",
     "\U0001f464",
@@ -401,6 +425,11 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
             postCommandf_App("document.goto loc:%p", head->text.start);
             break;
         }
+        case feeds_SidebarMode:
+            if (!isEmpty_String(&item->url)) {
+                postCommandf_App("open url:%s", cstr_String(&item->url));
+            }
+            break;
         case bookmarks_SidebarMode:
         case history_SidebarMode: {
             if (!isEmpty_String(&item->url)) {
@@ -826,6 +855,31 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                        fg,
                        range_String(&d->label));
     }
+    else if (sidebar->mode == feeds_SidebarMode) {
+        const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
+                               : uiText_ColorId;
+        const int h1 = lineHeight_Text(uiLabel_FontId);
+        const int h2 = lineHeight_Text(uiContent_FontId);
+        const iRect iconArea = { addY_I2(pos, h1), init_I2(7 * gap_UI, itemHeight - h1) };
+        if (d->icon) {
+            iString str;
+            initUnicodeN_String(&str, &d->icon, 1);
+            drawCentered_Text(uiContent_FontId, iconArea, iFalse, iconColor, "%s", cstr_String(&str));
+            deinit_String(&str);
+        }
+        pos = add_I2(pos, init_I2(7 * gap_UI, (itemHeight - h1 - h2) / 2));
+        draw_Text(uiLabel_FontId,
+                  pos,
+                  isPressing ? fg : uiHeading_ColorId,
+                  "%s",
+                  cstr_String(&d->meta));
+        pos.y += h1;
+        draw_Text(uiContent_FontId,
+                  pos,
+                  isPressing ? fg : uiTextStrong_ColorId,
+                  "%s",
+                  cstr_String(&d->label));
+    }
     else if (sidebar->mode == bookmarks_SidebarMode) {
         const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
                                : uiText_ColorId;
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index acb7d93a..001c8ac1 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "widget.h"
 
 enum iSidebarMode {
+    feeds_SidebarMode,
     bookmarks_SidebarMode,
     history_SidebarMode,
     identities_SidebarMode,
diff --git a/src/ui/window.c b/src/ui/window.c
index 1cad63f5..ee90f12b 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -142,10 +142,11 @@ static const iMenuItem identityMenuItems[] = {
 };
 
 static const iMenuItem viewMenuItems[] = {
-    { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" },
-    { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" },
-    { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
-    { "Show Page Outline", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
+    { "Show Feeds", '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1" },
+    { "Show Bookmarks", '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1" },
+    { "Show History", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
+    { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
+    { "Show Page Outline", '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1" },
     { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
     { "---", 0, 0, NULL },
     { "Go Back", SDLK_LEFTBRACKET, KMOD_PRIMARY, "navigate.back" },
@@ -485,6 +486,7 @@ static void setupUserInterface_Window(iWindow *d) {
         addAction_Widget(d->root, '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1");
         addAction_Widget(d->root, '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1");
         addAction_Widget(d->root, '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1");
+        addAction_Widget(d->root, '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1");
     }
 }