jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 12:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support regex in card search (#5971)

Browse source
This commit is contained in:
RickyRister 2025-06-12 16:30:43 -07:00 • committed by GitHub
parent e7a6126fbd
commit 456da93465
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/resources/help/search.md
View file

@ -58,4 +58,9 @@ In this list of examples below, each entry has an explanation and can be clicked
<dt>Grouping:</dt> <dt>Grouping:</dt>
<dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd> <dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
<dt>Regular Expression:</dt>
<dd>[/^fell/](#/^fell/) <small>(Any card name that begins with "fell")</small></dd>
<dd>[o:/counter target .* spell/](#o:/counter target .* spell/) <small>(Any card text with "counter target *something* spell")</small></dd>
<dd>[o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) <small>(/'s can be escaped with a \)</small></dd>
</dl> </dl>

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

@ -4,6 +4,7 @@
#include <QByteArray> #include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QRegularExpression>
#include <QString> #include <QString>
#include <functional> #include <functional>
@ -20,7 +21,7 @@ QueryPart <- NotQuery / SetQuery / RarityQuery / CMCQuery / FormatQuery / PowerQ
NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
SetQuery <- ('e'/'set') [:] FlexStringValue SetQuery <- ('e'/'set') [:] FlexStringValue
OracleQuery <- 'o' [:] RegexString OracleQuery <- 'o' [:] MatcherString
CMCQuery <- ('cmc'/'mv') ws? NumericExpression CMCQuery <- ('cmc'/'mv') ws? NumericExpression
@ -42,7 +43,7 @@ ColorEx <- Color / [mc]
ColorQuery <- [cC] 'olor'? <[iI]?> <[:!]> ColorEx* ColorQuery <- [cC] 'olor'? <[iI]?> <[:!]> ColorEx*
FieldQuery <- String [:] RegexString / String ws? NumericExpression FieldQuery <- String [:] MatcherString / String ws? NumericExpression
NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["]. NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
NonSingleQuoteUnlessEscaped <- "\\\'". / ![']. NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
@ -52,8 +53,14 @@ String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuot
StringValue <- String / [(] StringList [)] StringValue <- String / [(] StringList [)]
StringList <- StringListString (ws? [,] ws? StringListString)* StringList <- StringListString (ws? [,] ws? StringListString)*
StringListString <- UnescapedStringListPart+ StringListString <- UnescapedStringListPart+
GenericQuery <- RegexString GenericQuery <- MatcherString
RegexString <- String
# A String that can either be a normal string or a regex search string
MatcherString <- RegexMatcher / NormalMatcher
NormalMatcher <- String
RegexMatcher <- '/' RegexMatcherString '/'
RegexMatcherString <- ('\\/' / !'/' .)+
FlexStringValue <- CompactStringSet / String / [(] StringList [)] FlexStringValue <- CompactStringSet / String / [(] StringList [)]
CompactStringSet <- StringListString ([,+] StringListString)+ CompactStringSet <- StringListString ([,+] StringListString)+
@ -261,14 +268,22 @@ static void setupParserRules()
return QString::fromStdString(std::string(sv.sv())); return QString::fromStdString(std::string(sv.sv()));
}; };
search["RegexString"] = [](const peg::SemanticValues &sv) -> StringMatcher { search["NormalMatcher"] = [](const peg::SemanticValues &sv) -> StringMatcher {
auto target = std::any_cast<QString>(sv[0]); auto target = std::any_cast<QString>(sv[0]);
return [=](const QString &s) { auto sanitizedTarget = QString(target);
auto sanitizedTarget = QString(target); sanitizedTarget.replace("\\\"", "\"");
sanitizedTarget.replace("\\\"", "\""); sanitizedTarget.replace("\\'", "'");
sanitizedTarget.replace("\\'", "'"); return [=](const QString &s) { return s.contains(sanitizedTarget, Qt::CaseInsensitive); };
return s.contains(sanitizedTarget, Qt::CaseInsensitive); };
};
search["RegexMatcher"] = [](const peg::SemanticValues &sv) -> StringMatcher {
auto target = std::any_cast<QString>(sv[0]);
auto regex = QRegularExpression(target, QRegularExpression::CaseInsensitiveOption);
return [=](const QString &s) { return regex.match(s).hasMatch(); };
};
search["RegexMatcherString"] = [](const peg::SemanticValues &sv) -> QString {
return QString::fromStdString(sv.token_to_string());
}; };
search["OracleQuery"] = [](const peg::SemanticValues &sv) -> Filter { search["OracleQuery"] = [](const peg::SemanticValues &sv) -> Filter {