dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filterparser: Optimize filter term

Browse Source 
Fixes #1536
This commit is contained in:
Jonas Kvinge
2024-09-21 00:57:36 +02:00
parent ffd8c88b1f
commit 36be755a78
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/filterparser/filterparser.cpp
View File

@@ -244,7 +244,7 @@ FilterTree *FilterParser::createSearchTermTreeNode(const QString &column, const
cmp = new FilterParserTextNeComparator(value); cmp = new FilterParserTextNeComparator(value);
} }
else { else {
cmp = new FilterParserDefaultComparator(value); cmp = new FilterParserTextContainsComparator(value);
} }
} }
else if (Song::kIntSearchColumns.contains(column, Qt::CaseInsensitive)) { else if (Song::kIntSearchColumns.contains(column, Qt::CaseInsensitive)) {
@@ -270,7 +270,7 @@ FilterTree *FilterParser::createSearchTermTreeNode(const QString &column, const
cmp = new FilterParserIntLeComparator(number); cmp = new FilterParserIntLeComparator(number);
} }
else { else {
cmp = new FilterParserDefaultComparator(value); cmp = new FilterParserTextContainsComparator(value);
} }
} }
} }
@@ -361,7 +361,7 @@ FilterTree *FilterParser::createSearchTermTreeNode(const QString &column, const
return new FilterColumnTerm(column, cmp); return new FilterColumnTerm(column, cmp);
} }
return new FilterTerm(Song::kTextSearchColumns, new FilterParserDefaultComparator(value)); return new FilterTerm(new FilterParserTextContainsComparator(value));
} }

6
src/filterparser/filterparsersearchcomparators.h
View File

@@ -38,16 +38,16 @@ class FilterParserSearchTermComparator {
}; };
// "compares" by checking if the field contains the search term // "compares" by checking if the field contains the search term
class FilterParserDefaultComparator : public FilterParserSearchTermComparator { class FilterParserTextContainsComparator : public FilterParserSearchTermComparator {
public: public:
explicit FilterParserDefaultComparator(const QString &search_term) : search_term_(search_term) {} explicit FilterParserTextContainsComparator(const QString &search_term) : search_term_(search_term) {}
bool Matches(const QVariant &value) const override { bool Matches(const QVariant &value) const override {
return value.toString().contains(search_term_, Qt::CaseInsensitive); return value.toString().contains(search_term_, Qt::CaseInsensitive);
} }
private: private:
QString search_term_; QString search_term_;
Q_DISABLE_COPY(FilterParserDefaultComparator) Q_DISABLE_COPY(FilterParserTextContainsComparator)
}; };
class FilterParserTextEqComparator : public FilterParserSearchTermComparator { class FilterParserTextEqComparator : public FilterParserSearchTermComparator {

18
src/filterparser/filtertree.h
View File

@@ -67,19 +67,27 @@ class NopFilter : public FilterTree {
// Filter that applies a SearchTermComparator to all fields // Filter that applies a SearchTermComparator to all fields
class FilterTerm : public FilterTree { class FilterTerm : public FilterTree {
public: public:
explicit FilterTerm(const QStringList &columns, FilterParserSearchTermComparator *comparator) : columns_(columns), cmp_(comparator) {} explicit FilterTerm(FilterParserSearchTermComparator *comparator) : cmp_(comparator) {}
FilterType type() const override { return FilterType::Term; } FilterType type() const override { return FilterType::Term; }
bool accept(const Song &song) const override { bool accept(const Song &song) const override {
for (const QString &column : columns_) {
if (cmp_->Matches(DataFromColumn(column, song))) return true; if (cmp_->Matches(song.PrettyTitle())) return true;
} if (cmp_->Matches(song.album())) return true;
if (cmp_->Matches(song.artist())) return true;
if (cmp_->Matches(song.albumartist())) return true;
if (cmp_->Matches(song.composer())) return true;
if (cmp_->Matches(song.performer())) return true;
if (cmp_->Matches(song.grouping())) return true;
if (cmp_->Matches(song.genre())) return true;
if (cmp_->Matches(song.comment())) return true;
return false; return false;
} }
private: private:
const QStringList columns_;
QScopedPointer<FilterParserSearchTermComparator> cmp_; QScopedPointer<FilterParserSearchTermComparator> cmp_;
}; };