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

Refactor: rename CardInfoPerSet to PrintingInfo (#6024)

Browse source 
* remove unnecessary consts

* removed unused

* rename class

* rename variables and methods

* rename again

* rename variables again

* rename field

* run formatter
This commit is contained in:
RickyRister 2025-07-07 20:41:19 -07:00 • committed by GitHub
parent 686e90d0ed
commit a9684f67cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 288 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/board/abstract_card_item.cpp
View file

@ -67,7 +67,7 @@ void AbstractCardItem::refreshCardInfo()
QVariantHash properties = QVariantHash();
info = CardInfo::newInstance(name, "", true, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
CardInfoPerSetMap(), false, false, -1, false);
SetToPrintingsMap(), false, false, -1, false);
}
if (info.data()) {
connect(info.data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated);

90
cockatrice/src/game/cards/card_database.cpp
View file

@ -73,9 +73,9 @@ void CardDatabase::addCard(CardInfoPtr card)
// if card already exists just add the new set property
if (cards.contains(card->getName())) {
CardInfoPtr sameCard = cards[card->getName()];
for (const auto &cardInfoPerSetList : card->getSets()) {
for (const CardInfoPerSet &set : cardInfoPerSetList) {
sameCard->addToSet(set.getPtr(), set);
for (const auto &printings : card->getSets()) {
for (const PrintingInfo &printing : printings) {
sameCard->addToSet(printing.getSet(), printing);
}
}
return;
@ -147,12 +147,12 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co
return info;
}
for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : cardInfoPerSetList) {
if (set.getProperty("uuid") == providerId) {
for (const auto &printings : info->getSets()) {
for (const auto &printing : printings) {
if (printing.getProperty("uuid") == providerId) {
CardInfoPtr cardFromSpecificSet = info->clone();
cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) +
QString("_") + QString(set.getProperty("uuid")));
QString("_") + QString(printing.getProperty("uuid")));
return cardFromSpecificSet;
}
}
@ -309,53 +309,53 @@ void CardDatabase::refreshPreferredPrintings()
}
}
CardInfoPerSet CardDatabase::getPreferredSetForCard(const QString &cardName) const
PrintingInfo CardDatabase::getPreferredPrinting(const QString &cardName) const
{
CardInfoPtr cardInfo = getCard(cardName);
if (!cardInfo) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardInfoPerSetMap setMap = cardInfo->getSets();
SetToPrintingsMap setMap = cardInfo->getSets();
if (setMap.empty()) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardSetPtr preferredSet = nullptr;
CardInfoPerSet preferredCard;
PrintingInfo preferredPrinting;
SetPriorityComparator comparator;
for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : cardInfoPerSetList) {
CardSetPtr currentSet = cardInfoForSet.getPtr();
for (const auto &printings : setMap) {
for (auto &printing : printings) {
CardSetPtr currentSet = printing.getSet();
if (!preferredSet || comparator(currentSet, preferredSet)) {
preferredSet = currentSet;
preferredCard = cardInfoForSet;
preferredPrinting = printing;
}
}
}
if (preferredSet) {
return preferredCard;
return preferredPrinting;
}
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName, const QString &providerId) const
PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, const QString &providerId) const
{
CardInfoPtr cardInfo = getCard(cardName);
if (!cardInfo) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardInfoPerSetMap setMap = cardInfo->getSets();
SetToPrintingsMap setMap = cardInfo->getSets();
if (setMap.empty()) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : cardInfoPerSetList) {
for (const auto &printings : setMap) {
for (auto &cardInfoForSet : printings) {
if (cardInfoForSet.getProperty("uuid") == providerId) {
return cardInfoForSet;
}
@ -363,48 +363,48 @@ CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName, cons
}
if (providerId.isNull()) {
return getPreferredSetForCard(cardName);
return getPreferredPrinting(cardName);
}
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName,
const QString &setShortName,
const QString &collectorNumber) const
PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName,
const QString &setShortName,
const QString &collectorNumber) const
{
CardInfoPtr cardInfo = getCard(cardName);
if (!cardInfo) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
CardInfoPerSetMap setMap = cardInfo->getSets();
SetToPrintingsMap setMap = cardInfo->getSets();
if (setMap.empty()) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
for (const auto &cardInfoPerSetList : setMap) {
for (auto &cardInfoForSet : cardInfoPerSetList) {
for (const auto &printings : setMap) {
for (auto &cardInfoForSet : printings) {
if (collectorNumber != nullptr) {
if (cardInfoForSet.getPtr()->getShortName() == setShortName &&
if (cardInfoForSet.getSet()->getShortName() == setShortName &&
cardInfoForSet.getProperty("num") == collectorNumber) {
return cardInfoForSet;
}
} else {
if (cardInfoForSet.getPtr()->getShortName() == setShortName) {
if (cardInfoForSet.getSet()->getShortName() == setShortName) {
return cardInfoForSet;
}
}
}
}
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
QString CardDatabase::getPreferredPrintingProviderIdForCard(const QString &cardName)
{
CardInfoPerSet preferredSetCardInfo = getPreferredSetForCard(cardName);
QString preferredPrintingProviderId = preferredSetCardInfo.getProperty(QString("uuid"));
PrintingInfo preferredPrinting = getPreferredPrinting(cardName);
QString preferredPrintingProviderId = preferredPrinting.getProperty(QString("uuid"));
if (preferredPrintingProviderId.isEmpty()) {
CardInfoPtr defaultCardInfo = getCard(cardName);
if (defaultCardInfo.isNull()) {
@ -424,15 +424,15 @@ bool CardDatabase::isProviderIdForPreferredPrinting(const QString &cardName, con
return providerId == getPreferredPrintingProviderIdForCard(cardName);
}
CardInfoPerSet CardDatabase::getSetInfoForCard(const CardInfoPtr &_card)
PrintingInfo CardDatabase::getSetInfoForCard(const CardInfoPtr &_card)
{
const CardInfoPerSetMap &setMap = _card->getSets();
const SetToPrintingsMap &setMap = _card->getSets();
if (setMap.empty()) {
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
for (const auto &cardInfoPerSetList : setMap) {
for (const auto &cardInfoForSet : cardInfoPerSetList) {
for (const auto &printings : setMap) {
for (const auto &cardInfoForSet : printings) {
if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") ==
_card->getPixmapCacheKey()) {
return cardInfoForSet;
@ -440,7 +440,7 @@ CardInfoPerSet CardDatabase::getSetInfoForCard(const CardInfoPtr &_card)
}
}
return CardInfoPerSet(nullptr);
return PrintingInfo(nullptr);
}
void CardDatabase::refreshCachedReverseRelatedCards()

10
cockatrice/src/game/cards/card_database.h
View file

@ -69,10 +69,10 @@ public:
[[nodiscard]] QList<CardInfoPtr> getCards(const QStringList &cardNames) const;
QList<CardInfoPtr> getCardsByNameAndProviderId(const QMap<QString, QString> &cardNames) const;
[[nodiscard]] CardInfoPtr getCardByNameAndProviderId(const QString &cardName, const QString &providerId) const;
[[nodiscard]] CardInfoPerSet getPreferredSetForCard(const QString &cardName) const;
[[nodiscard]] CardInfoPerSet getSpecificSetForCard(const QString &cardName, const QString &providerId) const;
CardInfoPerSet
getSpecificSetForCard(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const;
[[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const;
[[nodiscard]] PrintingInfo getSpecificPrinting(const QString &cardName, const QString &providerId) const;
PrintingInfo
getSpecificPrinting(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const;
QString getPreferredPrintingProviderIdForCard(const QString &cardName);
[[nodiscard]] CardInfoPtr guessCard(const QString &cardName, const QString &providerId = QString()) const;
@ -84,7 +84,7 @@ public:
CardSetPtr getSet(const QString &setName);
bool isProviderIdForPreferredPrinting(const QString &cardName, const QString &providerId);
static CardInfoPerSet getSetInfoForCard(const CardInfoPtr &_card);
static PrintingInfo getSetInfoForCard(const CardInfoPtr &_card);
const CardNameMap &getCardList() const
{
return cards;

6
cockatrice/src/game/cards/card_database_model.cpp
View file

@ -98,9 +98,9 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
if (!showOnlyCardsFromEnabledSets)
return true;
for (const auto &cardInfoPerSetList : card->getSets()) {
for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getEnabled())
for (const auto &printings : card->getSets()) {
for (const auto &printing : printings) {
if (printing.getSet()->getEnabled())
return true;
}
}

12
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
View file

@ -160,7 +160,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
QVariantHash properties = QVariantHash();
QString colors = QString("");
QList<CardRelation *> relatedCards, reverseRelatedCards;
auto _sets = CardInfoPerSetMap();
auto _sets = SetToPrintingsMap();
int tableRow = 0;
bool cipt = false;
bool landscapeOrientation = false;
@ -209,7 +209,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
// NOTE: attributes must be read before readElementText()
QXmlStreamAttributes attrs = xml.attributes();
QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements);
CardInfoPerSet setInfo(internalAddSet(setName));
PrintingInfo setInfo(internalAddSet(setName));
if (attrs.hasAttribute("muId")) {
setInfo.setProperty("muid", attrs.value("muId").toString());
}
@ -343,9 +343,9 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
}
// sets
const CardInfoPerSetMap sets = info->getSets();
for (const auto &cardInfoPerSetList : sets) {
for (const CardInfoPerSet &set : cardInfoPerSetList) {
const SetToPrintingsMap setMap = info->getSets();
for (const auto &printings : setMap) {
for (const PrintingInfo &set : printings) {
xml.writeStartElement("set");
xml.writeAttribute("rarity", set.getProperty("rarity"));
xml.writeAttribute("muId", set.getProperty("muid"));
@ -361,7 +361,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
xml.writeAttribute("picURL", tmpString);
}
xml.writeCharacters(set.getPtr()->getShortName());
xml.writeCharacters(set.getSet()->getShortName());
xml.writeEndElement();
}
}

16
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
View file

@ -144,7 +144,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
QString text = QString("");
QVariantHash properties = QVariantHash();
QList<CardRelation *> relatedCards, reverseRelatedCards;
auto _sets = CardInfoPerSetMap();
auto _sets = SetToPrintingsMap();
int tableRow = 0;
bool cipt = false;
bool landscapeOrientation = false;
@ -184,12 +184,12 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements);
auto set = internalAddSet(setName);
if (set->getEnabled()) {
CardInfoPerSet setInfo(set);
PrintingInfo printingInfo(set);
for (QXmlStreamAttribute attr : attrs) {
QString attrName = attr.name().toString();
if (attrName == "picURL")
attrName = "picurl";
setInfo.setProperty(attrName, attr.value().toString());
printingInfo.setProperty(attrName, attr.value().toString());
}
// This is very much a hack and not the right place to
@ -199,8 +199,8 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
// However, this is also true of the `set->getEnabled()`
// check above (which is currently bugged as well), so
// we'll fix both at the same time.
if (includeRebalancedCards || setInfo.getProperty("isRebalanced") != "true") {
_sets[setName].append(setInfo);
if (includeRebalancedCards || printingInfo.getProperty("isRebalanced") != "true") {
_sets[setName].append(printingInfo);
}
}
// related cards
@ -309,14 +309,14 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
xml.writeEndElement();
// sets
for (const auto &cardInfoPerSetList : info->getSets()) {
for (const CardInfoPerSet &set : cardInfoPerSetList) {
for (const auto &printings : info->getSets()) {
for (const PrintingInfo &set : printings) {
xml.writeStartElement("set");
for (const QString &propName : set.getProperties()) {
xml.writeAttribute(propName, set.getProperty(propName));
}
xml.writeCharacters(set.getPtr()->getShortName());
xml.writeCharacters(set.getSet()->getShortName());
xml.writeEndElement();
}
}

30
cockatrice/src/game/cards/card_info.cpp
View file

@ -215,7 +215,7 @@ void SetList::defaultSort()
});
}
CardInfoPerSet::CardInfoPerSet(const CardSetPtr &_set) : set(_set)
PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
{
}
@ -225,13 +225,13 @@ CardInfo::CardInfo(const QString &_name,
QVariantHash _properties,
const QList<CardRelation *> &_relatedCards,
const QList<CardRelation *> &_reverseRelatedCards,
CardInfoPerSetMap _sets,
SetToPrintingsMap _sets,
bool _cipt,
bool _landscapeOrientation,
int _tableRow,
bool _upsideDownArt)
: name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
reverseRelatedCards(_reverseRelatedCards), sets(std::move(_sets)), cipt(_cipt),
reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), cipt(_cipt),
landscapeOrientation(_landscapeOrientation), tableRow(_tableRow), upsideDownArt(_upsideDownArt)
{
pixmapCacheKey = QLatin1String("card_") + name;
@ -248,7 +248,7 @@ CardInfo::~CardInfo()
CardInfoPtr CardInfo::newInstance(const QString &_name)
{
return newInstance(_name, QString(), false, QVariantHash(), QList<CardRelation *>(), QList<CardRelation *>(),
CardInfoPerSetMap(), false, false, 0, false);
SetToPrintingsMap(), false, false, 0, false);
}
CardInfoPtr CardInfo::newInstance(const QString &_name,
@ -257,7 +257,7 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
QVariantHash _properties,
const QList<CardRelation *> &_relatedCards,
const QList<CardRelation *> &_reverseRelatedCards,
CardInfoPerSetMap _sets,
SetToPrintingsMap _sets,
bool _cipt,
bool _landscapeOrientation,
int _tableRow,
@ -267,9 +267,9 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
_sets, _cipt, _landscapeOrientation, _tableRow, _upsideDownArt));
ptr->setSmartPointer(ptr);
for (const auto &cardInfoPerSetList : _sets) {
for (const CardInfoPerSet &set : cardInfoPerSetList) {
set.getPtr()->append(ptr);
for (const auto &printings : _sets) {
for (const PrintingInfo &printing : printings) {
printing.getSet()->append(ptr);
break;
}
}
@ -289,13 +289,13 @@ QString CardInfo::getCorrectedName() const
return result.remove(rmrx).replace(spacerx, space);
}
void CardInfo::addToSet(const CardSetPtr &_set, const CardInfoPerSet _info)
void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo _info)
{
if (!_set->contains(smartThis)) {
_set->append(smartThis);
}
if (!sets[_set->getShortName()].contains(_info)) {
sets[_set->getShortName()].append(_info);
if (!setsToPrintings[_set->getShortName()].contains(_info)) {
setsToPrintings[_set->getShortName()].append(_info);
}
refreshCachedSetNames();
@ -316,10 +316,10 @@ void CardInfo::refreshCachedSetNames()
{
QStringList setList;
// update the cached list of set names
for (const auto &cardInfoPerSetList : sets) {
for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getEnabled()) {
setList << set.getPtr()->getShortName();
for (const auto &printings : setsToPrintings) {
for (const auto &printing : printings) {
if (printing.getSet()->getEnabled()) {
setList << printing.getSet()->getShortName();
}
break;
}

52
cockatrice/src/game/cards/card_info.h
View file

@ -15,15 +15,14 @@
inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
class CardInfo;
class CardInfoPerSet;
class PrintingInfo;
class CardSet;
class CardRelation;
class ICardDatabaseParser;
typedef QMap<QString, QString> QStringMap;
typedef QSharedPointer<CardInfo> CardInfoPtr;
typedef QSharedPointer<CardSet> CardSetPtr;
typedef QMap<QString, QList<CardInfoPerSet>> CardInfoPerSetMap;
typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
typedef QHash<QString, CardInfoPtr> CardNameMap;
typedef QHash<QString, CardSetPtr> SetNameMap;
@ -143,32 +142,35 @@ public:
void defaultSort();
};
class CardInfoPerSet
/**
* Info relating to a specific printing for a card.
*/
class PrintingInfo
{
public:
explicit CardInfoPerSet(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr));
~CardInfoPerSet() = default;
explicit PrintingInfo(const CardSetPtr &_set = QSharedPointer<CardSet>(nullptr));
~PrintingInfo() = default;
bool operator==(const CardInfoPerSet &other) const
bool operator==(const PrintingInfo &other) const
{
return this->set == other.set && this->properties == other.properties;
}
private:
CardSetPtr set;
// per-set card properties;
// per-printing card properties;
QVariantHash properties;
public:
const CardSetPtr getPtr() const
CardSetPtr getSet() const
{
return set;
}
const QStringList getProperties() const
QStringList getProperties() const
{
return properties.keys();
}
const QString getProperty(const QString &propertyName) const
QString getProperty(const QString &propertyName) const
{
return properties.value(propertyName).toString();
}
@ -202,7 +204,7 @@ private:
// the cards thare are reverse-related to me
QList<CardRelation *> reverseRelatedCardsToMe;
// card sets
CardInfoPerSetMap sets;
SetToPrintingsMap setsToPrintings;
// cached set names
QString setsNames;
// positioning properties; used by UI
@ -218,7 +220,7 @@ public:
QVariantHash _properties,
const QList<CardRelation *> &_relatedCards,
const QList<CardRelation *> &_reverseRelatedCards,
CardInfoPerSetMap _sets,
SetToPrintingsMap _sets,
bool _cipt,
bool _landscapeOrientation,
int _tableRow,
@ -227,7 +229,7 @@ public:
: QObject(other.parent()), name(other.name), simpleName(other.simpleName), pixmapCacheKey(other.pixmapCacheKey),
text(other.text), isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
sets(other.sets), setsNames(other.setsNames), cipt(other.cipt),
setsToPrintings(other.setsToPrintings), setsNames(other.setsNames), cipt(other.cipt),
landscapeOrientation(other.landscapeOrientation), tableRow(other.tableRow), upsideDownArt(other.upsideDownArt)
{
}
@ -241,7 +243,7 @@ public:
QVariantHash _properties,
const QList<CardRelation *> &_relatedCards,
const QList<CardRelation *> &_reverseRelatedCards,
CardInfoPerSetMap _sets,
SetToPrintingsMap _sets,
bool _cipt,
bool _landscapeOrientation,
int _tableRow,
@ -292,11 +294,11 @@ public:
{
return isToken;
}
const QStringList getProperties() const
QStringList getProperties() const
{
return properties.keys();
}
const QString getProperty(const QString &propertyName) const
QString getProperty(const QString &propertyName) const
{
return properties.value(propertyName).toString();
}
@ -309,27 +311,27 @@ public:
{
return properties.contains(propertyName);
}
const CardInfoPerSetMap &getSets() const
const SetToPrintingsMap &getSets() const
{
return sets;
return setsToPrintings;
}
const QString &getSetsNames() const
{
return setsNames;
}
const QString getSetProperty(const QString &setName, const QString &propertyName) const
QString getSetProperty(const QString &setName, const QString &propertyName) const
{
if (!sets.contains(setName))
if (!setsToPrintings.contains(setName))
return "";
for (const auto &set : sets[setName]) {
for (const auto &set : setsToPrintings[setName]) {
if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) ==
this->getPixmapCacheKey()) {
return set.getProperty(propertyName);
}
}
return sets[setName][0].getProperty(propertyName);
return setsToPrintings[setName][0].getProperty(propertyName);
}
// related cards
@ -345,7 +347,7 @@ public:
{
return reverseRelatedCardsToMe;
}
const QList<CardRelation *> getAllRelatedCards() const
QList<CardRelation *> getAllRelatedCards() const
{
QList<CardRelation *> result;
result.append(getRelatedCards());
@ -399,7 +401,7 @@ public:
return getSetProperty(set, "picurl");
}
QString getCorrectedName() const;
void addToSet(const CardSetPtr &_set, CardInfoPerSet _info = CardInfoPerSet());
void addToSet(const CardSetPtr &_set, PrintingInfo _info = PrintingInfo());
void combineLegalities(const QVariantHash &props);
void emitPixmapUpdated()
{

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

@ -129,14 +129,14 @@ static void setupParserRules()
search["RarityQuery"] = [](const peg::SemanticValues &sv) -> Filter {
const auto rarity = std::any_cast<QString>(sv[0]);
return [=](const CardData &x) -> bool {
QList<CardInfoPerSet> infos;
for (const auto &setsValue : x->getSets().values()) {
for (const auto &cardInfoPerSet : setsValue) {
infos.append(cardInfoPerSet);
QList<PrintingInfo> infos;
for (const auto &printings : x->getSets()) {
for (const auto &printing : printings) {
infos.append(printing);
}
}
auto matchesRarity = [&rarity](const CardInfoPerSet &info) { return rarity == info.getProperty("rarity"); };
auto matchesRarity = [&rarity](const PrintingInfo &info) { return rarity == info.getProperty("rarity"); };
return std::any_of(infos.begin(), infos.end(), matchesRarity);
};
};

14
cockatrice/src/game/filters/filter_tree.cpp
View file

@ -215,10 +215,10 @@ bool FilterItem::acceptText(const CardInfoPtr info) const
bool FilterItem::acceptSet(const CardInfoPtr info) const
{
bool status = false;
for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : cardInfoPerSetList) {
if (set.getPtr()->getShortName().compare(term, Qt::CaseInsensitive) == 0 ||
set.getPtr()->getLongName().compare(term, Qt::CaseInsensitive) == 0) {
for (const auto &printings : info->getSets()) {
for (const auto &set : printings) {
if (set.getSet()->getShortName().compare(term, Qt::CaseInsensitive) == 0 ||
set.getSet()->getLongName().compare(term, Qt::CaseInsensitive) == 0) {
status = true;
break;
}
@ -350,9 +350,9 @@ bool FilterItem::acceptRarity(const CardInfoPtr info) const
}
}
for (const auto &cardInfoPerSetList : info->getSets()) {
for (const auto &set : cardInfoPerSetList) {
if (set.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) {
for (const auto &printings : info->getSets()) {
for (const auto &printing : printings) {
if (printing.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) {
return true;
}
}