Merge branch 'feature/chapters_treeview'

Author: DavidLazarescu

CMakeLists.txt

@@ -26,9 +26,9 @@ endif()
 
 
 # Create a set of sanitizers
-string(CONCAT LIBRUM_SANITIZERS "-fsanitize=address,undefined,shift,integer-divide-by-zero,"
+string(CONCAT LIBRUM_SANITIZERS #[["-fsanitize=address,undefined,shift,integer-divide-by-zero,"
                                 "float-divide-by-zero,unreachable,vla-bound,null,return,leak,"
-                                "bounds,float-cast-overflow,enum")
+                                "bounds,float-cast-overflow,enum"]])
 
 
 # Dependencies

src/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_AUTORCC ON)
 
 
 # Configuration
-set(QML_IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/presentation/modules;${CMAKE_CURRENT_BINARY_DIR}/" CACHE STRING "Qml modules")
+set(QML_IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/presentation/modules ${CMAKE_CURRENT_BINARY_DIR}/" CACHE STRING "Qml modules")
 
 
 # Dependencies

src/adapters/controllers/book_controller.cpp

@@ -15,8 +15,7 @@ using namespace dtos;
 
 BookController::BookController(application::IBookService* bookService) :
     m_bookService(bookService),
-    m_libraryModel(m_bookService->getBooks()),
-    m_libraryProxyModel(static_cast<QObject*>(&m_libraryModel))
+    m_libraryModel(m_bookService->getBooks())
 {
     // book insertion
     connect(m_bookService, &application::IBookService::bookInsertionStarted,

src/adapters/data_models/library_model/library_proxy_model.cpp

@@ -89,13 +89,13 @@ std::optional<bool> LibraryProxyModel::fuzzCompareBooks(
 
 double LibraryProxyModel::fuzzCompareWithSortingString(QString str) const
 {
-    // If the sorting string is a substring of str, return a high ratio
+    // If the sorting string is a sub-string of str, return a high ratio
     auto leftSubstrPos = str.toLower().indexOf(m_sortString.toLower());
     if(leftSubstrPos != -1)
     {
         // The further at the front, the better the ratio should be
         double ratio = 100 - leftSubstrPos;
-        // A difference in lentgh of the strings should reduce the score
+        // A difference in length of the strings should reduce the score
         ratio -= std::abs(str.length() - m_sortString.length()) * 0.1;
 
         return ratio;
@@ -188,7 +188,8 @@ bool LibraryProxyModel::stringIsLexicographicallyLess(
 {
     if(left.isEmpty())
         return false;
-    else if(right.isEmpty())
+
+    if(right.isEmpty())
         return true;
 
     return left.toLower() < right.toLower();
@@ -207,7 +208,8 @@ bool LibraryProxyModel::openedAfter(const QModelIndex& left,
 
     if(!lhsLastOpenedDate.isValid())
         return false;
-    else if(!rhsLastOpenedDate.isValid())
+
+    if(!rhsLastOpenedDate.isValid())
         return true;
 
     return lhsLastOpenedDate > rhsLastOpenedDate;
@@ -226,7 +228,8 @@ bool LibraryProxyModel::addedToLibraryAfter(const QModelIndex& left,
 
     if(!lhsAddedDate.isValid())
         return false;
-    else if(!rhsAddedDate.isValid())
+
+    if(!rhsAddedDate.isValid())
         return true;
 
     return lhsAddedDate > rhsAddedDate;

src/application/core/CMakeLists.txt

@@ -458,16 +458,20 @@ set(okularpart_SRCS
     gui/pagepainter.cpp
     gui/signatureguiutils.cpp
     gui/signaturemodel.cpp
-    gui/tocmodel.cpp)
+    gui/filtered_tocmodel.cpp
+    gui/tocmodel.cpp
+)
 
 
 kconfig_add_kcfg_files(okularpart_SRCS GENERATE_MOC conf/settings.kcfgc)
 
 add_library(okularpart SHARED ${okularpart_SRCS})
+target_compile_options(okularpart PRIVATE -fexceptions)
 generate_export_header(okularpart BASE_NAME okularpart)
 
 target_link_libraries(okularpart
     okularcore
+    rapidfuzz::rapidfuzz
     ${MATH_LIB}
     Qt5::Svg
     Phonon::phonon4qt5

src/application/core/gui/filtered_tocmodel.cpp

@@ -0,0 +1,79 @@
+#include "filtered_tocmodel.hpp"
+#include <algorithm>
+#include <rapidfuzz/fuzz.hpp>
+
+namespace Okular
+{
+
+FilteredTOCModel::FilteredTOCModel(QObject* parent) :
+    QSortFilterProxyModel { parent }
+{
+}
+
+bool FilteredTOCModel::filterAcceptsRow(int row,
+                                        const QModelIndex& parent) const
+{
+    auto index = sourceModel()->index(row, 0, parent);
+    auto name = sourceModel()->data(index, Qt::ToolTipRole);
+
+    auto x = sourceModel()->index(row, 0, parent);
+    TOCItem* item = static_cast<TOCItem*>(x.internalPointer());
+    if(item != nullptr && hasChildrenMatchingTheFilter(item))
+        return true;
+
+    auto similarity = fuzzCompareWithFilterString(name.toString());
+    double minSimilarity = 70;
+
+    return similarity >= minSimilarity;
+}
+
+void FilteredTOCModel::setFilterString(QString filterString)
+{
+    m_filterString = filterString;
+    invalidateFilter();
+}
+
+QString FilteredTOCModel::getFilterString()
+{
+    return m_filterString;
+}
+
+bool FilteredTOCModel::hasChildrenMatchingTheFilter(const TOCItem* item) const
+{
+    if(itemPassesFilter(item))
+        return true;
+
+    return std::any_of(item->children.begin(), item->children.end(),
+                       [this](const TOCItem* child)
+                       {
+                           return hasChildrenMatchingTheFilter(child);
+                       });
+}
+
+bool FilteredTOCModel::itemPassesFilter(const TOCItem* item) const
+{
+    auto similarity = fuzzCompareWithFilterString(item->text);
+    double minSimilarity = 70;
+
+    return similarity >= minSimilarity;
+}
+
+double FilteredTOCModel::fuzzCompareWithFilterString(QString str) const
+{
+    // If the sorting string is a sub-string of str, return a high ratio
+    auto leftSubstrPos = str.toLower().indexOf(m_filterString.toLower());
+    if(leftSubstrPos != -1)
+    {
+        // The further at the front, the better the ratio should be
+        double ratio = 100 - leftSubstrPos;
+        // A difference in length of the strings should reduce the score
+        ratio -= std::abs(str.length() - m_filterString.length()) * 0.1;
+
+        return ratio;
+    }
+
+    return rapidfuzz::fuzz::ratio(m_filterString.toStdString(),
+                                  str.toStdString());
+}
+
+}  // namespace Okular

src/application/core/gui/filtered_tocmodel.hpp

@@ -0,0 +1,36 @@
+#pragma once
+#include <QSortFilterProxyModel>
+#include "tocmodel.h"
+#include <QString>
+#include <QObject>
+
+namespace Okular
+{
+
+class Q_DECL_EXPORT FilteredTOCModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+    Q_PROPERTY(QString filterString READ getFilterString WRITE setFilterString
+                   NOTIFY filterStringUpdated)
+
+public:
+    explicit FilteredTOCModel(QObject* parent = nullptr);
+    
+    bool filterAcceptsRow(int row,
+                          const QModelIndex& parent) const override;
+    void setFilterString(QString filterString);
+    QString getFilterString();
+    
+Q_SIGNALS:
+    void filterStringUpdated();
+    
+private:
+    // Recursively check if the item or any of its children match the filter
+    bool hasChildrenMatchingTheFilter(const TOCItem* item) const;
+    bool itemPassesFilter(const TOCItem* item) const;
+    double fuzzCompareWithFilterString(QString str) const;
+
+    QString m_filterString;
+};
+
+} // namespace Okular

src/application/core/gui/tocmodel.cpp

@@ -15,25 +15,6 @@
 
 Q_DECLARE_METATYPE(QModelIndex)
 
-struct TOCItem
-{
-    TOCItem();
-    TOCItem(TOCItem* parent, const QDomElement& e);
-    ~TOCItem();
-
-    TOCItem(const TOCItem&) = delete;
-    TOCItem& operator=(const TOCItem&) = delete;
-
-    QString text;
-    Okular::DocumentViewport viewport;
-    QString extFileName;
-    QString url;
-    bool highlight : 1;
-    TOCItem* parent;
-    QList<TOCItem*> children;
-    TOCModelPrivate* model;
-};
-
 class TOCModelPrivate
 {
 public:

src/application/core/gui/tocmodel.h

@@ -1,14 +1,11 @@
-/*
-    SPDX-FileCopyrightText: 2007 Pino Toscano <pino@kde.org>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-
 #ifndef TOCMODEL_H
 #define TOCMODEL_H
 
 #include <QAbstractItemModel>
+#include <QDomDocument>
+#include <QDomElement>
 #include <QVector>
+#include "core/document.h"
 
 namespace Okular
 {
@@ -83,4 +80,23 @@ class Q_DECL_EXPORT TOCModel : public QAbstractItemModel
                        const QModelIndex& parentB = QModelIndex()) const;
 };
 
+struct Q_DECL_EXPORT TOCItem
+{
+    TOCItem();
+    TOCItem(TOCItem* parent, const QDomElement& e);
+    ~TOCItem();
+    
+    TOCItem(const TOCItem&) = delete;
+    TOCItem& operator=(const TOCItem&) = delete;
+    
+    QString text;
+    Okular::DocumentViewport viewport;
+    QString extFileName;
+    QString url;
+    bool highlight : 1;
+    TOCItem* parent;
+    QList<TOCItem*> children;
+    TOCModelPrivate* model;
+};
+
 #endif

src/infrastructure/data/endpoints.hpp

@@ -6,7 +6,7 @@ namespace infrastructure::data
 // clang-format off
 
 
-inline const QString baseUrl { "https://localhost:7084" };
+inline const QString baseUrl { "https://librum-dev.azurewebsites.net" };    
 
 // Authentication
 inline const QString authenticationEndpoint { baseUrl + "/api/login" };