jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor: clean up OracleImporter (#5871)

Browse source 
* remove unused dataDir variable

* inline setsMap

* join declaration and assignment

* make the protected methods static

* make getSetPriority static

* inline mainCardTypes list and make the method static

* pass by const ref when able

* rename param to match
This commit is contained in:
RickyRister 2025-04-21 13:29:42 -07:00 • committed by GitHub
parent f7152befec
commit ffe02e59c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 51 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

29
oracle/src/oracleimporter.h
View file

@ -92,7 +92,10 @@ public:
class SplitCardPart
{
public:
SplitCardPart(const QString &_name, const QString &_text, const QVariantHash &_properties, CardInfoPerSet setInfo);
SplitCardPart(const QString &_name,
const QString &_text,
const QVariantHash &_properties,
const CardInfoPerSet &setInfo);
inline const QString &getName() const
{
return name;
@ -121,8 +124,6 @@ class OracleImporter : public QObject
{
Q_OBJECT
private:
const QStringList mainCardTypes = {"Planeswalker", "Creature", "Land", "Sorcery",
"Instant", "Artifact", "Enchantment"};
static const QRegularExpression formatRegex;
/**
@ -136,27 +137,23 @@ private:
SetNameMap sets;
QList<SetToDownload> allSets;
QVariantMap setsMap;
QString dataDir;
QString getMainCardType(const QStringList &typeList);
CardInfoPtr addCard(QString name,
QString text,
const QString &text,
bool isToken,
QVariantHash properties,
QList<CardRelation *> &relatedCards,
CardInfoPerSet setInfo);
const QList<CardRelation *> &relatedCards,
const CardInfoPerSet &setInfo);
signals:
void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
void dataReadProgress(int bytesRead, int totalBytes);
public:
explicit OracleImporter(const QString &_dataDir, QObject *parent = nullptr);
CardSet::Priority getSetPriority(QString &setType, QString &shortName);
explicit OracleImporter(QObject *parent = nullptr);
bool readSetsFromByteArray(const QByteArray &data);
int startImport();
bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion);
int importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cards);
int importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cardsList);
const CardNameMap &getCardList() const
{
return cards;
@ -165,15 +162,7 @@ public:
{
return allSets;
}
const QString &getDataDir() const
{
return dataDir;
}
void clear();
protected:
inline QString getStringPropertyFromMap(const QVariantMap &card, const QString &propertyName);
void sortAndReduceColors(QString &colors);
};
#endif