3 files changed, 39 insertions, 5 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index cd193627..1d2790cc 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -170,6 +170,7 @@ struct Impl_GmRequest {
     iAtomicInt           allowUpdate;
     iAudience *          updated;
     iAudience *          finished;
+    iGmRequestProgressFunc sendProgress;
 };
 
 iDefineObjectConstructionArgs(GmRequest, (iGmCerts *certs), certs)
@@ -538,11 +539,13 @@ void init_GmRequest(iGmRequest *d, iGmCerts *certs) {
     d->req      = NULL;
     d->updated  = NULL;
     d->finished = NULL;
+    d->sendProgress = NULL;
     d->state    = initialized_GmRequestState;
 }
 
 void deinit_GmRequest(iGmRequest *d) {
     if (d->req) {
+        iDisconnectObject(TlsRequest, d->req, sent, d);
         iDisconnectObject(TlsRequest, d->req, readyRead, d);
         iDisconnectObject(TlsRequest, d->req, finished, d);
     }
@@ -595,6 +598,17 @@ void setTitanData_GmRequest(iGmRequest *d, const iString *mime, const iBlock *pa
     set_String(&d->titan->token, token);
 }
 
+void setSendProgressFunc_GmRequest(iGmRequest *d, iGmRequestProgressFunc func) {
+    d->sendProgress = func;
+}
+
+static void bytesSent_GmRequest_(iGmRequest *d, iTlsRequest *req, size_t sent, size_t toSend) {
+    iUnused(req);
+    if (d->sendProgress) {
+        d->sendProgress(d, sent, toSend);
+    }
+}
+
 static iBool isDirectory_(const iString *path) {
     /* TODO: move this to the_Foundation */
     iFileInfo *info = new_FileInfo(path);
@@ -893,6 +907,7 @@ void submit_GmRequest(iGmRequest *d) {
         setCertificate_TlsRequest(d->req, identity->cert);
     }
     iConnect(TlsRequest, d->req, readyRead, d, readIncoming_GmRequest_);
+    iConnect(TlsRequest, d->req, sent, d, bytesSent_GmRequest_);
     iConnect(TlsRequest, d->req, finished, d, requestFinished_GmRequest_);
     if (port == 0) {
         port = GEMINI_DEFAULT_PORT; /* default Gemini port */
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 2b1f1bdd..97b23f3c 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -64,11 +64,14 @@ iDeclareNotifyFunc(GmRequest, Updated)
 iDeclareNotifyFunc(GmRequest, Finished)
 iDeclareAudienceGetter(GmRequest, updated)
 iDeclareAudienceGetter(GmRequest, finished)
+    
+typedef void (*iGmRequestProgressFunc)(iGmRequest *, size_t current, size_t total);
 
 void                enableFilters_GmRequest     (iGmRequest *, iBool enable);
 void                setUrl_GmRequest            (iGmRequest *, const iString *url);
 void                setTitanData_GmRequest      (iGmRequest *, const iString *mime,
                                                  const iBlock *payload, const iString *token);
+void                setSendProgressFunc_GmRequest(iGmRequest *, iGmRequestProgressFunc func);
 void                submit_GmRequest            (iGmRequest *);
 void                cancel_GmRequest            (iGmRequest *);
 
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 968b3775..f2ddda98 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -45,11 +45,21 @@ struct Impl_UploadWidget {
     iInputWidget *   input;
     iLabelWidget *   filePathLabel;
     iLabelWidget *   fileSizeLabel;
+    iLabelWidget *   counter;
     iString          filePath;
     size_t           fileSize;
     iAtomicInt       isRequestUpdated;
 };
 
+static void updateProgress_UploadWidget_(iGmRequest *request, size_t current, size_t total) {
+    iUploadWidget *d = userData_Object(request);
+    postCommand_Widget(d,
+                       "upload.request.updated reqid:%u arg:%zu total:%zu",
+                       id_GmRequest(request),
+                       current,
+                       total);
+}
+
 void init_UploadWidget(iUploadWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
@@ -113,9 +123,9 @@ void init_UploadWidget(iUploadWidget *d) {
                                                       "upload.accept" } },
                                      2);
         setId_Widget(addChildPosFlags_Widget(buttons,
-                                             iClob(new_LabelWidget("0", NULL)),
+                                             iClob(d->counter = new_LabelWidget("", NULL)),
                                              front_WidgetAddPos, frameless_WidgetFlag),
-                     "upload.pending");
+                     "upload.counter");
         addChild_Widget(w, iClob(buttons));
     }
     resizeToLargestPage_Widget(tabs);
@@ -144,11 +154,13 @@ static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) {
     return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons"));
 }
 
+#if 0
 static void requestUpdated_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
     if (!exchange_Atomic(&d->isRequestUpdated, iTrue)) {
         postCommand_Widget(d, "upload.request.updated reqid:%u", id_GmRequest(req));
     }
 }
+#endif
 
 static void requestFinished_UploadWidget_(iUploadWidget *d, iGmRequest *req) {
     postCommand_Widget(d, "upload.request.finished reqid:%u", id_GmRequest(req));
@@ -170,6 +182,8 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         iAssert(d->request == NULL);
         iAssert(!isEmpty_String(&d->url));
         d->request = new_GmRequest(certs_App());
+        setSendProgressFunc_GmRequest(d->request, updateProgress_UploadWidget_);
+        setUserData_Object(d->request, d);
         setUrl_GmRequest(d->request, &d->url);
         if (tabIndex == 0) {
             /* Uploading text. */
@@ -194,7 +208,7 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
                                    text_InputWidget(d->token));
             close_File(f);
         }
-        iConnect(GmRequest, d->request, updated,  d, requestUpdated_UploadWidget_);
+//        iConnect(GmRequest, d->request, updated,  d, requestUpdated_UploadWidget_);
         iConnect(GmRequest, d->request, finished, d, requestFinished_UploadWidget_);
         submit_GmRequest(d->request);
         /* The dialog will remain open until the request finishes, showing upload progress. */
@@ -204,8 +218,10 @@ static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
         setFlags_Widget(acceptButton_UploadWidget_(d), disabled_WidgetFlag, iTrue);
         return iTrue;
     }
-    else if (isCommand_Widget(w, ev, "upload.request.updated")) {
-        /* TODO: Upload progress update? */   
+    else if (isCommand_Widget(w, ev, "upload.request.updated") &&
+             id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {
+        setText_LabelWidget(d->counter,
+                            collectNewFormat_String("%u", argU32Label_Command(cmd, "arg")));
     }
     else if (isCommand_Widget(w, ev, "upload.request.finished") &&
              id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {