Download progress indicator for large downloads

4 files changed, 41 insertions, 9 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 96276636..43cc874a 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -228,7 +228,6 @@ static void readIncoming_GmRequest_(iAnyObject *obj) {
     lock_Mutex(&d->mutex);
     iAssert(d->state != finished_GmRequestState); /* notifications out of order? */
     iBlock *data = readAll_TlsRequest(d->req);
-    fflush(stdout);
     if (d->state == receivingHeader_GmRequestState) {
         appendCStrN_String(&d->resp.meta, constData_Block(data), size_Block(data));
         /* Check if the header line is complete. */
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 23f34577..76ceebcd 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -554,6 +554,20 @@ static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
+static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
+    iLabelWidget *prog   = findWidget_App("document.progress");
+    const size_t  dlSize = d->request ? size_Block(body_GmRequest(d->request)) : 0;
+    setFlags_Widget(as_Widget(prog), hidden_WidgetFlag, dlSize < 250000);
+    if (isVisible_Widget(prog)) {
+        updateText_LabelWidget(prog,
+                               collectNewFormat_String("%s%.3f MB",
+                                                       isFinished_GmRequest(d->request)
+                                                           ? uiHeading_ColorEscape
+                                                           : uiTextCaution_ColorEscape,
+                                                       dlSize / 1.0e6f));
+    }
+}
+
 static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response) {
     if (d->state == ready_RequestState) {
         return;
@@ -566,7 +580,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
         invalidate_DocumentWidget_(d);
         updateTheme_DocumentWidget_(d);
         clear_String(&d->sourceMime);
-        set_Block(&d->sourceContent, &response->body);
+//        set_Block(&d->sourceContent, &response->body);
         initBlock_String(&str, &response->body);
         if (category_GmStatusCode(statusCode) == categorySuccess_GmStatusCode) {
             /* Check the MIME type. */
@@ -867,7 +881,6 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
             case categorySuccess_GmStatusCode:
                 d->scrollY = 0;
                 resetSmoothScroll_DocumentWidget_(d);
-                clear_Block(&d->sourceContent);
                 reset_GmDocument(d->doc); /* new content incoming */
                 updateDocument_DocumentWidget_(d, response_GmRequest(d->request));
                 break;
@@ -1062,6 +1075,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "tabs.changed")) {
         d->showLinkNumbers = iFalse;
+        updateFetchProgress_DocumentWidget_(d);
         if (cmp_String(id_Widget(w), suffixPtr_Command(cmd, "id")) == 0) {
             /* Set palette for our document. */
             updateTheme_DocumentWidget_(d);
@@ -1148,11 +1162,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equalWidget_Command(cmd, w, "document.request.updated") &&
              pointerLabel_Command(cmd, "request") == d->request) {
+        set_Block(&d->sourceContent, body_GmRequest(d->request));
+        updateFetchProgress_DocumentWidget_(d);
         checkResponse_DocumentWidget_(d);
+        set_Atomic(&d->isRequestUpdated, iFalse); /* ready to be notified again */
         return iFalse;
     }
     else if (equalWidget_Command(cmd, w, "document.request.finished") &&
              pointerLabel_Command(cmd, "request") == d->request) {
+        set_Block(&d->sourceContent, body_GmRequest(d->request));
+        updateFetchProgress_DocumentWidget_(d);
         checkResponse_DocumentWidget_(d);
         resetSmoothScroll_DocumentWidget_(d);
         d->scrollY = d->initNormScrollY * size_GmDocument(d->doc).y;
@@ -1185,6 +1204,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             postCommandf_App("document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
             iReleasePtr(&d->request);
             d->state = ready_RequestState;
+            updateFetchProgress_DocumentWidget_(d);
             return iTrue;
         }
     }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 11098c80..320f21ce 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -733,6 +733,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
         deinit_String(&cur);
     }
     delete_String(text);
+    drawChildren_Widget(w);
 }
 
 iBeginDefineSubclass(InputWidget, Widget)
diff --git a/src/ui/window.c b/src/ui/window.c
index fbcf42fe..5e64cf9e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -367,12 +367,24 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(as_Widget(lock), "navbar.lock");
         setFont_LabelWidget(lock, defaultSymbols_FontId);
         updateTextCStr_LabelWidget(lock, "\U0001f512");
-        iInputWidget *url = new_InputWidget(0);
-        setSelectAllOnFocus_InputWidget(url, iTrue);
-        setId_Widget(as_Widget(url), "url");
-        setNotifyEdits_InputWidget(url, iTrue);
-        setTextCStr_InputWidget(url, "gemini://");
-        addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
+        /* URL input field. */ {
+            iInputWidget *url = new_InputWidget(0);
+            setSelectAllOnFocus_InputWidget(url, iTrue);
+            setId_Widget(as_Widget(url), "url");
+            setNotifyEdits_InputWidget(url, iTrue);
+            setTextCStr_InputWidget(url, "gemini://");
+            addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
+            /* Download progress indicator is inside the input field, but hidden normally. */
+            setPadding_Widget(as_Widget(url),0, 0, gap_UI * 1, 0);
+            iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", 0, 0, NULL);
+            setId_Widget(as_Widget(progress), "document.progress");
+            setAlignVisually_LabelWidget(progress, iTrue);
+            shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
+            addChildFlags_Widget(as_Widget(url),
+                                 iClob(progress),
+                                 moveToParentRightEdge_WidgetFlag);
+            setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+        }
         setId_Widget(addChild_Widget(
                          navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
                      "reload");