4 files changed, 104 insertions, 29 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 5e762dff..72bd0f33 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -559,8 +559,9 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             const iMediaId imageId = findLinkImage_Media(d->media, run.linkId);
             const iMediaId audioId = !imageId ? findLinkAudio_Media(d->media, run.linkId) : 0;
             if (imageId) {
-                iGmImageInfo img;
+                iGmMediaInfo img;
                 imageInfo_Media(d->media, imageId, &img);
+                const iInt2 imgSize = imageSize_Media(d->media, imageId);
                 /* Mark the link as having content. */ {
                     iGmLink *link = at_PtrArray(&d->links, run.linkId - 1);
                     link->flags |= content_GmLinkFlag;
@@ -572,10 +573,10 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 pos.y += margin;
                 run.bounds.pos = pos;
                 run.bounds.size.x = d->size.x;
-                const float aspect = (float) img.size.y / (float) img.size.x;
+                const float aspect = (float) imgSize.y / (float) imgSize.x;
                 run.bounds.size.y = d->size.x * aspect;
                 run.visBounds = run.bounds;
-                const iInt2 maxSize = mulf_I2(img.size, get_Window()->pixelRatio);
+                const iInt2 maxSize = mulf_I2(imgSize, get_Window()->pixelRatio);
                 if (width_Rect(run.visBounds) > maxSize.x) {
                     /* Don't scale the image up. */
                     run.visBounds.size.y =
@@ -593,7 +594,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                 pos.y += run.bounds.size.y + margin;
             }
             else if (audioId) {
-                iGmAudioInfo info;
+                iGmMediaInfo info;
                 audioInfo_Media(d->media, audioId, &info);
                 /* Mark the link as having content. */ {
                     iGmLink *link = at_PtrArray(&d->links, run.linkId - 1);
diff --git a/src/media.c b/src/media.c
index 8bd635a5..65454756 100644
--- a/src/media.c
+++ b/src/media.c
@@ -37,16 +37,19 @@ iDeclareType(GmMediaProps)
 struct Impl_GmMediaProps {
     iGmLinkId linkId;
     iString   mime;
+    iString   url;
     iBool     isPermanent;
 };
 
 static void init_GmMediaProps_(iGmMediaProps *d) {
     d->linkId = 0;
     init_String(&d->mime);
+    init_String(&d->url);
     d->isPermanent = iFalse;
 }
 
 static void deinit_GmMediaProps_(iGmMediaProps *d) {
+    deinit_String(&d->url);
     deinit_String(&d->mime);
 }
 
@@ -125,9 +128,29 @@ iDefineTypeConstruction(GmAudio)
 
 /*----------------------------------------------------------------------------------------------*/
 
+iDeclareType(GmDownload)
+
+struct Impl_GmDownload {
+    iGmMediaProps props;
+    /* TODO: Speed statistics. */
+};
+
+void init_GmDownload(iGmDownload *d) {
+    init_GmMediaProps_(&d->props);
+}
+
+void deinit_GmDownload(iGmDownload *d) {
+    deinit_GmMediaProps_(&d->props);
+}
+
+iDefineTypeConstruction(GmDownload)
+
+/*----------------------------------------------------------------------------------------------*/
+
 struct Impl_Media {
     iPtrArray images;
-    iPtrArray audio;   
+    iPtrArray audio;
+    iPtrArray downloads;
 };
 
 iDefineTypeConstruction(Media)
@@ -135,10 +158,12 @@ iDefineTypeConstruction(Media)
 void init_Media(iMedia *d) {
     init_PtrArray(&d->images);
     init_PtrArray(&d->audio);
+    init_PtrArray(&d->downloads);
 }
 
 void deinit_Media(iMedia *d) {
     clear_Media(d);
+    deinit_PtrArray(&d->downloads);
     deinit_PtrArray(&d->audio);
     deinit_PtrArray(&d->images);
 }
@@ -152,6 +177,29 @@ void clear_Media(iMedia *d) {
         deinit_GmAudio(a.ptr);
     }
     clear_PtrArray(&d->audio);
+    iForEach(PtrArray, n, &d->downloads) {
+        deinit_GmDownload(n.ptr);
+    }
+    clear_PtrArray(&d->downloads);
+}
+
+iBool setUrl_Media(iMedia *d, iGmLinkId linkId, const iString *url) {
+    iGmDownload *dl       = NULL;
+    iMediaId     existing = findLinkDownload_Media(d, linkId);
+    iBool        isNew    = iFalse;
+    if (!existing) {
+        isNew = iTrue;
+        dl = new_GmDownload();
+        dl->props.linkId = linkId;
+        dl->props.isPermanent = iTrue;
+        set_String(&dl->props.url, url);
+        pushBack_PtrArray(&d->downloads, dl);
+    }
+    else {
+        iGmDownload *dl = at_PtrArray(&d->downloads, existing - 1);
+        set_String(&dl->props.url, url);
+    }
+    return isNew;
 }
 
 iBool setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlock *data,
@@ -195,6 +243,18 @@ iBool setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlo
             }
         }
     }
+    else if ((existing = findLinkDownload_Media(d, linkId)) != 0) {
+        iGmDownload *dl;
+        if (isDeleting) {
+            take_PtrArray(&d->downloads, existing - 1, (void **) &dl);
+            delete_GmDownload(dl);
+        }
+        else {
+            dl = at_PtrArray(&d->downloads, existing - 1);
+            iAssert(equal_String(&dl->props.mime, mime)); /* MIME cannot change */
+            /* TODO: Write data chunk to file. */
+        }
+    }
     else if (!isDeleting) {
         if (startsWith_String(mime, "image/")) {
             /* Copy the image to a texture. */
@@ -253,6 +313,24 @@ iMediaId findLinkAudio_Media(const iMedia *d, iGmLinkId linkId) {
     return 0;
 }
 
+iMediaId findLinkDownload_Media(const iMedia *d, uint16_t linkId) {
+    iConstForEach(PtrArray, i, &d->downloads) {
+        const iGmDownload *dl = i.ptr;
+        if (dl->props.linkId == linkId) {
+            return index_PtrArrayConstIterator(&i) + 1;
+        }
+    }
+    return 0;
+}
+
+iInt2 imageSize_Media(const iMedia *d, iMediaId imageId) {
+    if (imageId > 0 && imageId <= size_PtrArray(&d->images)) {
+        const iGmImage *img = constAt_PtrArray(&d->images, imageId - 1);
+        return img->size;
+    }
+    return zero_I2();
+}
+
 SDL_Texture *imageTexture_Media(const iMedia *d, uint16_t imageId) {
     if (imageId > 0 && imageId <= size_PtrArray(&d->images)) {
         const iGmImage *img = constAt_PtrArray(&d->images, imageId - 1);
@@ -261,12 +339,11 @@ SDL_Texture *imageTexture_Media(const iMedia *d, uint16_t imageId) {
     return NULL;
 }
 
-iBool imageInfo_Media(const iMedia *d, iMediaId imageId, iGmImageInfo *info_out) {
+iBool imageInfo_Media(const iMedia *d, iMediaId imageId, iGmMediaInfo *info_out) {
     if (imageId > 0 && imageId <= size_PtrArray(&d->images)) {
         const iGmImage *img   = constAt_PtrArray(&d->images, imageId - 1);
-        info_out->size        = img->size;
         info_out->numBytes    = img->numBytes;
-        info_out->mime        = cstr_String(&img->props.mime);
+        info_out->type        = cstr_String(&img->props.mime);
         info_out->isPermanent = img->props.isPermanent;
         return iTrue;
     }
@@ -282,10 +359,10 @@ iPlayer *audioData_Media(const iMedia *d, iMediaId audioId) {
     return NULL;
 }
 
-iBool audioInfo_Media(const iMedia *d, iMediaId audioId, iGmAudioInfo *info_out) {
+iBool audioInfo_Media(const iMedia *d, iMediaId audioId, iGmMediaInfo *info_out) {
     if (audioId > 0 && audioId <= size_PtrArray(&d->audio)) {
         const iGmAudio *audio = constAt_PtrArray(&d->audio, audioId - 1);
-        info_out->mime        = cstr_String(&audio->props.mime);
+        info_out->type        = cstr_String(&audio->props.mime);
         info_out->isPermanent = audio->props.isPermanent;
         return iTrue;
     }
diff --git a/src/media.h b/src/media.h
index ddaa2d3c..ebead352 100644
--- a/src/media.h
+++ b/src/media.h
@@ -30,18 +30,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 typedef uint16_t iMediaId;
 
 iDeclareType(Player)
-iDeclareType(GmImageInfo)
-iDeclareType(GmAudioInfo)
+iDeclareType(GmMediaInfo)
 
-struct Impl_GmImageInfo {
-    iInt2       size;
+struct Impl_GmMediaInfo {
+    const char *type; /* MIME */
     size_t      numBytes;
-    const char *mime;
-    iBool       isPermanent;
-};
-
-struct Impl_GmAudioInfo {
-    const char *mime;
     iBool       isPermanent;
 };
 
@@ -54,17 +47,20 @@ enum iMediaFlags {
 };
 
 void    clear_Media     (iMedia *);
+iBool   setUrl_Media    (iMedia *, uint16_t linkId, const iString *url);
 iBool   setData_Media   (iMedia *, uint16_t linkId, const iString *mime, const iBlock *data, int flags);
 
 iMediaId        findLinkImage_Media (const iMedia *, uint16_t linkId);
-iBool           imageInfo_Media     (const iMedia *, iMediaId imageId, iGmImageInfo *info_out);
+iBool           imageInfo_Media     (const iMedia *, iMediaId imageId, iGmMediaInfo *info_out);
+iInt2           imageSize_Media     (const iMedia *, iMediaId imageId);
 SDL_Texture *   imageTexture_Media  (const iMedia *, iMediaId imageId);
 
 size_t          numAudio_Media      (const iMedia *);
 iMediaId        findLinkAudio_Media (const iMedia *, uint16_t linkId);
-iBool           audioInfo_Media     (const iMedia *, iMediaId audioId, iGmAudioInfo *info_out);
+iBool           audioInfo_Media     (const iMedia *, iMediaId audioId, iGmMediaInfo *info_out);
 iPlayer *       audioPlayer_Media   (const iMedia *, iMediaId audioId);
 
+iMediaId        findLinkDownload_Media  (const iMedia *, uint16_t linkId);
 
 /*----------------------------------------------------------------------------------------------*/
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6b023349..87b8d7ad 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1058,7 +1058,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
     else if (d->certFlags & trusted_GmCertFlag) {
         updateTextCStr_LabelWidget(lock, green_ColorEscape closedLock_CStr);
     }
-    else {        
+    else {
         updateTextCStr_LabelWidget(lock, isDarkMode ? orange_ColorEscape "\u26a0"
             : black_ColorEscape "\u26a0");
     }
@@ -1755,7 +1755,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         const iRangecc host = urlHost_String(d->mod.url);
         if (!isEmpty_Block(d->certFingerprint) && !isEmpty_Range(&host)) {
             setTrusted_GmCerts(certs_App(), host, d->certFingerprint, &d->certExpiry);
-            d->certFlags |= trusted_GmCertFlag;            
+            d->certFlags |= trusted_GmCertFlag;
             postCommand_App("document.info");
             updateTrust_DocumentWidget_(d, NULL);
             redoLayout_GmDocument(d->doc);
@@ -2667,7 +2667,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     const int linkFlags = linkFlags_GmDocument(d->doc, linkId);
                     iAssert(linkId);
                     /* Media links are opened inline by default. */
-                    if (isMediaLink_GmDocument(d->doc, linkId)) {                        
+                    if (isMediaLink_GmDocument(d->doc, linkId)) {
                         if (linkFlags & content_GmLinkFlag && linkFlags & permanent_GmLinkFlag) {
                             /* We have the content and it cannot be dismissed, so nothing
                                further to do. */
@@ -3005,15 +3005,16 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             iAssert(imageId || audioId);
             if (imageId) {
                 iAssert(!isEmpty_Rect(run->bounds));
-                iGmImageInfo info;
+                iGmMediaInfo info;
                 imageInfo_Media(constMedia_GmDocument(doc), imageId, &info);
+                const iInt2 imgSize = imageSize_Media(constMedia_GmDocument(doc), imageId);
                 format_String(&text, "%s \u2014 %d x %d \u2014 %.1fMB",
-                              info.mime, info.size.x, info.size.y, info.numBytes / 1.0e6f);
+                              info.type, imgSize.x, imgSize.y, info.numBytes / 1.0e6f);
             }
             else if (audioId) {
-                iGmAudioInfo info;
+                iGmMediaInfo info;
                 audioInfo_Media(constMedia_GmDocument(doc), audioId, &info);
-                format_String(&text, "%s", info.mime);
+                format_String(&text, "%s", info.type);
             }
             if (findMediaRequest_DocumentWidget_(d->widget, run->linkId)) {
                 appendFormat_String(