Merge pull request #142 from kiwix/sort-books

Sort books

resources/css/_contentManager.css

@@ -58,6 +58,34 @@ html, body {
 .tablecell{
     flex-basis:20%;
 }
+
+.sortable:hover {
+    cursor: pointer;
+}
+
+.sortableBold {
+    font-weight: bold;
+}
+
+i {
+    border: solid black;
+    border-width: 0 3px 3px 0;
+    display: inline-block;
+    padding: 3px;
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg);
+}
+
+.arrowUp {
+  transform: rotate(-135deg);
+  -webkit-transform: rotate(-135deg);
+}
+
+.arrowDown {
+  transform: rotate(45deg);
+  -webkit-transform: rotate(45deg);
+}
+
 .cell0 {
     flex-basis: 60px;
     flex-grow: 0;

resources/js/_contentManager.js

@@ -99,7 +99,9 @@ function init() {
         contentManager: contentManager,
         displayedBooksNb: 20,
         books: [],
-        downloads: {}
+        downloads: {},
+        activeSortType:"",
+        sortOrderAsc:true
       },
       methods: {
         openBook : function(book) {
@@ -161,6 +163,26 @@ function init() {
             }
             return book;
         },
+        sortBookBy : function(sortBy) {
+            if (this.activeSortType == sortBy && this.sortOrderAsc)
+                this.sortOrderAsc = false;
+            else {
+                this.activeSortType = sortBy;
+                this.sortOrderAsc = true;
+            }
+            contentManager.setSortBy(this.activeSortType, this.sortOrderAsc);
+        },
+        isActive: function (sortType) {
+            return (this.activeSortType == sortType)
+        },
+        isUpOrDown: function (sortType, sortOrderAsc) {
+            return (sortType == this.activeSortType && this.sortOrderAsc == sortOrderAsc);
+        },
+        resetSort: function () {
+            this.sortOrderAsc = true;
+            this.activeSortType = "";
+            contentManager.setSortBy("unsorted", this.sortOrderAsc);
+        },
         niceBytes : niceBytes
       }
     });

resources/texts/_contentManager.html

@@ -16,11 +16,13 @@
   <div id="bookTable">
     <div class="header">
       <span class="tablecell cell0"></span>
-      <span class="tablecell cell1">File name</span>
+      <span v-on:click="sortBookBy('title')" :class="{ sortableBold: isActive('title') }" class="tablecell cell1 sortable"><i :class="{ arrowDown: isUpOrDown('title', true), arrowUp: isUpOrDown('title', false) }"></i> File name</span>
-      <span class="tablecell cell2">Size</span>
+      <span v-on:click="sortBookBy('size')" :class="{ sortableBold: isActive('size') }" class="tablecell cell2 sortable"><i :class="{ arrowDown: isUpOrDown('size', true), arrowUp: isUpOrDown('size', false) }"></i> Size</span>
-      <span class="tablecell cell3">Date</span>
+      <span v-on:click="sortBookBy('date')" :class="{ sortableBold: isActive('date') }" class="tablecell cell3 sortable"><i :class="{ arrowDown: isUpOrDown('date', true), arrowUp: isUpOrDown('date', false) }"></i> Date</span>
       <span class="tablecell cell4">Content type</span>
-      <span class="tablecell cell5"></span>
+      <span class="tablecell cell5 tablerow">
+          <button v-on:click="resetSort()">reset sort</button>
+      </span>
     </div>
     <div id="load-icon" class="loader"></div>
     <div id="bookList" onscroll=scrolled(this)>

src/contentmanager.cpp

@@ -331,14 +331,15 @@ QStringList ContentManager::getBookIds()
         filter.rejectTags(tags);
     }
     filter.query(m_searchQuery.toStdString());
-    
+
     if (m_local) {
         filter.local(true);
         filter.valid(true);
-        return mp_library->listBookIds(filter);
+        return mp_library->listBookIds(filter, m_sortBy, m_sortOrderAsc);
     } else {
         filter.remote(true);
         auto bookIds = m_remoteLibrary.filter(filter);
+        m_remoteLibrary.sort(bookIds, m_sortBy, m_sortOrderAsc);
         QStringList list;
         for(auto& bookId:bookIds) {
             list.append(QString::fromStdString(bookId));
@@ -346,3 +347,18 @@ QStringList ContentManager::getBookIds()
         return list;
     }
 }
+
+void ContentManager::setSortBy(const QString& sortBy, const bool sortOrderAsc)
+{
+    if (sortBy == "unsorted") {
+        m_sortBy = kiwix::UNSORTED;
+    } else if (sortBy == "title") {
+        m_sortBy = kiwix::TITLE;
+    } else if (sortBy == "size") {
+        m_sortBy = kiwix::SIZE;
+    } else if (sortBy == "date") {
+        m_sortBy = kiwix::DATE;
+    }
+    m_sortOrderAsc = sortOrderAsc;
+    emit(booksChanged());
+}

src/contentmanager.h

@@ -36,7 +36,8 @@ private:
     QString m_currentLanguage;
     QString m_searchQuery;
     QString m_categoryFilter = "all";
-
+    kiwix::supportedListSortBy m_sortBy = kiwix::UNSORTED;
+    bool m_sortOrderAsc = true;
 
     QStringList getBookIds();
     void eraseBookFilesFromComputer(const QString fileSelection);
@@ -57,6 +58,7 @@ public slots:
     QString downloadBook(const QString& id);
     void updateLibrary();
     void setSearch(const QString& search);
+    void setSortBy(const QString& sortBy, const bool sortOrderAsc);
     void eraseBook(const QString& id);
     void updateRemoteLibrary(const QString& content);
     void pauseBook(const QString& id);

src/library.cpp

@@ -91,10 +91,11 @@ QStringList Library::getBookIds()
     return list;
 }
 
-QStringList Library::listBookIds(const kiwix::Filter& filter)
+QStringList Library::listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending)
 {
     QStringList list;
     auto bookIds = m_library.filter(filter);
+    m_library.sort(bookIds, sortBy, ascending);
     for(auto& id: bookIds) {
         list.append(QString::fromStdString(id));
     }

src/library.h

@@ -29,7 +29,7 @@ public:
     QString openBookFromPath(const QString& zimPath);
     std::shared_ptr<kiwix::Reader> getReader(const QString& zimId);
     QStringList getBookIds();
-    QStringList listBookIds(const kiwix::Filter& filter);
+    QStringList listBookIds(const kiwix::Filter& filter, kiwix::supportedListSortBy sortBy, bool ascending);
     const std::vector<kiwix::Bookmark>& getBookmarks() { return m_library.getBookmarks(); }
     void addBookToLibrary(kiwix::Book& book);
     void removeBookFromLibraryById(const QString& id);