oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

song/Filter: move code to ParseStringFilter()

Browse Source
This commit is contained in:
Max Kellermann 2018-11-08 00:02:10 +01:00
parent d5e0d49f86
commit 7b5ba15170
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/song/Filter.cxx
View File

@ -197,6 +197,28 @@ ExpectQuoted(const char *&s)
return {buffer, length}; return {buffer, length};
} }
/**
* Parse a string operator and its second operand and convert it to a
* #StringFilter.
*
* Throws on error.
*/
static StringFilter
ParseStringFilter(const char *&s, bool fold_case)
{
bool negated = false;
if (s[0] == '!' && s[1] == '=')
negated = true;
else if (s[0] != '=' || s[1] != '=')
throw std::runtime_error("'==' or '!=' expected");
s = StripLeft(s + 2);
auto value = ExpectQuoted(s);
return StringFilter(std::move(value),
fold_case, false, negated);
}
ISongFilterPtr ISongFilterPtr
SongFilter::ParseExpression(const char *&s, bool fold_case) SongFilter::ParseExpression(const char *&s, bool fold_case)
{ {
@ -279,22 +301,12 @@ SongFilter::ParseExpression(const char *&s, bool fold_case)
return std::make_unique<AudioFormatSongFilter>(value); return std::make_unique<AudioFormatSongFilter>(value);
} else { } else {
bool negated = false; auto string_filter = ParseStringFilter(s, fold_case);
if (s[0] == '!' && s[1] == '=')
negated = true;
else if (s[0] != '=' || s[1] != '=')
throw std::runtime_error("'==' or '!=' expected");
s = StripLeft(s + 2);
auto value = ExpectQuoted(s);
if (*s != ')') if (*s != ')')
throw std::runtime_error("')' expected"); throw std::runtime_error("')' expected");
s = StripLeft(s + 1); s = StripLeft(s + 1);
StringFilter string_filter(std::move(value),
fold_case, false, negated);
if (type == LOCATE_TAG_ANY_TYPE) if (type == LOCATE_TAG_ANY_TYPE)
type = TAG_NUM_OF_ITEM_TYPES; type = TAG_NUM_OF_ITEM_TYPES;