From 6f1799db9f9a97cf0d7b98f8080dd6a315e719f1 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 17 Nov 2021 15:12:53 +0100
Subject: [PATCH] Use the new endpoint in the OPDS stream.

---
 src/opds_dumper.cpp                   | 7 ++++---
 static/templates/catalog_v2_entry.xml | 4 ++--
 test/server.cpp                       | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp
index 229bc92e2..32d8010ec 100644
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -59,10 +59,11 @@ IllustrationInfo getBookIllustrationInfo(const Book& book)
     kainjow::mustache::list illustrations;
     if ( book.isPathValid() ) {
       for ( const auto& illustration : book.getIllustrations() ) {
+        // For now, we are handling only sizexsize@1 illustration.
+        // So we can simply pass one size to mustache.
         illustrations.push_back(kainjow::mustache::object{
-          {"icon_width", to_string(illustration->width)},
-          {"icon_height", to_string(illustration->height)},
-          {"icon_scale", "1"},
+          {"icon_size", to_string(illustration->width)},
+          {"icon_mimetype", illustration->mimeType}
         });
       }
     }
diff --git a/static/templates/catalog_v2_entry.xml b/static/templates/catalog_v2_entry.xml
index 143872635..9f7df876a 100644
--- a/static/templates/catalog_v2_entry.xml
+++ b/static/templates/catalog_v2_entry.xml
@@ -16,8 +16,8 @@
     <articleCount>{{article_count}}</articleCount>
     <mediaCount>{{media_count}}</mediaCount>
     {{#icons}}<link rel="http://opds-spec.org/image/thumbnail"
-          href="{{root}}/meta?name=Illustration_{{icon_width}}x{{icon_height}}@{{icon_scale}}&amp;content={{{content_id}}}"
-          type="image/png;width={{icon_width}};height={{icon_height}};scale={{icon_scale}}"/>
+          href="{{root}}/catalog/v2/illustration/{{{content_id}}}/?size={{icon_size}}"
+          type="{{icon_mimetype}};width={{icon_size}};height={{icon_size}};scale=1"/>
     {{/icons}}<link type="text/html" href="{{root}}/{{{content_id}}}" />
     <author>
       <name>{{author_name}}</name>
diff --git a/test/server.cpp b/test/server.cpp
index 08eba5043..68a7ac07e 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -686,7 +686,7 @@ std::string maskVariableOPDSFeedData(std::string s)
     "    <articleCount>284</articleCount>\n"                            \
     "    <mediaCount>2</mediaCount>\n"                                  \
     "    <link rel=\"http://opds-spec.org/image/thumbnail\"\n"          \
-    "          href=\"/ROOT/meta?name=Illustration_48x48@1&amp;content=zimfile\"\n" \
+    "          href=\"/ROOT/catalog/v2/illustration/zimfile/?size=48\"\n" \
     "          type=\"image/png;width=48;height=48;scale=1\"/>\n"               \
     "    <link type=\"text/html\" href=\"/ROOT/zimfile\" />\n"               \
     "    <author>\n"                                                    \