Added sorting for 'PercentageRead'

Author: DavidLazarescu

src/adapters/data_models/library_model/library_proxy_model.cpp

@@ -53,6 +53,15 @@ bool LibraryProxyModel::lessThan(const QModelIndex& left,
     {
         return addedToLibraryAfter(left, right);
     }
+    case SortRole::Percentage:
+    {
+        return higherProgressPercentage(left, right);
+    }
+    case SortRole::SortRole_END:
+    {
+        qCritical() << QString("Sorting called with role: 'SortRole_END'");
+        return false;
+    }
     default:
         return false;
     }
@@ -128,9 +137,8 @@ bool LibraryProxyModel::filterAcceptsRow(int source_row,
 void LibraryProxyModel::setSortRole(int newRole)
 {
     int firstRole = SortRole::RecentlyAdded;
-    int lastRole = SortRole::LastOpened;
 
-    bool inRange = firstRole <= newRole && newRole <= lastRole;
+    bool inRange = firstRole <= newRole && newRole <= SortRole::SortRole_END;
     if(!inRange)
         return;
 
@@ -227,6 +235,17 @@ bool LibraryProxyModel::addedToLibraryAfter(const QModelIndex& left,
     return lhsAddedDate > rhsAddedDate;
 }
 
+bool LibraryProxyModel::higherProgressPercentage(const QModelIndex& left,
+                                                 const QModelIndex& right) const
+{
+    auto lhs =
+        sourceModel()->data(left, LibraryModel::BookProgressPercentageRole);
+    auto rhs =
+        sourceModel()->data(right, LibraryModel::BookProgressPercentageRole);
+
+    return lhs.toInt() >= rhs.toInt();
+}
+
 bool LibraryProxyModel::filterAcceptsTags(const QModelIndex& bookIndex) const
 {
     auto tags = getTags(bookIndex);

src/adapters/data_models/library_model/library_proxy_model.hpp

@@ -26,7 +26,9 @@ class LibraryProxyModel : public QSortFilterProxyModel
         RecentlyAdded = Qt::UserRole + 1,
         Title,
         Authors,
-        LastOpened
+        LastOpened,
+        Percentage,
+        SortRole_END
     };
 
     Q_ENUM(SortRole);
@@ -64,6 +66,8 @@ class LibraryProxyModel : public QSortFilterProxyModel
     bool openedAfter(const QModelIndex& left, const QModelIndex& right) const;
     bool addedToLibraryAfter(const QModelIndex& left,
                              const QModelIndex& right) const;
+    bool higherProgressPercentage(const QModelIndex& left,
+                                  const QModelIndex& right) const;
     bool filterAcceptsTags(const QModelIndex& bookIndex) const;
     std::vector<adapters::dtos::TagDto> getTags(const QModelIndex& index) const;
     bool bookContainsAllTags(std::vector<adapters::dtos::TagDto> tags) const;

src/presentation/homePage/toolbar/sortByButton/MSortByPopup.qml

@@ -73,7 +73,7 @@ Popup
                     {
                         ListElement { text: "Recently added"; role: LibraryProxyModel.RecentlyAdded }
                         ListElement { text: "Recently read"; role: LibraryProxyModel.LastOpened }
-                        ListElement { text: "Percentage"; role: LibraryProxyModel.Title }
+                        ListElement { text: "Percentage"; role: LibraryProxyModel.Percentage }
                         ListElement { text: "Book (A-Z)"; role: LibraryProxyModel.Title }
                         ListElement { text: "Authors (A-Z)"; role: LibraryProxyModel.Authors }
                     }