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

Merge branch 'explicit_case_sensitivity' of https://github.com/geneticdrift/MPD

Browse Source
This commit is contained in:
Max Kellermann
2024-07-10 15:33:47 +02:00
parent f2f6dc5897 d2382e8de9
commit 8861279add
2 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/song/Filter.cxx
View File

@@ -190,6 +190,39 @@ ExpectQuoted(const char *&s)
return {buffer, length};
}
/**
* Operator definition used to parse the operator
* from the command and create the StringFilter
* if it matched the operator prefix.
*/
struct OperatorDef {
const char *prefix;
bool fold_case;
bool negated;
StringFilter::Position position;
};
/**
* Pre-defined operators with explicit case-sensitivity.
*/
static constexpr std::array<OperatorDef, 12> operators = {
// operator prefix fold case negated position
OperatorDef { "contains_cs ", false, false, StringFilter::Position::ANYWHERE },
OperatorDef { "!contains_cs ", false, true, StringFilter::Position::ANYWHERE },
OperatorDef { "contains_ci ", true, false, StringFilter::Position::ANYWHERE },
OperatorDef { "!contains_ci ", true, true, StringFilter::Position::ANYWHERE },
OperatorDef { "starts_with_cs ", false, false, StringFilter::Position::PREFIX },
OperatorDef { "!starts_with_cs ", false, true, StringFilter::Position::PREFIX },
OperatorDef { "starts_with_ci ", true, false, StringFilter::Position::PREFIX },
OperatorDef { "!starts_with_ci ", true, true, StringFilter::Position::PREFIX },
OperatorDef { "eq_cs ", false, false, StringFilter::Position::FULL },
OperatorDef { "!eq_cs ", false, true, StringFilter::Position::FULL },
OperatorDef { "eq_ci ", true, false, StringFilter::Position::FULL },
OperatorDef { "!eq_ci ", true, true, StringFilter::Position::FULL },
};
/**
* Parse a string operator and its second operand and convert it to a
* #StringFilter.
@@ -199,6 +232,17 @@ ExpectQuoted(const char *&s)
static StringFilter
ParseStringFilter(const char *&s, bool fold_case)
{
for (auto& op: operators) {
if (auto after_prefix = StringAfterPrefixIgnoreCase(s, op.prefix)) {
s = StripLeft(after_prefix);
return StringFilter(
ExpectQuoted(s),
op.fold_case,
op.position,
op.negated);
}
}
if (auto after_contains = StringAfterPrefixIgnoreCase(s, "contains ")) {
s = StripLeft(after_contains);
auto value = ExpectQuoted(s);
@@ -260,7 +304,7 @@ ParseStringFilter(const char *&s, bool fold_case)
if (s[0] == '!' && s[1] == '=')
negated = true;
else if (s[0] != '=' || s[1] != '=')
throw std::runtime_error("'==' or '!=' expected");
throw FmtRuntimeError("Unknown filter operator: {}", s);
s = StripLeft(s + 2);
auto value = ExpectQuoted(s);