From 4b9cc80f66c95e091f303f9e30118b5487faf1d4 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 11 Dec 2018 12:08:22 +0100
Subject: [PATCH] Do not do an extra request to search book in the remote
 library.

When doing a search in the library, we know for sure that the result will
be a subset of the library we have (without query). So we can do the
search locally (through the books we already have in cache) instead of
doing another request.
---
 resources/texts/_contentManager.html |  2 +-
 src/contentmanager.cpp               | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/resources/texts/_contentManager.html b/resources/texts/_contentManager.html
index 9ced007..5b09ae9 100644
--- a/resources/texts/_contentManager.html
+++ b/resources/texts/_contentManager.html
@@ -83,7 +83,7 @@ function init() {
 futurCall = null;
 function setSearch(value) {
   clearTimeout(futurCall);
-  futurCall = setTimeout(function(){contentManager.setSearch(value)}, 200);
+  futurCall = setTimeout(function(){contentManager.setSearch(value)}, 100);
 }
 </script>
 <style>
diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
index dcb2178..7bee6f0 100644
--- a/src/contentmanager.cpp
+++ b/src/contentmanager.cpp
@@ -221,8 +221,6 @@ void ContentManager::updateRemoteLibrary() {
     QUrlQuery query;
     query.addQueryItem("lang", m_currentLanguage);
     query.addQueryItem("count", QString::number(0));
-    if (!m_searchQuery.isEmpty())
-        query.addQueryItem("q", m_searchQuery);
     QUrl url;
     url.setScheme("http");
     url.setHost(CATALOG_HOST);
@@ -242,24 +240,18 @@ void ContentManager::updateRemoteLibrary() {
 void ContentManager::setSearch(const QString &search)
 {
     m_searchQuery = search;
-    if (m_local)
-        emit(booksChanged());
-    else
-        emit(remoteParamsChanged());
+    emit(booksChanged());
 }
 
 QStringList ContentManager::getBookIds() {
     if (m_local) {
         return mp_library->listBookIds(m_searchQuery);
     } else {
-        auto bookIds = m_remoteLibrary.getBooksIds();
+        auto bookIds = m_remoteLibrary.listBooksIds(kiwix::REMOTE, kiwix::UNSORTED,
+                                                    m_searchQuery.toStdString());
         QStringList list;
         for(auto& bookId:bookIds) {
-            try{
-                list.append(QString::fromStdString(bookId));
-            } catch (out_of_range&) {
-                break;
-            }
+            list.append(QString::fromStdString(bookId));
         }
         return list;
     }