1 files changed, 10 insertions, 102 deletions

diff --git a/src/mimehooks.c b/src/mimehooks.c
index 931c8138..364449ec 100644
--- a/src/mimehooks.c
+++ b/src/mimehooks.c
@@ -23,9 +23,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "mimehooks.h"
 #include "defs.h"
 #include "gmutil.h"
+#include "gempub.h"
 #include "app.h"
 
-#include <the_Foundation/archive.h>
 #include <the_Foundation/file.h>
 #include <the_Foundation/fileinfo.h>
 #include <the_Foundation/path.h>
@@ -203,112 +203,20 @@ 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 *translateGemPubCoverPage_(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.txt");
-        if (!metadata) {
-            goto cleanup;
-        }
-        enum iGemPubProperty {
-            title_GemPubProperty,
-            index_GemPubProperty,
-            author_GemPubProperty,
-            language_GemPubProperty,
-            description_GemPubProperty,
-            published_GemPubProperty,
-            publishDate_GemPubProperty,
-            revisionDate_GemPubProperty,
-            copyright_GemPubProperty,
-            license_GemPubProperty,
-            version_GemPubProperty,
-            cover_GemPubProperty,            
-            max_GemPubProperty
-        };
-        static const char *labels[max_GemPubProperty] = {
-            "title:",
-            "index:",
-            "author:",
-            "language:",
-            "description:",
-            "published:",
-            "publishDate:",
-            "revisionDate:",
-            "copyright:",
-            "license:",
-            "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" : "");
-        setCStr_String(props[index_GemPubProperty], "index.gmi");
-        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]);
-        appendFormat_String(out, "\n=> %s " book_Icon " Book index page\n",
-                            cstrCollect_String(concat_Path(baseUrl, props[index_GemPubProperty])));
-        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, "Version:", props[version_GemPubProperty]);
-        appendGemPubProperty_(out, "Revision date:", props[revisionDate_GemPubProperty]);
-        if (!isEmpty_String(props[publishDate_GemPubProperty])) {
-            appendGemPubProperty_(out, "Publish date:", props[publishDate_GemPubProperty]);
-        }
-        else {
-            appendGemPubProperty_(out, "Published:", props[published_GemPubProperty]);
-        }
-        appendGemPubProperty_(out, "Language:", props[language_GemPubProperty]);
-        appendGemPubProperty_(out, "License:", props[license_GemPubProperty]);
-        appendGemPubProperty_(out, "\u00a9", props[copyright_GemPubProperty]);
-        output = copy_Block(utf8_String(out));
-        delete_String(out);
+    iGempub *gempub = new_Gempub();
+    if (open_Gempub(gempub, source)) {
+        setBaseUrl_Gempub(gempub, requestUrl);
+        output = newCStr_Block("20 text/gemini; charset=utf-8\r\n");
+        append_Block(output, collect_Block(coverPageSource_Gempub(gempub)));
     }
-cleanup:
-    iRelease(arch);
+    delete_Gempub(gempub);
     return output;
 }
 
 /*----------------------------------------------------------------------------------------------*/
 
-static const char *gpubMimeType_MimeHooks_      = "application/gpub+zip";
 static const char *mimeHooksFilename_MimeHooks_ = "mimehooks.txt";
 
 struct Impl_MimeHooks {
@@ -331,7 +239,7 @@ void deinit_MimeHooks(iMimeHooks *d) {
 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_));
+            startsWithCase_String(mime, mimeType_Gempub));
 }
 
 iBool willTryFilter_MimeHooks(const iMimeHooks *d, const iString *mime) {
@@ -367,7 +275,7 @@ iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlo
     }
     /* Built-in filters. */
     if (checkGemPub_(mime, requestUrl)) {
-        iBlock *result = translateGemPubCoverPage_(mime, body, requestUrl);
+        iBlock *result = translateGemPubCoverPage_(body, requestUrl);
         if (result) {
             return result;
         }