crtxcr/looqs
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Refactor search queries: Introduced QSSQuery

Browse Source 
Purpose is to seperate certain logic from SQLite and generalize it more.
Even though we only have Sqlite atm, in general the database layers
must be stupid as possible, while QSSQuery should do most of the hard work.

Fixes in Tokenizer logic.
Switched to C++17.
This commit is contained in:
Albert S.
2019-08-17 11:06:35 +02:00
parent 05a5bac22f
commit cff481a57e
14 changed files with 500 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/cli.pro
View File

@ -1,6 +1,6 @@
QT -= gui
QT += sql concurrent
CONFIG += c++11 console
CONFIG += c++17 console
CONFIG -= app_bundle
# The following define makes your compiler emit warnings if you use
@ -32,7 +32,8 @@ SOURCES += \
databasefactory.cpp \
sqlitedbservice.cpp \
logger.cpp \
commandsearch.cpp
commandsearch.cpp \
commandlist.cpp
HEADERS += \
encodingdetector.h \
@ -53,7 +54,8 @@ HEADERS += \
databasefactory.h \
sqlitedbservice.h \
logger.h \
commandsearch.h
commandsearch.h \
commandlist.h
INCLUDEPATH += /usr/include/poppler/qt5/ /usr/include/quazip5

3
cli/commandsearch.cpp
View File

@ -25,8 +25,7 @@ int CommandSearch::handle(QStringList arguments)
QStringList files = parser.positionalArguments();
QString queryStrings = files.join(' ');
auto results = dbService->search(queryStrings);
auto results = dbService->search(QSSQuery::build(queryStrings));
for(SearchResult &result : results)
{

4
cli/sqlitedbservice.cpp
View File

@ -21,11 +21,11 @@ bool SqliteDbService::fileExistsInDatabase(QString path, qint64 mtime)
return query.value(0).toBool();
}
QVector<SearchResult> SqliteDbService::search(QString searchQuery)
QVector<SearchResult> SqliteDbService::search(const QSSQuery &query)
{
auto connection = dbFactory->forCurrentThread();
SqliteSearch searcher(connection);
return searcher.search(searchQuery);
return searcher.search(query);
}
bool SqliteDbService::fileExistsInDatabase(QString path)

3
cli/sqlitedbservice.h
View File

@ -6,6 +6,7 @@
#include "pagedata.h"
#include "filedata.h"
#include "../shared/sqlitesearch.h"
#include "../shared/token.h"
enum SaveFileResult
{
OK,
@ -26,7 +27,7 @@ class SqliteDbService
bool deleteFile(QString path);
bool fileExistsInDatabase(QString path);
bool fileExistsInDatabase(QString path, qint64 mtime);
QVector<SearchResult> search(QString searchQuery);
QVector<SearchResult> search(const QSSQuery &query);
};
#endif // SQLITEDBSERVICE_H