aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add extra exceptions to plaintext imports (#4018)

Browse source 
this specifically to support imports from mtg arena that have a set code
and then a collectors number like (ABC) 123 at the end, this pr strips
that from the card name (we don't use it anyway)

fixes #4011
This commit is contained in:
ebbit1q 2020-06-02 16:56:01 +02:00 committed by GitHub
parent 53c6440cac
commit 0337f58088
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/decklist.cpp
View file

@ -499,6 +499,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
const QRegularExpression reBrace(" ?[\\[\\{][^\\]\\}]*[\\]\\}] ?"); // not nested const QRegularExpression reBrace(" ?[\\[\\{][^\\]\\}]*[\\]\\}] ?"); // not nested
const QRegularExpression reRoundBrace("^\\([^\\)]*\\) ?"); // () are only matched at start of string const QRegularExpression reRoundBrace("^\\([^\\)]*\\) ?"); // () are only matched at start of string
const QRegularExpression reDigitBrace(" ?\\(\\d*\\) ?"); // () are matched if containing digits const QRegularExpression reDigitBrace(" ?\\(\\d*\\) ?"); // () are matched if containing digits
const QRegularExpression reBraceDigit(
" ?\\([\\dA-Z]+\\) *\\d+$"); // () are matched if containing setcode then a number
const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), QString("'")}, const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), QString("'")},
{QRegularExpression("Æ"), QString("Ae")}, {QRegularExpression("Æ"), QString("Ae")},
{QRegularExpression("æ"), QString("ae")}, {QRegularExpression("æ"), QString("ae")},
@ -513,8 +515,9 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
// start at the first empty line before the first cardline // start at the first empty line before the first cardline
int deckStart = inputs.indexOf(reCardLine); int deckStart = inputs.indexOf(reCardLine);
if (deckStart == -1) { // there are no cards? if (deckStart == -1) { // there are no cards?
if (inputs.indexOf(reComment) == -1) if (inputs.indexOf(reComment) == -1) {
return false; // input is empty return false; // input is empty
}
deckStart = max_line; deckStart = max_line;
} else { } else {
deckStart = inputs.lastIndexOf(reEmpty, deckStart); deckStart = inputs.lastIndexOf(reEmpty, deckStart);
@ -594,7 +597,8 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
// remove stuff inbetween braces // remove stuff inbetween braces
cardName.remove(reBrace); cardName.remove(reBrace);
cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards
cardName.remove(reDigitBrace); // all cards from un-sets that have a word in between round braces at the end cardName.remove(reDigitBrace); // from un-sets that have a word in between round braces at the end
cardName.remove(reBraceDigit); // very specific format with the set code in () and collectors number after
// replace common differences in cardnames // replace common differences in cardnames
for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) { for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) {