Gempub cover page; cleanup

Use MIME hooks to generate a Gempub cover page with a preloaded cover image.

This required applying MIME filtering to "file://" requests as well.

Todo: More cleanup, add a gempub.c.

5 files changed, 281 insertions, 75 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 4a9cc763..8b87a638 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -148,7 +148,7 @@ iDefineAudienceGetter(GmRequest, updated)
 iDefineAudienceGetter(GmRequest, finished)
 
 static void checkServerCertificate_GmRequest_(iGmRequest *d) {
-    const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
+    const iTlsCertificate *cert = d->req ? serverCertificate_TlsRequest(d->req) : NULL;
     iGmResponse *resp = d->resp;
     resp->certFlags = 0;
     if (cert) {
@@ -256,6 +256,20 @@ static void readIncoming_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     }
 }
 
+static void applyFilter_GmRequest_(iGmRequest *d) {
+    iAssert(d->state == finished_GmRequestState);
+    iBlock *xbody = tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body, &d->url);
+    if (xbody) {
+        lock_Mutex(d->mtx);
+        clear_String(&d->resp->meta);
+        clear_Block(&d->resp->body);
+        d->state = receivingHeader_GmRequestState;
+        processIncomingData_GmRequest_(d, xbody);
+        d->state = finished_GmRequestState;
+        unlock_Mutex(d->mtx);
+    }
+}
+
 static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     iAssert(req == d->req);
     lock_Mutex(d->mtx);
@@ -275,17 +289,7 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     unlock_Mutex(d->mtx);
     /* Check for mimehooks. */
     if (d->isRespFiltered && d->state == finished_GmRequestState) {
-        iBlock *xbody =
-            tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body, &d->url);
-        if (xbody) {
-            lock_Mutex(d->mtx);
-            clear_String(&d->resp->meta);
-            clear_Block(&d->resp->body);
-            d->state = receivingHeader_GmRequestState;
-            processIncomingData_GmRequest_(d, xbody);
-            d->state = finished_GmRequestState;
-            unlock_Mutex(d->mtx);
-        }
+        applyFilter_GmRequest_(d);
     }
     iNotifyAudience(d, finished, GmRequestFinished);
 }
@@ -531,7 +535,8 @@ static const iString *findContainerArchive_(const iString *path) {
     iBeginCollect();
     while (!isEmpty_String(path) && cmp_String(path, ".")) {
         iString *dir = newRange_String(dirName_Path(path));
-        if (endsWithCase_String(dir, ".zip")) {
+        if (endsWithCase_String(dir, ".zip") ||
+            endsWithCase_String(dir, ".gpub")) {
             iEndCollect();
             return collect_String(dir);
         }
@@ -541,49 +546,6 @@ static const iString *findContainerArchive_(const iString *path) {
     return NULL;
 }
 
-static const char *mediaTypeFromPath_(const iString *path) {
-    if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
-        return "text/gemini; charset=utf-8";
-    }
-    /* TODO: It would be better to default to text/plain, but switch to
-       application/octet-stream if the contents fail to parse as UTF-8. */
-    else if (endsWithCase_String(path, ".txt") ||
-             endsWithCase_String(path, ".md") ||
-             endsWithCase_String(path, ".c") ||
-             endsWithCase_String(path, ".h") ||
-             endsWithCase_String(path, ".cc") ||
-             endsWithCase_String(path, ".hh") ||
-             endsWithCase_String(path, ".cpp") ||
-             endsWithCase_String(path, ".hpp")) {
-        return "text/plain";
-    }
-    else if (endsWithCase_String(path, ".zip")) {
-        return "application/zip";
-    }
-    else if (endsWithCase_String(path, ".png")) {
-        return "image/png";
-    }
-    else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
-        return "image/jpeg";
-    }
-    else if (endsWithCase_String(path, ".gif")) {
-        return "image/gif";
-    }
-    else if (endsWithCase_String(path, ".wav")) {
-        return "audio/wave";
-    }
-    else if (endsWithCase_String(path, ".ogg")) {
-        return "audio/ogg";
-    }
-    else if (endsWithCase_String(path, ".mp3")) {
-        return "audio/mpeg";
-    }
-    else if (endsWithCase_String(path, ".mid")) {
-        return "audio/midi";
-    }
-    return "application/octet-stream";
-}
-
 static iBool isDirectory_(const iString *path) {
     /* TODO: move this to the_Foundation */
     iFileInfo *info = new_FileInfo(path);
@@ -644,14 +606,8 @@ void submit_GmRequest(iGmRequest *d) {
         return;
     }
     else if (equalCase_Rangecc(url.scheme, "file")) {
-        /* TODO: Move this elsewhere. */
-        iString *path = collect_String(urlDecode_String(collect_String(newRange_String(url.path))));
-#if defined (iPlatformMsys)
-        /* Remove the extra slash from the beginning. */
-        if (startsWith_String(path, "/")) {
-            remove_Block(&path->chars, 0, 1);
-        }
-#endif
+        /* TODO: Move handling of "file://" URLs elsewhere, it's getting complex. */
+        iString *path = collect_String(localFilePathFromUrl_String(&d->url));
         iFile *f = new_File(path);
         if (isDirectory_(path)) {
             if (endsWith_String(path, "/")) {
@@ -669,6 +625,14 @@ void submit_GmRequest(iGmRequest *d) {
             iPtrArray *sortedInfo = collectNew_PtrArray();
             iForEach(DirFileInfo, entry,
                      iClob(directoryContents_FileInfo(iClob(new_FileInfo(path))))) {
+                /* Ignore some files. */
+#if defined (iPlatformApple)
+                const iRangecc name = baseName_Path(path_FileInfo(entry.value));
+                if (equal_Rangecc(name, ".DS_Store") ||
+                    equal_Rangecc(name, ".localized")) {
+                    continue;
+                }
+#endif
                 pushBack_PtrArray(sortedInfo, ref_Object(entry.value));
             }
             sort_Array(sortedInfo, (int (*)(const void *, const void *)) cmp_FileInfoPtr_);
@@ -684,7 +648,7 @@ void submit_GmRequest(iGmRequest *d) {
         }
         else if (open_File(f, readOnly_FileMode)) {
             resp->statusCode = success_GmStatusCode;
-            setCStr_String(&resp->meta, mediaTypeFromPath_(path));
+            setCStr_String(&resp->meta, mediaTypeFromPath_String(path));
             /* TODO: Detect text files based on contents? E.g., is the content valid UTF-8. */
             set_Block(&resp->body, collect_Block(readAll_File(f)));
             d->state = receivingBody_GmRequestState;
@@ -718,6 +682,7 @@ void submit_GmRequest(iGmRequest *d) {
                         }
                     }
                     /* Show an archive index page if this is a directory. */
+                    /* TODO: Use a built-in MIME hook for this? */
                     if (isDir) {
                         iString *page = new_String();
                         const iRangecc containerName = baseName_Path(container);
@@ -779,7 +744,7 @@ void submit_GmRequest(iGmRequest *d) {
                         const iBlock *data = data_Archive(arch, entryPath);
                         if (data) {
                             resp->statusCode = success_GmStatusCode;
-                            setCStr_String(&resp->meta, mediaTypeFromPath_(entryPath));
+                            setCStr_String(&resp->meta, mediaTypeFromPath_String(entryPath));
                             set_Block(&resp->body, data);
                         }
                         else {
@@ -787,6 +752,7 @@ void submit_GmRequest(iGmRequest *d) {
                             setCStr_String(&resp->meta, cstr_String(path));
                         }
                     }
+                fileRequestFinished:;
                 }
             }
             else {
@@ -794,9 +760,13 @@ void submit_GmRequest(iGmRequest *d) {
                 setCStr_String(&resp->meta, cstr_String(path));
             }
         }
-fileRequestFinished:
         iRelease(f);
         d->state = finished_GmRequestState;
+        /* MIME hooks may to this content. */
+        if (d->isFilterEnabled && resp->statusCode == success_GmStatusCode) {
+            /* TODO: Use a background thread, the hook may take some time to run. */
+            applyFilter_GmRequest_(d);
+        }
         iNotifyAudience(d, finished, GmRequestFinished);
         return;
     }
diff --git a/src/gmutil.c b/src/gmutil.c
index 18130951..806c989c 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -422,6 +422,71 @@ const char *makeFileUrl_CStr(const char *localFilePath) {
     return cstrCollect_String(makeFileUrl_String(collectNewCStr_String(localFilePath)));
 }
 
+iString *localFilePathFromUrl_String(const iString *d) {
+    iUrl url;
+    init_Url(&url, d);
+    if (!equalCase_Rangecc(url.scheme, "file")) {
+        return NULL;
+    }
+    iString *path = urlDecode_String(collect_String(newRange_String(url.path)));
+#if defined (iPlatformMsys)
+    /* Remove the extra slash from the beginning. */
+    if (startsWith_String(path, "/")) {
+        remove_Block(&path->chars, 0, 1);
+    }
+#endif
+    return path;
+}
+
+const char *mediaTypeFromPath_String(const iString *path) {
+    if (endsWithCase_String(path, ".gmi") || endsWithCase_String(path, ".gemini")) {
+        return "text/gemini; charset=utf-8";
+    }
+    /* TODO: It would be better to default to text/plain, but switch to
+       application/octet-stream if the contents fail to parse as UTF-8. */
+    else if (endsWithCase_String(path, ".txt") ||
+             endsWithCase_String(path, ".md") ||
+             endsWithCase_String(path, ".c") ||
+             endsWithCase_String(path, ".h") ||
+             endsWithCase_String(path, ".cc") ||
+             endsWithCase_String(path, ".hh") ||
+             endsWithCase_String(path, ".cpp") ||
+             endsWithCase_String(path, ".hpp")) {
+        return "text/plain";
+    }
+    else if (endsWithCase_String(path, ".zip")) {
+        return "application/zip";
+    }
+    else if (endsWithCase_String(path, ".gpub")) {
+        return "application/gpub+zip";
+    }
+    else if (endsWithCase_String(path, ".xml")) {
+        return "text/xml";
+    }
+    else if (endsWithCase_String(path, ".png")) {
+        return "image/png";
+    }
+    else if (endsWithCase_String(path, ".jpg") || endsWithCase_String(path, ".jpeg")) {
+        return "image/jpeg";
+    }
+    else if (endsWithCase_String(path, ".gif")) {
+        return "image/gif";
+    }
+    else if (endsWithCase_String(path, ".wav")) {
+        return "audio/wave";
+    }
+    else if (endsWithCase_String(path, ".ogg")) {
+        return "audio/ogg";
+    }
+    else if (endsWithCase_String(path, ".mp3")) {
+        return "audio/mpeg";
+    }
+    else if (endsWithCase_String(path, ".mid")) {
+        return "audio/midi";
+    }
+    return "application/octet-stream";
+}
+
 void urlEncodeSpaces_String(iString *d) {
     for (;;) {
         const size_t pos = indexOfCStr_String(d, " ");
@@ -440,6 +505,12 @@ const iString *withSpacesEncoded_String(const iString *d) {
     return collect_String(enc);
 }
 
+iRangecc mediaTypeWithoutParameters_Rangecc(iRangecc mime) {
+    iRangecc part = iNullRange;
+    nextSplit_Rangecc(mime, ";", &part);
+    return part;
+}
+
 const iString *feedEntryOpenCommand_String(const iString *url, int newTab) {
     if (!isEmpty_String(url)) {
         iString *cmd = collectNew_String();
diff --git a/src/gmutil.h b/src/gmutil.h
index 64c015b8..7aedbc47 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -115,7 +115,11 @@ void            urlDecodePath_String    (iString *);
 void            urlEncodePath_String    (iString *);
 iString *       makeFileUrl_String      (const iString *localFilePath);
 const char *    makeFileUrl_CStr        (const char *localFilePath);
+iString *       localFilePathFromUrl_String(const iString *);
 void            urlEncodeSpaces_String  (iString *);
 const iString * withSpacesEncoded_String(const iString *);
 
+const char *    mediaTypeFromPath_String            (const iString *path);
+iRangecc        mediaTypeWithoutParameters_Rangecc  (iRangecc mime);
+
 const iString * feedEntryOpenCommand_String (const iString *url, int newTab); /* checks fragment */
diff --git a/src/mimehooks.c b/src/mimehooks.c
index 3b3c0d1a..04cbcb36 100644
--- a/src/mimehooks.c
+++ b/src/mimehooks.c
@@ -1,6 +1,9 @@
 #include "mimehooks.h"
+#include "defs.h"
+#include "gmutil.h"
 #include "app.h"
 
+#include <the_Foundation/archive.h>
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
 #include <the_Foundation/path.h>
@@ -109,7 +112,8 @@ static iBlock *translateAtomXmlToGeminiFeed_(const iString *mime, const iBlock *
     init_String(&out);
     format_String(&out,
                   "20 text/gemini\r\n"
-                  "# %s\n\n", cstr_String(title));
+                  "# %s\n\n",
+                  cstr_String(title));
     if (!isEmpty_String(subtitle)) {
         appendFormat_String(&out, "## %s\n\n", cstr_String(subtitle));
     }
@@ -177,8 +181,97 @@ finished:
     return output;
 }
 
+static void appendGemPubProperty_(iString *out, const char *key, const iString *value) {
+    if (!isEmpty_String(value)) {
+        appendFormat_String(out, "%s: %s\n", key, cstr_String(value));
+    }
+}
+
+iBlock *translateGemPubCoverPage_(const iString *mime, const iBlock *source,
+                                  const iString *requestUrl) {
+    iBlock *output = NULL;
+    iArchive *arch = new_Archive();
+    if (openData_Archive(arch, source)) {
+        /* Parse the metadata and check if the required contents are present. */
+        const iBlock *metadata = dataCStr_Archive(arch, "metadata");
+        if (!metadata) {
+            goto cleanup;
+        }
+        enum iGemPubProperty {
+            title_GemPubProperty,
+            author_GemPubProperty,
+            lang_GemPubProperty,
+            description_GemPubProperty,
+            pubDate_GemPubProperty,
+            revDate_GemPubProperty,
+            version_GemPubProperty,
+            cover_GemPubProperty,
+            max_GemPubProperty
+        };
+        static const char *labels[max_GemPubProperty] = {
+            "title:",
+            "author:",
+            "language:",
+            "description:",
+            "publishDate:",
+            "revisionDate:",
+            "version:",
+            "cover:"
+        };
+        iString *props[max_GemPubProperty];
+        iForIndices(i, props) {
+            props[i] = collectNew_String();
+        }
+        /* Default values. */
+        setCStr_String(props[title_GemPubProperty], "Untitled Book");
+        setCStr_String(props[cover_GemPubProperty],
+                       entryCStr_Archive(arch, "cover.jpg") ? "cover.jpg" :
+                       entryCStr_Archive(arch, "cover.png") ? "cover.png" : "");
+        iRangecc line = iNullRange;
+        while (nextSplit_Rangecc(range_Block(metadata), "\n", &line)) {
+            iRangecc clean = line;
+            trim_Rangecc(&clean);
+            iForIndices(i, props) {
+                if (startsWithCase_Rangecc(clean, labels[i])) {
+                    setRange_String(props[i], (iRangecc){ clean.start + strlen(labels[i]), clean.end });
+                    trim_String(props[i]);
+                }
+            }
+        }
+        const iString *baseUrl = withSpacesEncoded_String(requestUrl);
+        iString *out = new_String();
+        format_String(out, "20 text/gemini; charset=utf-8\r\n"
+                      "# %s\n",
+                      cstr_String(props[title_GemPubProperty]));
+        if (!isEmpty_String(props[description_GemPubProperty])) {
+            appendFormat_String(out, "%s\n", cstr_String(props[description_GemPubProperty]));
+        }
+        appendCStr_String(out, "\n");
+        appendGemPubProperty_(out, "Author", props[author_GemPubProperty]);
+        appendGemPubProperty_(out, "Version", props[version_GemPubProperty]);
+        appendFormat_String(out, "\n=> %s/capsule/  " book_Icon " Book index page\n", cstr_String(baseUrl));
+        if (!isEmpty_String(props[cover_GemPubProperty])) {
+            appendFormat_String(out, "\n=> %s/%s  Cover image\n",
+                                cstr_String(baseUrl),
+                                cstr_String(props[cover_GemPubProperty]));
+        }
+        appendCStr_String(out, "\n## About this book\n");
+        appendGemPubProperty_(out, "Revision date", props[revDate_GemPubProperty]);
+        appendGemPubProperty_(out, "Publish date", props[pubDate_GemPubProperty]);
+        appendGemPubProperty_(out, "Language", props[lang_GemPubProperty]);
+        output = copy_Block(utf8_String(out));
+        delete_String(out);
+    }
+cleanup:
+    iRelease(arch);
+    return output;
+}
+
 /*----------------------------------------------------------------------------------------------*/
 
+static const char *gpubMimeType_MimeHooks_      = "application/gpub+zip";
+static const char *mimeHooksFilename_MimeHooks_ = "mimehooks.txt";
+
 struct Impl_MimeHooks {
     iPtrArray filters;
 };
@@ -196,6 +289,12 @@ void deinit_MimeHooks(iMimeHooks *d) {
     deinit_PtrArray(&d->filters);
 }
 
+static iBool checkGemPub_(const iString *mime, const iString *requestUrl) {
+    /* Only process GemPub in local files. */
+    return (equalCase_Rangecc(urlScheme_String(requestUrl), "file") &&
+            startsWithCase_String(mime, gpubMimeType_MimeHooks_));
+}
+
 iBool willTryFilter_MimeHooks(const iMimeHooks *d, const iString *mime) {
     /* TODO: Combine this function with tryFilter_MimeHooks! */
     iRegExpMatch m;
@@ -228,6 +327,12 @@ iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlo
         }
     }
     /* Built-in filters. */
+    if (checkGemPub_(mime, requestUrl)) {
+        iBlock *result = translateGemPubCoverPage_(mime, body, requestUrl);
+        if (result) {
+            return result;
+        }
+    }
     init_RegExpMatch(&m);
     if (matchString_RegExp(xmlMimePattern_(), mime, &m)) {
         iBlock *result = translateAtomXmlToGeminiFeed_(mime, body, requestUrl);
@@ -238,8 +343,6 @@ iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlo
     return NULL;
 }
 
-static const char *mimeHooksFilename_MimeHooks_ = "mimehooks.txt";
-
 void load_MimeHooks(iMimeHooks *d, const char *saveDir) {
     iBool reportError = iFalse;
     iFile *f = newCStr_File(concatPath_CStr(saveDir, mimeHooksFilename_MimeHooks_));
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 9b414b63..11baf9ee 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -54,6 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   include "ios.h"
 #endif
 
+#include <the_Foundation/archive.h>
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
 #include <the_Foundation/objectlist.h>
@@ -1038,6 +1039,22 @@ static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
+static const char *zipPageHeading_(const iRangecc mime) {
+    if (equalCase_Rangecc(mime, "application/gpub+zip")) {
+        return book_Icon " Gempub Book";
+    }
+    iRangecc type = iNullRange;
+    nextSplit_Rangecc(mime, "/", &type); /* skip the part before the slash */
+    nextSplit_Rangecc(mime, "/", &type);
+    if (startsWithCase_Rangecc(type, "x-")) {
+        type.start += 2;
+    }
+    iString *heading = upper_String(collectNewRange_String(type));
+    appendCStr_String(heading, " Archive");
+    prependCStr_String(heading, folder_Icon " ");
+    return cstrCollect_String(heading);
+}
+
 static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response,
                                            const iBool isInitialUpdate) {
     if (d->state == ready_RequestState) {
@@ -1078,13 +1095,16 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     docFormat = plainText_GmDocumentFormat;
                     setRange_String(&d->sourceMime, param);
                 }
-                else if (equal_Rangecc(param, "application/zip")) {
+                else if (equal_Rangecc(param, "application/zip") ||
+                         (startsWith_Rangecc(param, "application/") &&
+                          endsWithCase_Rangecc(param, "+zip"))) {
                     docFormat = gemini_GmDocumentFormat;
                     setRange_String(&d->sourceMime, param);
                     iString *key = collectNew_String();
                     toString_Sym(SDLK_s, KMOD_PRIMARY, key);
-                    format_String(&str, "# " folder_Icon " ZIP Archive\n"
-                                  "%s is a ZIP archive.\n\n%s\n\n",
+                    format_String(&str, "# %s\n"
+                                  "%s is a compressed archive.\n\n%s\n\n",
+                                  zipPageHeading_(param),
                                   cstr_Rangecc(baseName_Path(d->mod.url)),
                                   format_CStr(cstr_Lang("error.unsupported.suggestsave"),
                                               cstr_String(key),
@@ -1101,6 +1121,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     /* Make a simple document with an image or audio player. */
                     docFormat = gemini_GmDocumentFormat;
                     setRange_String(&d->sourceMime, param);
+                    const iGmLinkId imgLinkId = 1; /* there's only the one link */
                     if ((isAudio && isInitialUpdate) || (!isAudio && isRequestFinished)) {
                         const char *linkTitle =
                             startsWith_String(mimeStr, "image/") ? "Image" : "Audio";
@@ -1112,7 +1133,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                         }
                         format_String(&str, "=> %s %s\n", cstr_String(d->mod.url), linkTitle);
                         setData_Media(media_GmDocument(d->doc),
-                                      1,
+                                      imgLinkId,
                                       mimeStr,
                                       &response->body,
                                       !isRequestFinished ? partialData_MediaFlag : 0);
@@ -1121,7 +1142,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     else if (isAudio && !isInitialUpdate) {
                         /* Update the audio content. */
                         setData_Media(media_GmDocument(d->doc),
-                                      1,
+                                      imgLinkId,
                                       mimeStr,
                                       &response->body,
                                       !isRequestFinished ? partialData_MediaFlag : 0);
@@ -1157,6 +1178,43 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
         if (setSource) {
             setSource_DocumentWidget(d, &str);
         }
+        if (isRequestFinished) {
+            /* Gempub: Preload cover image. */ {
+                /* TODO: move to a gempub.c along with other related code */
+                iString *localPath = localFilePathFromUrl_String(d->mod.url);
+                if (localPath) {
+                    if (!iCmpStr(mediaTypeFromPath_String(localPath), "application/gpub+zip")) {
+                        iArchive *arch = iClob(new_Archive());
+                        if (openFile_Archive(arch, localPath)) {
+                            iBool haveImage = iFalse;
+                            for (size_t linkId = 1; ; linkId++) {
+                                const iString *linkUrl = linkUrl_GmDocument(d->doc, linkId);
+                                if (!linkUrl) break;
+                                if (findLinkImage_Media(media_GmDocument(d->doc), linkId)) {
+                                    continue; /* got this already */
+                                }
+                                if (linkFlags_GmDocument(d->doc, linkId) & imageFileExtension_GmLinkFlag) {
+                                    iString *imgEntryPath = collect_String(localFilePathFromUrl_String(linkUrl));
+                                    remove_Block(&imgEntryPath->chars, 0, size_String(localPath) + 1 /* slash, too */);
+                                    setData_Media(media_GmDocument(d->doc),
+                                                  linkId,
+                                                  collectNewCStr_String(mediaTypeFromPath_String(linkUrl)),
+                                                  data_Archive(arch, imgEntryPath),
+                                                  0);
+                                    haveImage = iTrue;
+                                }
+                            }
+                            if (haveImage) {
+                                redoLayout_GmDocument(d->doc);
+                                updateVisible_DocumentWidget_(d);
+                                invalidate_DocumentWidget_(d);
+                            }
+                        }
+                    }
+                    delete_String(localPath);
+                }
+            }
+        }
         deinit_String(&str);
     }
 }