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

[Oracle] clean up OracleImporter (#6313)

Browse source 
* Move variable declaration closer to usage

* Leave comments

* inline some constants

* make code easier to understand

* Use structured binding to iterate over maps

* move things around

* static const regex

* remove redundant parens

* Can't use asKeyValueRange because of Qt versions
This commit is contained in:
RickyRister 2025-11-12 07:58:09 -08:00 • committed by GitHub
parent 2efcb48b7e
commit ae123587d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

102
oracle/src/oracleimporter.cpp
View file

@ -40,8 +40,6 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s
bool OracleImporter::readSetsFromByteArray(const QByteArray &data) bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
{ {
QList<SetToDownload> newSetList;
bool ok; bool ok;
auto setsMap = QtJson::Json::parse(QString(data), ok).toMap().value("data").toMap(); auto setsMap = QtJson::Json::parse(QString(data), ok).toMap().value("data").toMap();
if (!ok) { if (!ok) {
@ -49,6 +47,8 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
return false; return false;
} }
QList<SetToDownload> newSetList;
QListIterator it(setsMap.values()); QListIterator it(setsMap.values());
while (it.hasNext()) { while (it.hasNext()) {
@ -152,7 +152,8 @@ CardInfoPtr OracleImporter::addCard(QString name,
QStringList symbols = manacost.split("}"); QStringList symbols = manacost.split("}");
QString formattedCardCost; QString formattedCardCost;
for (QString symbol : symbols) { for (QString symbol : symbols) {
if (symbol.contains(QRegularExpression("[0-9WUBGRP]/[0-9WUBGRP]"))) { static const auto manaCostPattern = QRegularExpression("[0-9WUBGRP]/[0-9WUBGRP]");
if (symbol.contains(manaCostPattern)) {
symbol.append("}"); symbol.append("}");
} else { } else {
symbol.remove(QChar('{')); symbol.remove(QChar('{'));
@ -186,9 +187,9 @@ CardInfoPtr OracleImporter::addCard(QString name,
// table row // table row
int tableRow = 1; int tableRow = 1;
QString mainCardType = properties.value("maintype").toString(); QString mainCardType = properties.value("maintype").toString();
if ((mainCardType == "Land")) if (mainCardType == "Land")
tableRow = 0; tableRow = 0;
else if ((mainCardType == "Sorcery") || (mainCardType == "Instant")) else if (mainCardType == "Sorcery" || mainCardType == "Instant")
tableRow = 3; tableRow = 3;
else if (mainCardType == "Creature") else if (mainCardType == "Creature")
tableRow = 2; tableRow = 2;
@ -237,26 +238,26 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
// mtgjson name => xml name // mtgjson name => xml name
static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}}; static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}};
int numCards = 0; static const QString ptSeparator = "/";
QMap<QString, QPair<QList<SplitCardPart>, QString>> splitCards;
QString ptSeparator("/");
QVariantMap card;
QString layout, name, text, colors, colorIdentity, faceName;
static constexpr bool isToken = false; static constexpr bool isToken = false;
static const QList<QString> setsWithCardsWithSameNameButDifferentText = {"UST"}; static const QList<QString> setsWithCardsWithSameNameButDifferentText = {"UST"};
QVariantHash properties;
PrintingInfo printingInfo; int numCards = 0;
QList<CardRelation *> relatedCards;
// Keeps track of any split card faces encountered so far
QMap<QString, QPair<QList<SplitCardPart>, QString>> splitCards;
// Keeps track of all names encountered so far
QList<QString> allNameProps; QList<QString> allNameProps;
for (const QVariant &cardVar : cardsList) { for (const QVariant &cardVar : cardsList) {
card = cardVar.toMap(); QVariantMap card = cardVar.toMap();
/* Currently used layouts are: /* Currently used layouts are:
* augment, double_faced_token, flip, host, leveler, meld, normal, planar, * augment, double_faced_token, flip, host, leveler, meld, normal, planar,
* saga, scheme, split, token, transform, vanguard * saga, scheme, split, token, transform, vanguard
*/ */
layout = getStringPropertyFromMap(card, "layout"); QString layout = getStringPropertyFromMap(card, "layout");
// don't import tokens from the json file // don't import tokens from the json file
if (layout == "token") { if (layout == "token") {
@ -264,44 +265,38 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
} }
// normal cards handling // normal cards handling
name = getStringPropertyFromMap(card, "name"); QString name = getStringPropertyFromMap(card, "name");
text = getStringPropertyFromMap(card, "text"); QString text = getStringPropertyFromMap(card, "text");
faceName = getStringPropertyFromMap(card, "faceName"); QString faceName = getStringPropertyFromMap(card, "faceName");
if (faceName.isEmpty()) { if (faceName.isEmpty()) {
faceName = name; faceName = name;
} }
// card properties // card properties
properties.clear(); QVariantHash properties;
QMapIterator it(cardProperties); for (auto i = cardProperties.cbegin(), end = cardProperties.cend(); i != end; ++i) {
while (it.hasNext()) { QString mtgjsonProperty = i.key();
it.next(); QString xmlPropertyName = i.value();
QString mtgjsonProperty = it.key();
QString xmlPropertyName = it.value();
QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
if (!propertyValue.isEmpty()) if (!propertyValue.isEmpty())
properties.insert(xmlPropertyName, propertyValue); properties.insert(xmlPropertyName, propertyValue);
} }
// per-set properties // per-set properties
printingInfo = PrintingInfo(currentSet); PrintingInfo printingInfo = PrintingInfo(currentSet);
QMapIterator it2(setInfoProperties); for (auto i = setInfoProperties.cbegin(), end = setInfoProperties.cend(); i != end; ++i) {
while (it2.hasNext()) { QString mtgjsonProperty = i.key();
it2.next(); QString xmlPropertyName = i.value();
QString mtgjsonProperty = it2.key();
QString xmlPropertyName = it2.value();
QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
if (!propertyValue.isEmpty()) if (!propertyValue.isEmpty())
printingInfo.setProperty(xmlPropertyName, propertyValue); printingInfo.setProperty(xmlPropertyName, propertyValue);
} }
// Identifiers // Identifiers
QMapIterator it3(identifierProperties); for (auto i = identifierProperties.cbegin(), end = identifierProperties.cend(); i != end; ++i) {
while (it3.hasNext()) { QString mtgjsonProperty = i.key();
it3.next(); QString xmlPropertyName = i.value();
auto mtgjsonProperty = it3.key(); QString propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
auto xmlPropertyName = it3.value();
auto propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
if (!propertyValue.isEmpty()) { if (!propertyValue.isEmpty()) {
printingInfo.setProperty(xmlPropertyName, propertyValue); printingInfo.setProperty(xmlPropertyName, propertyValue);
} }
@ -320,13 +315,13 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
allNameProps.append(faceName); allNameProps.append(faceName);
// special handling properties // special handling properties
colors = card.value("colors").toStringList().join(""); QString colors = card.value("colors").toStringList().join("");
if (!colors.isEmpty()) { if (!colors.isEmpty()) {
properties.insert("colors", colors); properties.insert("colors", colors);
} }
// special handling properties // special handling properties
colorIdentity = card.value("colorIdentity").toStringList().join(""); QString colorIdentity = card.value("colorIdentity").toStringList().join("");
if (!colorIdentity.isEmpty()) { if (!colorIdentity.isEmpty()) {
properties.insert("coloridentity", colorIdentity); properties.insert("coloridentity", colorIdentity);
} }
@ -349,8 +344,8 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
} }
auto legalities = card.value("legalities").toMap(); auto legalities = card.value("legalities").toMap();
for (const QString &fmtName : legalities.keys()) { for (auto i = legalities.cbegin(), end = legalities.cend(); i != end; ++i) {
properties.insert(QString("format-%1").arg(fmtName), legalities.value(fmtName).toString().toLower()); properties.insert(QString("format-%1").arg(i.key()), i.value().toString().toLower());
} }
// split cards are considered a single card, enqueue for later merging // split cards are considered a single card, enqueue for later merging
@ -367,7 +362,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
} }
} else { } else {
// relations // relations
relatedCards.clear(); QList<CardRelation *> relatedCards;
// add other face for split cards as card relation // add other face for split cards as card relation
if (!getStringPropertyFromMap(card, "side").isEmpty()) { if (!getStringPropertyFromMap(card, "side").isEmpty()) {
@ -415,17 +410,15 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
// split cards handling // split cards handling
static const QString splitCardPropSeparator = QString(" // "); static const QString splitCardPropSeparator = QString(" // ");
static const QString splitCardTextSeparator = QString("\n\n---\n\n"); static const QString splitCardTextSeparator = QString("\n\n---\n\n");
for (const QString &nameSplit : splitCards.keys()) { static const QList<CardRelation *> noRelatedCards = {};
// get all parts for this specific card
QList<SplitCardPart> splitCardParts = splitCards.value(nameSplit).first;
name = splitCards.value(nameSplit).second;
text.clear(); QList<QPair<QList<SplitCardPart>, QString>> partsAndNames = splitCards.values();
properties.clear(); for (auto [splitCardParts, name] : partsAndNames) {
relatedCards.clear(); QString text;
QVariantHash properties;
PrintingInfo printingInfo;
for (const SplitCardPart &tmp : splitCardParts) { for (const SplitCardPart &tmp : splitCardParts) {
QString splitName = tmp.getName();
if (!text.isEmpty()) { if (!text.isEmpty()) {
text.append(splitCardTextSeparator); text.append(splitCardTextSeparator);
} }
@ -436,9 +429,10 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
printingInfo = tmp.getPrintingInfo(); printingInfo = tmp.getPrintingInfo();
} else { } else {
const QVariantHash &tmpProps = tmp.getProperties(); const QVariantHash &tmpProps = tmp.getProperties();
for (const QString &prop : tmpProps.keys()) { for (auto i = tmpProps.cbegin(), end = tmpProps.cend(); i != end; ++i) {
QString prop = i.key();
QString originalPropertyValue = properties.value(prop).toString(); QString originalPropertyValue = properties.value(prop).toString();
QString thisCardPropertyValue = tmpProps.value(prop).toString(); QString thisCardPropertyValue = i.value().toString();
if (!thisCardPropertyValue.isEmpty() && originalPropertyValue != thisCardPropertyValue) { if (!thisCardPropertyValue.isEmpty() && originalPropertyValue != thisCardPropertyValue) {
if (originalPropertyValue.isEmpty()) { // don't create //es if one field is empty if (originalPropertyValue.isEmpty()) { // don't create //es if one field is empty
properties.insert(prop, thisCardPropertyValue); properties.insert(prop, thisCardPropertyValue);
@ -454,7 +448,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
} }
} }
} }
CardInfoPtr newCard = addCard(name, text, isToken, properties, relatedCards, printingInfo); CardInfoPtr newCard = addCard(name, text, isToken, properties, noRelatedCards, printingInfo);
numCards++; numCards++;
} }
@ -463,7 +457,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
int OracleImporter::startImport() int OracleImporter::startImport()
{ {
int setCards = 0, setIndex = 0; int setIndex = 0;
// add an empty set for tokens // add an empty set for tokens
CardSetPtr tokenSet = CardSet::newInstance(SettingsCache::instance().cardDatabase(), CardSet::TOKENS_SETNAME, CardSetPtr tokenSet = CardSet::newInstance(SettingsCache::instance().cardDatabase(), CardSet::TOKENS_SETNAME,
tr("Dummy set containing tokens"), "Tokens"); tr("Dummy set containing tokens"), "Tokens");
@ -483,7 +477,7 @@ int OracleImporter::startImport()
emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName()); emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName());
} }
emit setIndexChanged(setCards, setIndex, QString()); emit setIndexChanged(0, setIndex, QString());
// total number of sets // total number of sets
return setIndex; return setIndex;

4
oracle/src/oraclewizard.cpp
View file

@ -641,7 +641,9 @@ void SaveSetsPage::initializePage()
messageLog->show(); messageLog->show();
connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress); connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
if (!wizard()->importer->startImport()) { int setsImported = wizard()->importer->startImport();
if (setsImported == 0) {
QMessageBox::critical(this, tr("Error"), tr("No set has been imported.")); QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
} }
} }