Feature/extended search

CHANGELOG.md

@@ -7,6 +7,8 @@ spanish only. Sorry for the mess.
 Version counting is based on semantic versioning (Major.Feature.Patch)
 
 ## WIP
+### YACReaderLibrary
+* New search engine.
 
 ## 9.7.1
 ### YACReader

YACReaderLibrary/YACReaderLibrary.pro

@@ -14,6 +14,8 @@ INCLUDEPATH += . \
 
 DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY
 
+CONFIG += c++11
+
 # load default build flags
 include (../config.pri)
 include (../dependencies/pdf_backend.pri)
@@ -67,10 +69,6 @@ macx {
   QT += macextras gui-private
 }
 
-unix:!macx {
-  CONFIG += c++11
-}
-
 #CONFIG += release
 CONFIG -= flat
 QT += sql network widgets script
@@ -80,7 +78,11 @@ QT += sql network widgets script
 
 # Input
 HEADERS += comic_flow.h \
+  ../common/concurrent_queue.h \
   create_library_dialog.h \
+  db/comic_query_result_procesor.h \
+  db/folder_query_result_processor.h \
+  db/query_lexer.h \
   library_creator.h \
   library_window.h \
   add_library_dialog.h \
@@ -147,6 +149,7 @@ HEADERS += comic_flow.h \
   yacreader_comics_selection_helper.h \
   yacreader_comic_info_helper.h \
   db/reading_list.h \
+  db/query_parser.h \
   current_comic_view_helper.h
 
 !CONFIG(no_opengl) {
@@ -155,6 +158,9 @@ HEADERS += comic_flow.h \
 
 SOURCES += comic_flow.cpp \
     create_library_dialog.cpp \
+    db/comic_query_result_procesor.cpp \
+    db/folder_query_result_processor.cpp \
+    db/query_lexer.cpp \
     library_creator.cpp \
     library_window.cpp \
     main.cpp \
@@ -219,7 +225,8 @@ SOURCES += comic_flow.cpp \
     yacreader_comics_selection_helper.cpp \
     yacreader_comic_info_helper.cpp\
     db/reading_list.cpp \
-    current_comic_view_helper.cpp
+    current_comic_view_helper.cpp \
+    db/query_parser.cpp
 
 !CONFIG(no_opengl) {
     SOURCES += ../common/gl/yacreader_flow_gl.cpp

YACReaderLibrary/db/comic_model.cpp

@@ -9,6 +9,7 @@
 #include "qnaturalsorting.h"
 #include "comic_db.h"
 #include "db_helper.h"
+#include "query_parser.h"
 
 //ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read
 #include "QsLog.h"
@@ -595,59 +596,25 @@ void ComicModel::setupReadingModelData(const QString &databasePath)
     endResetModel();
 }
 
-void ComicModel::setupModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath)
+void ComicModel::setModelData(QList<ComicItem *> *data, const QString &databasePath)
 {
-    beginResetModel();
-    qDeleteAll(_data);
-    _data.clear();
     _databasePath = databasePath;
-    QString connectionName = "";
-
-    {
-        QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath);
-        QSqlQuery selectQuery(db);
 
-        switch (modifier) {
-        case YACReader::NoModifiers:
-            selectQuery.prepare("SELECT ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.isBis,ci.currentPage,ci.rating,ci.hasBeenOpened "
-                                "FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) "
-                                "WHERE UPPER(ci.title) LIKE UPPER(:filter) OR UPPER(c.fileName) LIKE UPPER(:filter) LIMIT :limit");
-            selectQuery.bindValue(":filter", "%%" + filter + "%%");
-            selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
-            break;
-
-        case YACReader::OnlyRead:
-            selectQuery.prepare("SELECT ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.isBis,ci.currentPage,ci.rating,ci.hasBeenOpened "
-                                "FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) "
-                                "WHERE (UPPER(ci.title) LIKE UPPER(:filter) OR UPPER(c.fileName) LIKE UPPER(:filter)) AND ci.read = 1 LIMIT :limit");
-            selectQuery.bindValue(":filter", "%%" + filter + "%%");
-            selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
-            break;
+    beginResetModel();
 
-        case YACReader::OnlyUnread:
-            selectQuery.prepare("SELECT ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.isBis,ci.currentPage,ci.rating,ci.hasBeenOpened "
-                                "FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) "
-                                "WHERE (UPPER(ci.title) LIKE UPPER(:filter) OR UPPER(c.fileName) LIKE UPPER(:filter)) AND ci.read = 0 LIMIT :limit");
-            selectQuery.bindValue(":filter", "%%" + filter + "%%");
-            selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
-            break;
+    qDeleteAll(_data);
 
-        default:
-            QLOG_ERROR() << "not implemented";
-            break;
-        }
+    _data.clear();
 
-        selectQuery.exec();
+    QLOG_ERROR() << "-d2>" << data->size();
 
-        QLOG_DEBUG() << selectQuery.lastError() << "--";
+    _data.append(*data);
 
-        setupModelData(selectQuery);
-        connectionName = db.connectionName();
-    }
-    QSqlDatabase::removeDatabase(connectionName);
     endResetModel();
 
     emit searchNumResults(_data.length());
+
+    delete data;
 }
 
 QString ComicModel::getComicPath(QModelIndex mi)

YACReaderLibrary/db/comic_model.h

@@ -16,7 +16,6 @@ class ComicItem;
 
 using namespace YACReader;
 
-//! [0]
 class ComicModel : public QAbstractItemModel
 {
     Q_OBJECT
@@ -89,8 +88,6 @@ class ComicModel : public QAbstractItemModel
     void setupReadingListModelData(unsigned long long int parentReadingList, const QString &databasePath);
     void setupFavoritesModelData(const QString &databasePath);
     void setupReadingModelData(const QString &databasePath);
-    //configures the model for showing the comics matching the filter criteria.
-    void setupModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath);
 
     //Métodos de conveniencia
     QStringList getPaths(const QString &_source);
@@ -142,6 +139,8 @@ public slots:
     void addComicsToLabel(const QList<qulonglong> &comicIds, qulonglong labelId);
     void addComicsToReadingList(const QList<qulonglong> &comicIds, qulonglong readingListId);
 
+    void setModelData(QList<ComicItem *> *data, const QString &databasePath);
+
 protected:
 private:
     void setupModelData(QSqlQuery &sqlquery);
@@ -164,6 +163,5 @@ public slots:
     void resortedIndexes(QList<int>);
     void newSelectedIndex(const QModelIndex &);
 };
-//! [0]
 
 #endif

YACReaderLibrary/db/comic_query_result_procesor.cpp

@@ -0,0 +1,112 @@
+#include "comic_query_result_procesor.h"
+
+#include "comic_item.h"
+#include "comic_model.h"
+#include "data_base_management.h"
+#include "qnaturalsorting.h"
+#include "db_helper.h"
+#include "query_parser.h"
+
+#include "QsLog.h"
+
+QString getLastExecutedQuery(const QSqlQuery &query)
+{
+    QString str = query.lastQuery();
+    QMapIterator<QString, QVariant> it(query.boundValues());
+    while (it.hasNext()) {
+        it.next();
+        str.replace(it.key(), it.value().toString());
+    }
+    return str;
+}
+
+YACReader::ComicQueryResultProcesor::ComicQueryResultProcesor()
+    : querySearchQueue(1)
+{
+}
+
+void YACReader::ComicQueryResultProcesor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, const QString &databasePath)
+{
+    querySearchQueue.cancellPending();
+
+    querySearchQueue.enqueue([=] {
+        QString connectionName = "";
+        {
+            QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath);
+            QSqlQuery selectQuery(db);
+
+            std::string queryString("SELECT ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.isBis,ci.currentPage,ci.rating,ci.hasBeenOpened "
+                                    "FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) LEFT JOIN folder f ON (f.id == c.parentId) WHERE ");
+
+            try {
+                QueryParser parser;
+                auto result = parser.parse(filter.toStdString());
+                result.buildSqlString(queryString);
+
+                switch (modifier) {
+                case YACReader::NoModifiers:
+                    queryString += " LIMIT :limit";
+                    break;
+
+                case YACReader::OnlyRead:
+                    queryString += " AND ci.read = 1 LIMIT :limit";
+                    break;
+
+                case YACReader::OnlyUnread:
+                    queryString += " AND ci.read = 0 LIMIT :limit";
+                    break;
+
+                default:
+                    queryString += " LIMIT :limit";
+                    QLOG_ERROR() << "not implemented";
+                    break;
+                }
+                selectQuery.prepare(queryString.c_str());
+                selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
+                result.bindValues(selectQuery);
+
+                selectQuery.exec();
+
+                auto data = modelData(selectQuery);
+
+                emit newData(data, databasePath);
+            } catch (const std::exception &e) {
+                //Do nothing, uncomplete search string will end here and it is part of how the QueryParser works
+                //I don't like the idea of using exceptions for this though
+            }
+
+            connectionName = db.connectionName();
+        }
+        QSqlDatabase::removeDatabase(connectionName);
+    });
+}
+
+QList<ComicItem *> *YACReader::ComicQueryResultProcesor::modelData(QSqlQuery &sqlquery)
+{
+    auto list = new QList<ComicItem *>();
+
+    int numColumns = sqlquery.record().count();
+
+    while (sqlquery.next()) {
+        QList<QVariant> data;
+
+        for (int i = 0; i < numColumns; i++)
+            data << sqlquery.value(i);
+
+        list->append(new ComicItem(data));
+    }
+
+    std::sort(list->begin(), list->end(), [](const ComicItem *c1, const ComicItem *c2) {
+        if (c1->data(ComicModel::Number).isNull() && c2->data(ComicModel::Number).isNull()) {
+            return naturalSortLessThanCI(c1->data(ComicModel::FileName).toString(), c2->data(ComicModel::FileName).toString());
+        } else {
+            if (c1->data(ComicModel::Number).isNull() == false && c2->data(ComicModel::Number).isNull() == false) {
+                return c1->data(ComicModel::Number).toInt() < c2->data(ComicModel::Number).toInt();
+            } else {
+                return c2->data(ComicModel::Number).isNull();
+            }
+        }
+    });
+
+    return list;
+}

YACReaderLibrary/db/comic_query_result_procesor.h

@@ -0,0 +1,32 @@
+#ifndef COMIC_QUERY_RESULT_PROCESOR_H
+#define COMIC_QUERY_RESULT_PROCESOR_H
+
+#include <QtCore>
+#include <QSqlQuery>
+
+#include "yacreader_global.h"
+#include "concurrent_queue.h"
+
+class ComicItem;
+
+namespace YACReader {
+
+class ComicQueryResultProcesor : public QObject
+{
+    Q_OBJECT
+public:
+    ComicQueryResultProcesor();
+
+public slots:
+    void createModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath);
+signals:
+    void newData(QList<ComicItem *> *, const QString &);
+
+private:
+    ConcurrentQueue querySearchQueue;
+
+    QList<ComicItem *> *modelData(QSqlQuery &sqlquery);
+};
+};
+
+#endif // COMIC_QUERY_RESULT_PROCESOR_H