jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adjust to database split.

Browse source 
Took 8 minutes
This commit is contained in:
Lukas Brübach 2025-09-27 01:06:37 +02:00
parent 6fa1dcbe1d
commit e8d56c1ed3
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cockatrice/src/database/card_database_querier.cpp
View file

@ -1,5 +1,6 @@
#include "card_database_querier.h" #include "card_database_querier.h"
#include "../settings/cache_settings.h"
#include "../utility/card_set_comparator.h" #include "../utility/card_set_comparator.h"
#include "card_database.h" #include "card_database.h"
@ -202,6 +203,17 @@ PrintingInfo CardDatabaseQuerier::getSpecificPrinting(const QString &cardName,
return PrintingInfo(nullptr); return PrintingInfo(nullptr);
} }
/**
* Gets the card representing the preferred printing of the cardInfo
*
* @param cardName The cardName to find the preferred card and printing for
* @return A specific printing of a card
*/
ExactCard CardDatabaseQuerier::getPreferredCard(const QString &cardName) const
{
return getPreferredCard(getCardInfo(cardName));
}
/** /**
* Gets the card representing the preferred printing of the cardInfo * Gets the card representing the preferred printing of the cardInfo
* *
@ -234,6 +246,13 @@ PrintingInfo CardDatabaseQuerier::getPreferredPrinting(const CardInfoPtr &cardIn
return PrintingInfo(nullptr); return PrintingInfo(nullptr);
} }
const auto &pinnedPrintingProviderId =
SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName());
if (!pinnedPrintingProviderId.isEmpty()) {
return getSpecificPrinting({cardInfo->getName(), pinnedPrintingProviderId});
}
SetToPrintingsMap setMap = cardInfo->getSets(); SetToPrintingsMap setMap = cardInfo->getSets();
if (setMap.empty()) { if (setMap.empty()) {
return PrintingInfo(nullptr); return PrintingInfo(nullptr);

1
cockatrice/src/database/card_database_querier.h
View file

@ -39,6 +39,7 @@ public:
[[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const; [[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const;
[[nodiscard]] PrintingInfo [[nodiscard]] PrintingInfo
getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const; getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const;
ExactCard getPreferredCard(const QString &cardName) const;
[[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const; [[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const;
[[nodiscard]] QStringList getAllMainCardTypes() const; [[nodiscard]] QStringList getAllMainCardTypes() const;

2
cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -199,7 +199,7 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
annotationEdit->setText(""); annotationEdit->setText("");
} }
pic->setCard(CardDatabaseManager::getInstance()->getPreferredCard(cardInfo)); pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
} }
void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const

16
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
View file

@ -175,21 +175,7 @@ ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const
const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString(); const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
return getCardOrPinnedPrinting(cardName); return CardDatabaseManager::query()->getPreferredCard(cardName);
}
ExactCard DeckEditorDatabaseDisplayWidget::getCardOrPinnedPrinting(QString cardName) const
{
const auto &cardProviderId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
ExactCard card = CardDatabaseManager::query()->getCard({cardName});
if (cardProviderId != "") {
return ExactCard(card.getCardPtr(),
CardDatabaseManager::query()->getSpecificPrinting({cardName, cardProviderId}));
}
return card;
} }
void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point) void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)