From fa42cbc48f58fbdb506cd6aea830b6b4ea8f115b Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Mon, 24 May 2021 13:45:36 +0400
Subject: [PATCH] Pagination info in /catalog/v2/entries

---
 src/opds_dumper.cpp           |  3 +++
 static/catalog_v2_entries.xml |  9 +++++++--
 test/server.cpp               | 19 ++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/opds_dumper.cpp b/src/opds_dumper.cpp
index 7e91e7989..8f98074b5 100644
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -173,6 +173,9 @@ string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const
      {"endpoint_root", rootLocation + "/catalog/v2"},
      {"feed_id", gen_uuid(libraryId + "/entries?"+query)},
      {"filter", query.empty() ? MustacheData(false) : MustacheData(query)},
+     {"totalResults", to_string(m_totalResults)},
+     {"startIndex", to_string(m_startIndex)},
+     {"itemsPerPage", to_string(m_count)},
      {"books", bookData }
   };
 
diff --git a/static/catalog_v2_entries.xml b/static/catalog_v2_entries.xml
index a829b53b6..f227c8f43 100644
--- a/static/catalog_v2_entries.xml
+++ b/static/catalog_v2_entries.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:opds="https://specs.opds.io/opds-1.2">
+      xmlns:opds="https://specs.opds.io/opds-1.2"
+      xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
   <id>{{feed_id}}</id>
 
   <link rel="self"
@@ -15,7 +16,11 @@
 
   <title>{{^filter}}All Entries{{/filter}}{{#filter}}Filtered Entries ({{filter}}){{/filter}}</title>
   <updated>{{date}}</updated>
-
+{{#filter}}
+  <totalResults>{{totalResults}}</totalResults>
+  <startIndx>{{startIndex}}</startIndx>
+  <itemsPerPage>{{itemsPerPage}}</itemsPerPage>
+{{/filter}}
   {{#books}}
   <entry>
     <id>{{id}}</id>
diff --git a/test/server.cpp b/test/server.cpp
index bce722add..fa366be95 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -1006,7 +1006,8 @@ TEST_F(LibraryServerTest, catalog_v2_categories)
 #define CATALOG_V2_ENTRIES_PREAMBLE                           \
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"            \
     "<feed xmlns=\"http://www.w3.org/2005/Atom\"\n"           \
-    "      xmlns:opds=\"https://specs.opds.io/opds-1.2\">\n"  \
+    "      xmlns:opds=\"https://specs.opds.io/opds-1.2\"\n"   \
+    "      xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\">\n"  \
     "  <id>12345678-90ab-cdef-1234-567890abcdef</id>\n"       \
     "\n"                                                      \
     "  <link rel=\"self\"\n"                                  \
@@ -1046,7 +1047,9 @@ TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_range)
       CATALOG_V2_ENTRIES_PREAMBLE
       "  <title>Filtered Entries (start=1)</title>\n"
       "  <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-      "\n"
+      "  <totalResults>3</totalResults>\n"
+      "  <startIndx>1</startIndx>\n"
+      "  <itemsPerPage>2</itemsPerPage>\n"
       RAY_CHARLES_CATALOG_ENTRY
       UNCATEGORIZED_RAY_CHARLES_CATALOG_ENTRY
       "</feed>\n"
@@ -1060,7 +1063,9 @@ TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_range)
       CATALOG_V2_ENTRIES_PREAMBLE
       "  <title>Filtered Entries (count=2)</title>\n"
       "  <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-      "\n"
+      "  <totalResults>3</totalResults>\n"
+      "  <startIndx>0</startIndx>\n"
+      "  <itemsPerPage>2</itemsPerPage>\n"
       CHARLES_RAY_CATALOG_ENTRY
       RAY_CHARLES_CATALOG_ENTRY
       "</feed>\n"
@@ -1074,7 +1079,9 @@ TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_range)
       CATALOG_V2_ENTRIES_PREAMBLE
       "  <title>Filtered Entries (count=1&amp;start=1)</title>\n"
       "  <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-      "\n"
+      "  <totalResults>3</totalResults>\n"
+      "  <startIndx>1</startIndx>\n"
+      "  <itemsPerPage>1</itemsPerPage>\n"
       RAY_CHARLES_CATALOG_ENTRY
       "</feed>\n"
     );
@@ -1089,7 +1096,9 @@ TEST_F(LibraryServerTest, catalog_v2_entries_filtered_by_search_terms)
     CATALOG_V2_ENTRIES_PREAMBLE
     "  <title>Filtered Entries (q=&quot;ray charles&quot;)</title>\n"
     "  <updated>YYYY-MM-DDThh:mm:ssZ</updated>\n"
-    "\n"
+    "  <totalResults>2</totalResults>\n"
+    "  <startIndx>0</startIndx>\n"
+    "  <itemsPerPage>2</itemsPerPage>\n"
     RAY_CHARLES_CATALOG_ENTRY
     CHARLES_RAY_CATALOG_ENTRY
     "</feed>\n"