From 759bf74ad8b68c2cd79b0a5c90bebf543fc324ce Mon Sep 17 00:00:00 2001
From: RickyRister <ricky.rister.wang@gmail.com>
Date: Sun, 20 Apr 2025 14:58:42 -0700
Subject: [PATCH] make OracleImporter no longer extend CardDatabase

---
 oracle/src/oracleimporter.cpp |  5 +++--
 oracle/src/oracleimporter.h   | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index d9195958f..22edebac2 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -19,7 +19,7 @@ SplitCardPart::SplitCardPart(const QString &_name,
 
 const QRegularExpression OracleImporter::formatRegex = QRegularExpression("^format-");
 
-OracleImporter::OracleImporter(const QString &_dataDir, QObject *parent) : CardDatabase(parent), dataDir(_dataDir)
+OracleImporter::OracleImporter(const QString &_dataDir, QObject *parent) : QObject(parent), dataDir(_dataDir)
 {
 }
 
@@ -494,6 +494,7 @@ bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUr
 
 void OracleImporter::clear()
 {
-    CardDatabase::clear();
+    sets.clear();
+    cards.clear();
     allSets.clear();
 }
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 1231d1a81..b50c56d50 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -4,7 +4,7 @@
 #include <QMap>
 #include <QRegularExpression>
 #include <QVariant>
-#include <game/cards/card_database.h>
+#include <game/cards/card_info.h>
 #include <utility>
 
 // many users prefer not to see these sets with non english arts
@@ -117,13 +117,24 @@ private:
     CardInfoPerSet setInfo;
 };
 
-class OracleImporter : public CardDatabase
+class OracleImporter : public QObject
 {
     Q_OBJECT
 private:
     const QStringList mainCardTypes = {"Planeswalker", "Creature", "Land",       "Sorcery",
                                        "Instant",      "Artifact", "Enchantment"};
     static const QRegularExpression formatRegex;
+
+    /**
+     * The cards, indexed by name.
+     */
+    CardNameMap cards;
+
+    /**
+     * The sets, indexed by short name.
+     */
+    SetNameMap sets;
+
     QList<SetToDownload> allSets;
     QVariantMap setsMap;
     QString dataDir;
@@ -146,6 +157,10 @@ public:
     int startImport();
     bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion);
     int importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cards);
+    const CardNameMap &getCardList() const
+    {
+        return cards;
+    }
     QList<SetToDownload> &getSets()
     {
         return allSets;