mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 20:44:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove YACReader::SearchModifiers

Browse Source 
They are no longer used
This commit is contained in:
Luis Ángel San Martín
2021-12-29 14:58:03 +01:00
parent 1cf4ef97ea
commit d8f224645d
12 changed files with 15 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
YACReaderLibrary/db/comic_query_result_processor.cpp
View File

@ -14,7 +14,7 @@ YACReader::ComicQueryResultProcessor::ComicQueryResultProcessor()
{
}
void YACReader::ComicQueryResultProcessor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, const QString &databasePath)
void YACReader::ComicQueryResultProcessor::createModelData(const QString &filter, const QString &databasePath)
{
querySearchQueue.cancelPending();
@ -32,24 +32,8 @@ void YACReader::ComicQueryResultProcessor::createModelData(const YACReader::Sear
auto result = parser.parse(filter.toStdString());
result.buildSqlString(queryString);
switch (modifier) {
case YACReader::NoModifiers:
queryString += " LIMIT :limit";
break;
queryString += " LIMIT :limit";
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);

2
YACReaderLibrary/db/comic_query_result_processor.h
View File

@ -18,7 +18,7 @@ public:
ComicQueryResultProcessor();
public slots:
void createModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath);
void createModelData(const QString &filter, const QString &databasePath);
signals:
void newData(QList<ComicItem *> *, const QString &);

2
YACReaderLibrary/db/folder_model.h
View File

@ -30,8 +30,6 @@ protected:
QMap<unsigned long long int, FolderItem *> filteredItems; // relación entre folders
bool filterEnabled;
YACReader::SearchModifiers modifier;
};
class FolderModel : public QAbstractItemModel

22
YACReaderLibrary/db/folder_query_result_processor.cpp
View File

@ -20,7 +20,7 @@ YACReader::FolderQueryResultProcessor::FolderQueryResultProcessor(FolderModel *m
{
}
void YACReader::FolderQueryResultProcessor::createModelData(const YACReader::SearchModifiers modifier, const QString &filter, bool includeComics)
void YACReader::FolderQueryResultProcessor::createModelData(const QString &filter, bool includeComics)
{
querySearchQueue.cancelPending();
@ -43,30 +43,12 @@ void YACReader::FolderQueryResultProcessor::createModelData(const YACReader::Sea
auto result = parser.parse(filter.toStdString());
result.buildSqlString(queryString);
switch (modifier) {
case YACReader::NoModifiers:
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
break;
case YACReader::OnlyRead:
queryString += " AND f.id <> 1 AND ci.read = 1 ORDER BY f.parentId,f.name";
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;
}
queryString += " AND f.id <> 1 ORDER BY f.parentId,f.name";
selectQuery.prepare(queryString.c_str());
result.bindValues(selectQuery);
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";
setupFilteredModelData(selectQuery);
} catch (const std::exception &e) {

2
YACReaderLibrary/db/folder_query_result_processor.h
View File

@ -19,7 +19,7 @@ public:
FolderQueryResultProcessor(FolderModel *model);
public slots:
void createModelData(const SearchModifiers modifier, const QString &filter, bool includeComics);
void createModelData(const QString &filter, bool includeComics);
signals:
void newData(QMap<unsigned long long int, FolderItem *> *filteredItems, FolderItem *root);