mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the query search queue in FolderQueryResultProcessor

Browse Source
This commit is contained in:
Luis Ángel San Martín 2021-02-04 19:15:58 +01:00
parent 64d0e22fb5
commit 6d5f3d7de3
1 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
YACReaderLibrary/db/folder_query_result_processor.cpp
View File

@ -24,60 +24,62 @@ void YACReader::FolderQueryResultProcessor::createModelData(const YACReader::Sea
{ {
querySearchQueue.cancellPending(); querySearchQueue.cancellPending();
QString connectionName = ""; querySearchQueue.enqueue([=] {
{ QString connectionName = "";
QSqlDatabase db = DataBaseManagement::loadDatabase(model->getDatabase()); {
QSqlDatabase db = DataBaseManagement::loadDatabase(model->getDatabase());
QSqlQuery selectQuery(db); //TODO check QSqlQuery selectQuery(db); //TODO check
if (!includeComics) { if (!includeComics) {
selectQuery.prepare("select * from folder where id <> 1 and upper(name) like upper(:filter) order by parentId,name "); selectQuery.prepare("select * from folder where id <> 1 and upper(name) like upper(:filter) order by parentId,name ");
selectQuery.bindValue(":filter", "%%" + filter + "%%"); selectQuery.bindValue(":filter", "%%" + filter + "%%");
} else { } else {
std::string queryString("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed " std::string queryString("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed "
"FROM folder f LEFT JOIN comic c ON (f.id = c.parentId) " "FROM folder f LEFT JOIN comic c ON (f.id = c.parentId) "
"INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) WHERE "); "INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) WHERE ");
try { try {
QueryParser parser; QueryParser parser;
auto result = parser.parse(filter.toStdString()); auto result = parser.parse(filter.toStdString());
result.buildSqlString(queryString); result.buildSqlString(queryString);
switch (modifier) { switch (modifier) {
case YACReader::NoModifiers: case YACReader::NoModifiers:
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name"; queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
break; break;
case YACReader::OnlyRead: case YACReader::OnlyRead:
queryString += " AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name"; queryString += " AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name";
break; break;
case YACReader::OnlyUnread: case YACReader::OnlyUnread:
queryString += " AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name"; queryString += " AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name";
break; break;
default: default:
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name"; queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
QLOG_ERROR() << "not implemented"; QLOG_ERROR() << "not implemented";
break; break;
}
selectQuery.prepare(queryString.c_str());
result.bindValues(selectQuery);
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupFilteredModelData(selectQuery);
} 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
} }
selectQuery.prepare(queryString.c_str());
result.bindValues(selectQuery);
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupFilteredModelData(selectQuery);
} 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();
} }
connectionName = db.connectionName(); QSqlDatabase::removeDatabase(connectionName);
} });
QSqlDatabase::removeDatabase(connectionName);
} }
void YACReader::FolderQueryResultProcessor::setupFilteredModelData(QSqlQuery &sqlquery) void YACReader::FolderQueryResultProcessor::setupFilteredModelData(QSqlQuery &sqlquery)