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

Merge pull request #193 from vedgy/dont-leak-folder-processor

Browse Source 
Library: don't leak folderQueryResultProcessor at exit
This commit is contained in:
Luis Ángel San Martín 2021-02-04 21:26:11 +01:00 committed by GitHub
commit 2e90e38259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 47 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)

4
YACReaderLibrary/library_window.cpp
View File

@ -415,7 +415,7 @@ void LibraryWindow::doModels()
//folders //folders
foldersModel = new FolderModel(); foldersModel = new FolderModel();
foldersModelProxy = new FolderModelProxy(); foldersModelProxy = new FolderModelProxy();
folderQueryResultProcessor = new FolderQueryResultProcessor(foldersModel); folderQueryResultProcessor.reset(new FolderQueryResultProcessor(foldersModel));
//foldersModelProxy->setSourceModel(foldersModel); //foldersModelProxy->setSourceModel(foldersModel);
//comics //comics
comicsModel = new ComicModel(this); comicsModel = new ComicModel(this);
@ -1116,7 +1116,7 @@ void LibraryWindow::createConnections()
//Search filter //Search filter
connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString))); connect(searchEdit, SIGNAL(filterChanged(YACReader::SearchModifiers, QString)), this, SLOT(setSearchFilter(YACReader::SearchModifiers, QString)));
connect(&comicQueryResultProcesor, &ComicQueryResultProcesor::newData, this, &LibraryWindow::setComicSearchFilterData); connect(&comicQueryResultProcesor, &ComicQueryResultProcesor::newData, this, &LibraryWindow::setComicSearchFilterData);
connect(folderQueryResultProcessor, &FolderQueryResultProcessor::newData, this, &LibraryWindow::setFolderSearchFilterData); connect(folderQueryResultProcessor.get(), &FolderQueryResultProcessor::newData, this, &LibraryWindow::setFolderSearchFilterData);
//ContextMenus //ContextMenus
connect(openContainingFolderComicAction, SIGNAL(triggered()), this, SLOT(openContainingFolderComic())); connect(openContainingFolderComicAction, SIGNAL(triggered()), this, SLOT(openContainingFolderComic()));

3
YACReaderLibrary/library_window.h
View File

@ -14,6 +14,7 @@
#include "folder_query_result_processor.h" #include "folder_query_result_processor.h"
#include <future> #include <future>
#include <memory>
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
#include "yacreader_macosx_toolbar.h" #include "yacreader_macosx_toolbar.h"
@ -416,7 +417,7 @@ private:
TrayIconController *trayIconController; TrayIconController *trayIconController;
ComicQueryResultProcesor comicQueryResultProcesor; ComicQueryResultProcesor comicQueryResultProcesor;
FolderQueryResultProcessor *folderQueryResultProcessor; std::unique_ptr<FolderQueryResultProcessor> folderQueryResultProcessor;
}; };
#endif #endif