Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

FilterParser: Fix "OR" and "AND" 

Fixes #1599
This commit is contained in:
Jonas Kvinge 2024-11-08 21:38:57 +01:00
parent 2a5e425b71
commit 957a850adc
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/filterparser/filterparser.cpp
View File

@ -91,17 +91,17 @@ FilterTree *FilterParser::parseAndGroup() {
bool FilterParser::checkAnd() {
if (iter_ != end_) {
if (*iter_ == u'A') {
buf_ += *iter_;
++iter_;
if (iter_ != end_ && *iter_ == u'N') {
buf_ += *iter_;
++iter_;
if (iter_ != end_ && *iter_ == u'D') {
buf_ += *iter_;
++iter_;
if (iter_ != end_ && (iter_->isSpace() || *iter_ == u'-' || *iter_ == u'(')) {
QString::const_iterator and_iter = iter_;
if (and_iter != end_) {
if (*and_iter == u'A') {
++and_iter;
if (and_iter != end_ && *and_iter == u'N') {
++and_iter;
if (and_iter != end_ && *and_iter == u'D') {
++and_iter;
if (and_iter != end_ && (and_iter->isSpace() || *and_iter == u'-' || *and_iter == u'(')) {
iter_ = and_iter;
advance();
buf_.clear();
return true;
@ -127,18 +127,21 @@ bool FilterParser::checkOr(const bool step_over) {
}
}
else {
if (iter_ != end_) {
if (*iter_ == u'O') {
buf_ += *iter_;
++iter_;
if (iter_ != end_ && *iter_ == u'R') {
buf_ += *iter_;
++iter_;
if (iter_ != end_ && (iter_->isSpace() || *iter_ == u'-' || *iter_ == u'(')) {
QString::const_iterator or_iter = iter_;
if (or_iter != end_) {
if (*or_iter == u'O') {
++or_iter;
if (or_iter != end_ && *or_iter == u'R') {
++or_iter;
if (or_iter != end_ && (or_iter->isSpace() || *or_iter == u'-' || *or_iter == u'(')) {
iter_ = or_iter;
if (step_over) {
buf_.clear();
advance();
}
else {
buf_ += "OR"_L1;
}
return true;
}
}