jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-21 09:05:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[Oracle] Restore property coercion and legality merge in native JSON import

Browse source
This commit is contained in:
Lukas Brübach 2026-08-30 22:54:12 +02:00
parent 23bdc1d986
commit b16497327f
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
oracle/src/oracleimporter.cpp
View file

@ -147,7 +147,11 @@ CardInfoPtr OracleImporter::addCard(QString name,
if (existingIt != cards.constEnd()) {
CardInfoPtr card = existingIt.value();
card->addToSet(printingInfo.getSet(), printingInfo);
card->combineLegalities(properties);
// Only merge legalities when the card has none yet, so multi-format
// printings don't overwrite each other's legality lists.
if (card->getProperties().filter(formatRegex).empty()) {
card->combineLegalities(properties);
}
return card;
}
@ -224,7 +228,10 @@ CardInfoPtr OracleImporter::addCard(QString name,
static QString getJsonString(const QJsonObject &obj, const QString &key)
{
return obj.value(key).toString();
// QVariant coerces numbers and booleans to text, while QJsonValue::toString()
// returns a null string for them — some MTGJSON fields (manaValue,
// convertedManaCost, isOnlineOnly, isRebalanced) carry those types.
return obj.value(key).toVariant().toString();
}
int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QJsonArray &cardsList)
@ -329,12 +336,18 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QJson
allNameProps.insert(faceName);
// special handling properties
QString colors = card.value("colors").toVariant().toStringList().join("");
QString colors;
for (const QJsonValue &color : card.value("colors").toArray()) {
colors += color.toString();
}
if (!colors.isEmpty()) {
properties.insert("colors", colors);
}
QString colorIdentity = card.value("colorIdentity").toVariant().toStringList().join("");
QString colorIdentity;
for (const QJsonValue &color : card.value("colorIdentity").toArray()) {
colorIdentity += color.toString();
}
if (!colorIdentity.isEmpty()) {
properties.insert("coloridentity", colorIdentity);
}
@ -529,7 +542,7 @@ static FormatRulesNameMap buildDefaultMagicFormats()
return defaultFormatRulesNameMap;
}
FormatRulesNameMap OracleImporter::createDefaultMagicFormats()
const FormatRulesNameMap &OracleImporter::createDefaultMagicFormats()
{
static const FormatRulesNameMap cached = buildDefaultMagicFormats();
return cached;

5
oracle/src/oracleimporter.h
View file

@ -157,7 +157,10 @@ public:
int startImport();
bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion);
int importCardsFromSet(const CardSetPtr &currentSet, const QJsonArray &cardsList);
FormatRulesNameMap createDefaultMagicFormats();
/**
* @brief Returns the default format rules. The result is memoized on first use and must be treated as immutable.
*/
const FormatRulesNameMap &createDefaultMagicFormats();
const CardNameMap &getCardList() const
{
return cards;