From eb4914d36f6a6991040531828c613ea16ace0834 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Sat, 16 Mar 2019 20:00:34 +0100
Subject: [PATCH] include a list of priorities for maincardtypes in oracle
 (#3663)

fix #3662
---
 oracle/src/oracleimporter.cpp | 25 +++++++++++++------------
 oracle/src/oracleimporter.h   |  3 +++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 22f44cf0..4530470c 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -66,6 +66,16 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
     return true;
 }
 
+QString OracleImporter::getMainCardType(const QStringList &typeList)
+{
+    for (const auto &type : mainCardTypes) {
+        if (typeList.contains(type)) {
+            return type;
+        }
+    }
+    return typeList.first();
+}
+
 CardInfoPtr OracleImporter::addCard(QString name,
                                     QString text,
                                     bool isToken,
@@ -248,18 +258,9 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
         if (!colorIdentity.isEmpty())
             properties.insert("coloridentity", colorIdentity);
 
-        {
-            const auto &typeList = card.value("types").toStringList();
-            if (typeList.contains("Creature")) {
-                properties.insert("maintype", "Creature");
-            } else if (typeList.contains("Land")) {
-                properties.insert("maintype", "Land");
-            } else {
-                const auto &maintype = typeList.first();
-                if (!maintype.isEmpty()) {
-                    properties.insert("maintype", maintype);
-                }
-            }
+        const auto &mainCardType = getMainCardType(card.value("types").toStringList());
+        if (!mainCardType.isEmpty()) {
+            properties.insert("maintype", mainCardType);
         }
 
         power = getStringPropertyFromMap(card, "power");
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 31b5016b..aa39ba24 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -89,10 +89,13 @@ class OracleImporter : public CardDatabase
 {
     Q_OBJECT
 private:
+    const QStringList mainCardTypes = {"Planeswalker", "Creature", "Land",       "Sorcery",
+                                       "Instant",      "Artifact", "Enchantment"};
     QList<SetToDownload> allSets;
     QVariantMap setsMap;
     QString dataDir;
 
+    QString getMainCardType(const QStringList &typeList);
     CardInfoPtr addCard(QString name,
                         QString text,
                         bool isToken,