From 67d56f1d03a771e80c4237b37005611c9a5ce319 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 30 Nov 2018 16:01:27 +0100
Subject: [PATCH] Remove contentManager pagination.

The pagination was added as a workaround to a too slow display of
the content.

Now that with commit 4cbf001 we are displaying the icons async, the
pagination is no more usefull.
---
 resources/texts/_contentManager.html | 13 -------------
 src/contentmanager.cpp               | 12 +++++-------
 src/contentmanager.h                 | 21 ---------------------
 3 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/resources/texts/_contentManager.html b/resources/texts/_contentManager.html
index e7f3b89..b361473 100644
--- a/resources/texts/_contentManager.html
+++ b/resources/texts/_contentManager.html
@@ -66,12 +66,6 @@ function init() {
         openBook : function(book) {
           contentManager.openBook(book.id, function() {});
         },
-        changePage : function(delta) {
-          var newPage = contentManager.currentPage+delta;
-          if (newPage < 0) newPage = 0;
-          if (newPage > contentManager.nbPages-1) newPage = contentManager.nbPages-1;
-          contentManager.currentPage = newPage;
-        },
         downloadBook : function(book) {
           contentManager.downloadBook(book.id, function(did)  {
             book.downloadId = did;
@@ -218,13 +212,6 @@ button {
         {{ book.description }}
       </p>
     </details>
-    <div class="footer">
-      <button v-on:click="contentManager.currentPage = 0">First</button>
-      <button v-on:click="changePage(-1)">Previous</button>
-      {{ contentManager.currentPage+1 }} / {{ contentManager.nbPages }}
-      <button v-on:click="changePage(1)">Next</button>
-      <button v-on:click="contentManager.currentPage = contentManager.nbPages-1">Last</button>
-    </div>
   </div>
 </div>
 </body></html>
diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
index 3e96ac4..3ef03f1 100644
--- a/src/contentmanager.cpp
+++ b/src/contentmanager.cpp
@@ -32,7 +32,6 @@ void ContentManager::setLocal(bool local) {
         return;
     }
     m_local = local;
-    m_currentPage = 0;
     emit(remoteParamsChanged());
     emit(booksChanged());
 }
@@ -218,8 +217,7 @@ void ContentManager::setCurrentLanguage(QString language)
 void ContentManager::updateRemoteLibrary() {
     QUrlQuery query;
     query.addQueryItem("lang", m_currentLanguage);
-    query.addQueryItem("count", QString::number(m_booksPerPage));
-    query.addQueryItem("start", QString::number(getStartBookIndex()));
+    query.addQueryItem("count", QString::number(0));
     QUrl url;
     url.setScheme("http");
     url.setHost(CATALOG_HOST);
@@ -237,14 +235,14 @@ void ContentManager::updateRemoteLibrary() {
 
 QStringList ContentManager::getBookIds() {
     if (m_local) {
-        return mp_library->getBookIds().mid(getStartBookIndex(), m_booksPerPage);
+        return mp_library->getBookIds();
     } else {
         auto bookIds = m_remoteLibrary.getBooksIds();
         QStringList list;
-        for(auto i=0; i<m_booksPerPage; i++) {
+        for(auto& bookId:bookIds) {
             try{
-                list.append(QString::fromStdString(bookIds.at(getStartBookIndex()+i)));
-            } catch (out_of_range& e) {
+                list.append(QString::fromStdString(bookId));
+            } catch (out_of_range&) {
                 break;
             }
         }
diff --git a/src/contentmanager.h b/src/contentmanager.h
index 5b65bbf..eaa41cc 100644
--- a/src/contentmanager.h
+++ b/src/contentmanager.h
@@ -10,11 +10,6 @@
 class ContentManager : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int booksPerPage MEMBER m_booksPerPage NOTIFY booksChanged)
-    Q_PROPERTY(int nbPages READ getNbPages NOTIFY booksChanged)
-    Q_PROPERTY(int currentPage MEMBER m_currentPage WRITE setCurrentPage NOTIFY booksChanged)
-    Q_PROPERTY(int startBookIndex READ getStartBookIndex NOTIFY booksChanged)
-    Q_PROPERTY(int endBookIndex READ getEndBookIndex NOTIFY booksChanged)
     Q_PROPERTY(QStringList bookIds READ getBookIds NOTIFY booksChanged)
     Q_PROPERTY(QStringList downloadIds READ getDownloadIds NOTIFY downloadsChanged)
     Q_PROPERTY(QString currentLanguage MEMBER m_currentLanguage WRITE setCurrentLanguage NOTIFY currentLangChanged)
@@ -32,15 +27,9 @@ private:
     kiwix::Library m_remoteLibrary;
     kiwix::Downloader* mp_downloader;
     ContentManagerView* mp_view;
-    int m_booksPerPage = 10;
-    int m_currentPage = 0;
     int m_totalBooks = 0;
     bool m_local = true;
     QString m_currentLanguage;
-    void setCurrentPage(int currentPage) {
-        m_currentPage = max(0, min(currentPage, getNbPages()-1));
-        emit(booksChanged());
-    }
     void setCurrentLanguage(QString language);
 
     QStringList getBookIds();
@@ -52,16 +41,6 @@ signals:
     void currentLangChanged();
 
 public slots:
-    int getNbPages() {
-        auto nbBooks = m_local ? mp_library->getBookIds().length() : m_totalBooks;
-        return round(float(nbBooks) / m_booksPerPage);
-    }
-    int getStartBookIndex() {
-        return m_currentPage * m_booksPerPage;
-    }
-    int getEndBookIndex() {
-        return min((m_currentPage+1) * m_booksPerPage, mp_library->getBookIds().length());
-    }
     QStringList getBookInfos(QString id, const QStringList &keys);
     void openBook(const QString& id);
     QStringList updateDownloadInfos(QString id, const QStringList& keys);