jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix multi-word type matching in card filters

Browse source 
Add phrase matching to StringValue before word-based fallback.
Enables searches like t:"time lord" for multi-word creature types.
This commit is contained in:
Paul Carroll 2025-07-31 16:51:52 -04:00
parent 62c02e3fce
commit d73445dde5
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cockatrice/src/game/filters/filter_string.cpp
View file

@ -187,16 +187,26 @@ static void setupParserRules()
return QString::fromStdString(std::string(sv.sv())).toLower();
};
search["StringValue"] = [](const peg::SemanticValues &sv) -> StringMatcher {
// Extract common matching logic
auto createMatcher = [](const QString &target) -> std::function<bool(const QString &)> {
return [target](const QString &s) -> bool {
if (s.contains(target, Qt::CaseInsensitive)) {
return true;
}
return s.split(" ").contains(target, Qt::CaseInsensitive);
};
};
if (sv.choice() == 0) {
const auto target = std::any_cast<QString>(sv[0]);
return [=](const QString &s) { return s.split(" ").contains(target, Qt::CaseInsensitive); };
return createMatcher(target);
}
const auto target = std::any_cast<QStringList>(sv[0]);
return [=](const QString &s) {
auto containsString = [&s](const QString &str) { return s.split(" ").contains(str, Qt::CaseInsensitive); };
return std::any_of(target.begin(), target.end(), containsString);
return [=](const QString &s) -> bool {
return std::any_of(target.begin(), target.end(), [&](const QString &str) { return createMatcher(str)(s); });
};
};