mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the query parser in the comic and folder model

Browse Source
This commit is contained in:
Iain Benson 2018-11-24 09:54:59 +00:00 committed by Luis Ángel San Martín
parent 5fa7da1e46
commit 673ee1f067
2 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
YACReaderLibrary/db/comic_model.cpp
View File

@ -9,6 +9,7 @@
#include "qnaturalsorting.h" #include "qnaturalsorting.h"
#include "comic_db.h" #include "comic_db.h"
#include "db_helper.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 //ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read
#include "QsLog.h" #include "QsLog.h"
@ -607,40 +608,40 @@ void ComicModel::setupModelData(const SearchModifiers modifier, const QString &f
QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath); QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath);
QSqlQuery selectQuery(db); QSqlQuery selectQuery(db);
switch (modifier) { 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 "
case YACReader::NoModifiers: "FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) LEFT JOIN folder f ON (f.id == c.parentId) WHERE ");
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: try {
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 " QueryParser parser;
"FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) " auto result = parser.parse(filter.toStdString());
"WHERE (UPPER(ci.title) LIKE UPPER(:filter) OR UPPER(c.fileName) LIKE UPPER(:filter)) AND ci.read = 1 LIMIT :limit"); result.buildSqlString(queryString);
selectQuery.bindValue(":filter", "%%" + filter + "%%");
selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
break;
case YACReader::OnlyUnread: switch (modifier) {
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 " case YACReader::NoModifiers:
"FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) " queryString += "LIMIT :limit";
"WHERE (UPPER(ci.title) LIKE UPPER(:filter) OR UPPER(c.fileName) LIKE UPPER(:filter)) AND ci.read = 0 LIMIT :limit"); break;
selectQuery.bindValue(":filter", "%%" + filter + "%%");
selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
break;
default: case YACReader::OnlyRead:
QLOG_ERROR() << "not implemented"; queryString += "AND ci.read = 1 LIMIT :limit";
break; break;
case YACReader::OnlyUnread:
queryString += "AND ci.read = 0 LIMIT :limit";
break;
default:
queryString += "LIMIT :limit";
QLOG_ERROR() << "not implemented";
break;
}
selectQuery.prepare(QString(queryString.c_str()));
selectQuery.bindValue(":limit", 500); //TODO, load this value from settings
result.bindValues(selectQuery);
} catch (const std::exception &e) {
QLOG_ERROR() << "Unable to parse query: " << e.what();
} }
selectQuery.exec(); selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupModelData(selectQuery); setupModelData(selectQuery);
connectionName = db.connectionName(); connectionName = db.connectionName();
} }

55
YACReaderLibrary/db/folder_model.cpp
View File

@ -55,6 +55,7 @@
#include "qnaturalsorting.h" #include "qnaturalsorting.h"
#include "yacreader_global_gui.h" #include "yacreader_global_gui.h"
#include "QsLog.h" #include "QsLog.h"
#include "query_parser.h"
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include <QFileIconProvider> #include <QFileIconProvider>
@ -689,37 +690,43 @@ void FolderModelProxy::setupFilteredModelData()
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 {
switch (modifier) { std::string queryString("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed "
case YACReader::NoModifiers:
selectQuery.prepare("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) "
"WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) ORDER BY f.parentId,f.name"); "INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) WHERE ");
selectQuery.bindValue(":filter", "%%" + filter + "%%");
selectQuery.bindValue(":filter2", "%%" + filter + "%%");
break;
case YACReader::OnlyRead: try {
selectQuery.prepare("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed " QueryParser parser;
"FROM folder f LEFT JOIN (comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id)) ON (f.id = c.parentId) " auto result = parser.parse(filter.toStdString());
"WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) AND ci.read = 1 ORDER BY f.parentId,f.name;"); result.buildSqlString(queryString);
selectQuery.bindValue(":filter", "%%" + filter + "%%");
selectQuery.bindValue(":filter2", "%%" + filter + "%%");
break;
case YACReader::OnlyUnread: switch (modifier) {
selectQuery.prepare("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed " case YACReader::NoModifiers:
"FROM folder f LEFT JOIN (comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id)) ON (f.id = c.parentId) " queryString += "AND f.id <> 1 ORDER BY f.parentId,f.name";
"WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) AND ci.read = 0 ORDER BY f.parentId,f.name;"); break;
selectQuery.bindValue(":filter", "%%" + filter + "%%");
selectQuery.bindValue(":filter2", "%%" + filter + "%%");
break;
default: case YACReader::OnlyRead:
QLOG_ERROR() << "not implemented"; queryString += "AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name";
break; break;
case YACReader::OnlyUnread:
queryString += "AND f.id <> 1 AND ci.read = 0 ORDER BY f.parentId,f.name";
break;
default:
queryString += "AND f.id <> 1 ORDER BY f.parentId,f.name";
QLOG_ERROR() << "not implemented";
break;
}
selectQuery.prepare(QString(queryString.c_str()));
result.bindValues(selectQuery);
} catch (const std::exception &e) {
QLOG_ERROR() << "Unable to parse query: " << e.what();
} }
} }
selectQuery.exec(); selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupFilteredModelData(selectQuery, rootItem); setupFilteredModelData(selectQuery, rootItem);
connectionName = db.connectionName(); connectionName = db.connectionName();