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

added support for search modifiers, added [read] [unread] as examples

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-10-27 22:00:45 +01:00
parent 5317faacf3
commit 10436200ac
10 changed files with 162 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -28,8 +28,8 @@ LIBS += -lpoppler-qt4
INCLUDEPATH += ../dependencies/poppler/include/qt4
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG
#QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
#QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe
}

39
YACReaderLibrary/db/tablemodel.cpp
View File

@ -309,7 +309,7 @@ void TableModel::setupModelData(unsigned long long int folderId,const QString &
emit isEmpty();
}
void TableModel::setupModelData(const QString &filter, const QString &databasePath)
void TableModel::setupModelData(const SearchModifiers modifier, const QString &filter, const QString &databasePath)
{
//QFile f(QCoreApplication::applicationDirPath()+"/performance.txt");
//f.open(QIODevice::Append);
@ -327,11 +327,38 @@ void TableModel::setupModelData(const QString &filter, const QString &databasePa
//crear la consulta
//timer.restart();
QSqlQuery selectQuery(db);
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
switch (modifier) {
case YACReader::NoModifiers:
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:
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)) AND ci.read = 1 LIMIT :limit");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":limit",500); //TODO, load this value from settings
break;
case YACReader::OnlyUnread:
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)) AND ci.read = 0 LIMIT :limit");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":limit",500); //TODO, load this value from settings
break;
default:
QLOG_ERROR() << "not implemented";
break;
}
selectQuery.exec();
QLOG_DEBUG() << selectQuery.lastError() << "--";

2
YACReaderLibrary/db/tablemodel.h
View File

@ -36,7 +36,7 @@ public:
int columnCount(const QModelIndex &parent = QModelIndex()) const;
void setupModelData(unsigned long long int parentFolder,const QString & databasePath);
//configures the model for showing the comics matching the filter criteria.
void setupModelData(const QString & filter, const QString & databasePath);
void setupModelData(const SearchModifiers modifier, const QString & filter, const QString & databasePath);
//Métodos de conveniencia
QStringList getPaths(const QString & _source);

45
YACReaderLibrary/db/treemodel.cpp
View File

@ -55,6 +55,8 @@
#include "db_helper.h"
#include "qnaturalsorting.h"
#include "QsLog.h"
#ifdef Q_OS_MAC
#include <QFileIconProvider>
QIcon finishedFolderIcon;
@ -369,11 +371,41 @@ void TreeModel::setupFilteredModelData()
selectQuery.prepare("select * from folder where id <> 1 and upper(name) like upper(:filter) order by parentId,name ");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
}
else
{
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) WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) ORDER BY f.parentId,f.name");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":filter2", "%%"+filter+"%%");
else
{
switch(modifier)
{
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) "
"WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) ORDER BY f.parentId,f.name");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":filter2", "%%"+filter+"%%");
break;
case YACReader::OnlyRead:
selectQuery.prepare("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed "
"FROM folder f LEFT JOIN (comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id)) ON (f.id = c.parentId) "
"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;");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":filter2", "%%"+filter+"%%");
break;
case YACReader::OnlyUnread:
selectQuery.prepare("SELECT DISTINCT f.id, f.parentId, f.name, f.path, f.finished, f.completed "
"FROM folder f LEFT JOIN (comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id)) ON (f.id = c.parentId) "
"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;");
selectQuery.bindValue(":filter", "%%"+filter+"%%");
selectQuery.bindValue(":filter2", "%%"+filter+"%%");
break;
default:
QLOG_ERROR() << "not implemented";
break;
}
}
selectQuery.exec();
@ -476,10 +508,11 @@ QString TreeModel::getFolderPath(const QModelIndex &folder)
return static_cast<TreeItem*>(folder.internalPointer())->data(TreeModel::Path).toString();
}
void TreeModel::setFilter(QString filter, bool includeComics)
void TreeModel::setFilter(const YACReader::SearchModifiers modifier, QString filter, bool includeComics)
{
this->filter = filter;
this->includeComics = includeComics;
this->modifier = modifier;
filterEnabled = true;
setupFilteredModelData();
}

6
YACReaderLibrary/db/treemodel.h
View File

@ -47,6 +47,8 @@
#include <QSqlQuery>
#include <QSqlDatabase>
#include "yacreader_global.h"
class TreeItem;
//! [0]
@ -78,7 +80,7 @@ public:
//Métodos de conveniencia
QString getFolderPath(const QModelIndex &folder);
void setFilter(QString filter, bool includeComics);
void setFilter(const YACReader::SearchModifiers modifier, QString filter, bool includeComics);
void resetFilter();
bool isFilterEnabled(){return filterEnabled;};
@ -118,6 +120,8 @@ private:
bool includeComics;
QString filter;
bool filterEnabled;
YACReader::SearchModifiers modifier;
signals:
void beforeReset();
void reset();

10
YACReaderLibrary/library_window.cpp
View File

@ -379,7 +379,7 @@ void LibraryWindow::doModels()
//comics
comicsModel = new TableModel();
setSearchFilter("");
setSearchFilter(YACReader::NoModifiers, ""); //clear search filter
}
void LibraryWindow::disconnectComicsViewConnections(ComicsView * widget)
@ -1053,7 +1053,7 @@ void LibraryWindow::createConnections()
//Folders filter
//connect(clearFoldersFilter,SIGNAL(clicked()),foldersFilter,SLOT(clear()));
connect(searchEdit,SIGNAL(textChanged(QString)),this,SLOT(setSearchFilter(QString)));
connect(searchEdit,SIGNAL(filterChanged(YACReader::SearchModifiers, QString)),this,SLOT(setSearchFilter(YACReader::SearchModifiers, QString)));
//connect(includeComicsCheckBox,SIGNAL(stateChanged(int)),this,SLOT(searchInFiles(int)));
//ContextMenus
@ -1907,7 +1907,7 @@ void LibraryWindow::toNormal()
}
void LibraryWindow::setSearchFilter(QString filter)
void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter)
{
if(filter.isEmpty() && foldersModel->isFilterEnabled())
{
@ -1929,8 +1929,8 @@ void LibraryWindow::setSearchFilter(QString filter)
{
if(!filter.isEmpty())
{
foldersModel->setFilter(filter, true);//includeComicsCheckBox->isChecked());
comicsModel->setupModelData(filter, foldersModel->getDatabase());
foldersModel->setFilter(modifier, filter, true);//includeComicsCheckBox->isChecked());
comicsModel->setupModelData(modifier, filter, foldersModel->getDatabase());
comicsView->enableFilterMode(true);
foldersView->expandAll();
//loadCoversFromCurrentModel();

2
YACReaderLibrary/library_window.h
View File

@ -287,7 +287,7 @@ public slots:
void toggleFullScreen();
void toNormal();
void toFullScreen();
void setSearchFilter(QString filter);
void setSearchFilter(const YACReader::SearchModifiers modifier, QString filter);
void showProperties();
void exportLibrary(QString destPath);
void importLibrary(QString clc,QString destPath,QString name);

7
common/yacreader_global.h
View File

@ -104,6 +104,13 @@ namespace YACReader
Grid
};
enum SearchModifiers{
NoModifiers = 0,
OnlyRead,
OnlyUnread,
ByAuthor
};
QString getSettingsPath();
void addSperator(QWidget * w);
QAction * createSeparator();

61
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -4,6 +4,10 @@
#include <QStyle>
#include <QLabel>
#include <QRegExpValidator>
#include "QsLog.h"
YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
: QLineEdit(parent)
{
@ -42,6 +46,28 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
setAttribute(Qt::WA_MacShowFocusRect,false);
setPlaceholderText(tr("type to search"));
//search modifiers
modifiers << "[read]" << "[unread]";//<< "[author]";
modifiersCompleter = new QCompleter(modifiers);
QString regExpString;
foreach(QString modifier, modifiers)
{
regExpString = regExpString + modifier.replace("[","\\[").replace("]","\\]") + ".*|";
}
regExpString = regExpString + "[^\\[].*";
QLOG_INFO () << regExpString;
QRegExp regExp(regExpString);
QValidator *validator = new QRegExpValidator(regExp, this);
setValidator(validator);
setCompleter(modifiersCompleter);
connect(this,SIGNAL(textChanged(QString)),this,SLOT(processText(QString)));
}
void YACReaderSearchLineEdit::resizeEvent(QResizeEvent *)
@ -68,5 +94,38 @@ void YACReaderSearchLineEdit::resizeEvent(QResizeEvent *)
void YACReaderSearchLineEdit::updateCloseButton(const QString& text)
{
clearButton->setVisible(!text.isEmpty());
clearButton->setVisible(!text.isEmpty());
}
void YACReaderSearchLineEdit::processText(const QString &text)
{
QRegExp regExp("(\\[.*\\])(.*)");
if(text.startsWith("["))
{
if(regExp.exactMatch(text)) //avoid search while the modifiers are being written
{
QString modifier = regExp.cap(1);
QString searchText = regExp.cap(2).trimmed();
QLOG_INFO() << "modifier : " << modifier << "text : " << searchText;
int indexOfModifier = modifiers.indexOf(modifier);
if(indexOfModifier != -1)
{
emit filterChanged(static_cast<YACReader::SearchModifiers>(indexOfModifier+1), searchText); //TODO, do not use on indexOF
}
else
{
QLOG_ERROR() << "invalid modifier : " << modifier;
}
}
QLOG_INFO() << "full text :" << text << " : " << regExp.indexIn(text);
}
else
{
QLOG_INFO() << "NoModifiers : " << text;
emit filterChanged(YACReader::NoModifiers,text);
}
}

9
custom_widgets/yacreader_search_line_edit.h
View File

@ -2,6 +2,9 @@
#define YACREADER_SEARCH_LINE_EDIT_H
#include <QLineEdit>
#include <QCompleter>
#include "yacreader_global.h"
class QToolButton;
class QLabel;
@ -16,12 +19,18 @@ public:
protected:
void resizeEvent(QResizeEvent *);
signals:
void filterChanged(const YACReader::SearchModifiers, QString);
private slots:
void updateCloseButton(const QString &text);
void processText(const QString & text);
private:
QToolButton *clearButton;
QLabel * searchLabel;
QCompleter * modifiersCompleter;
QStringList modifiers;
};