From 0841472004fa02320e0ba9da7a5c6d1c7169d7a4 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Thu, 6 Oct 2022 13:17:50 +0400
Subject: [PATCH] Separate templates for full & partial OPDS entries

---
 src/opds_dumper.cpp                           | 6 ++++--
 static/resources_list.txt                     | 1 +
 static/templates/catalog_v2_entry.xml         | 7 +------
 static/templates/catalog_v2_partial_entry.xml | 8 ++++++++
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 static/templates/catalog_v2_partial_entry.xml

diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp
index 67fe91eb8..d1c85dcae 100644
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -99,10 +99,12 @@ kainjow::mustache::object getSingleBookData(const Book& book)
 std::string getSingleBookEntryXML(const Book& book, const std::string& rootLocation, const std::string& endpointRoot, bool partial)
 {
   auto data = getSingleBookData(book);
-  data["dump_partial_entries"] = MustacheData(partial);
   data["endpoint_root"] = endpointRoot;
   data["root"] = rootLocation;
-  return render_template(RESOURCE::templates::catalog_v2_entry_xml, data);
+  const auto xmlTemplate = partial
+                         ? RESOURCE::templates::catalog_v2_partial_entry_xml
+                         : RESOURCE::templates::catalog_v2_entry_xml;
+  return render_template(xmlTemplate, data);
 }
 
 BooksData getBooksData(const Library* library, const std::vector<std::string>& bookIds, const std::string& rootLocation, const std::string& endpointRoot, bool partial)
diff --git a/static/resources_list.txt b/static/resources_list.txt
index 4ff6cc3ce..2730f1b20 100644
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -27,6 +27,7 @@ templates/catalog_entries.xml
 templates/catalog_v2_root.xml
 templates/catalog_v2_entries.xml
 templates/catalog_v2_entry.xml
+templates/catalog_v2_partial_entry.xml
 templates/catalog_v2_categories.xml
 templates/catalog_v2_languages.xml
 templates/url_of_search_results_css
diff --git a/static/templates/catalog_v2_entry.xml b/static/templates/catalog_v2_entry.xml
index 4e53f712f..f7c11f1f9 100644
--- a/static/templates/catalog_v2_entry.xml
+++ b/static/templates/catalog_v2_entry.xml
@@ -2,11 +2,7 @@
     <id>urn:uuid:{{id}}</id>
     <title>{{title}}</title>
     <updated>{{updated}}</updated>
-{{#dump_partial_entries}}
-    <link rel="alternate"
-          href="{{endpoint_root}}/entry/{{{id}}}"
-          type="application/atom+xml;type=entry;profile=opds-catalog"/>
-{{/dump_partial_entries}}{{^dump_partial_entries}}    <summary>{{description}}</summary>
+    <summary>{{description}}</summary>
     <language>{{language}}</language>
     <name>{{name}}</name>
     <flavour>{{flavour}}</flavour>
@@ -28,5 +24,4 @@
     {{#url}}
     <link rel="http://opds-spec.org/acquisition/open-access" type="application/x-zim" href="{{{url}}}" length="{{{size}}}" />
     {{/url}}
-{{/dump_partial_entries}}
   </entry>
diff --git a/static/templates/catalog_v2_partial_entry.xml b/static/templates/catalog_v2_partial_entry.xml
new file mode 100644
index 000000000..f3dc56b17
--- /dev/null
+++ b/static/templates/catalog_v2_partial_entry.xml
@@ -0,0 +1,8 @@
+  <entry>
+    <id>urn:uuid:{{id}}</id>
+    <title>{{title}}</title>
+    <updated>{{updated}}</updated>
+    <link rel="alternate"
+          href="{{endpoint_root}}/entry/{{{id}}}"
+          type="application/atom+xml;type=entry;profile=opds-catalog"/>
+  </entry>