Helper to query deckList for DecklistCardNodes. (#6242)

* Helper to query deckList for DecklistCardNodes.

Took 30 minutes

Took 6 minutes

Took 2 minutes

* Fix unused.

Took 3 minutes


Took 1 minute

* Convert string to string list.

Took 2 minutes

* Adjust to rebase.

Took 2 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp

@@ -78,14 +78,9 @@ void ManaBaseWidget::updateDisplay()
 QHash<QString, int> ManaBaseWidget::analyzeManaBase()
 {
     manaBaseMap.clear();
-    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = deckListModel->getDeckList()->getCardNodes();
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
 
+    for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
             if (info) {
@@ -94,7 +89,6 @@ QHash<QString, int> ManaBaseWidget::analyzeManaBase()
             }
         }
     }
-    }
 
     updateDisplay();
     return manaBaseMap;

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp

@@ -44,14 +44,10 @@ void ManaCurveWidget::setDeckModel(DeckListModel *deckModel)
 std::unordered_map<int, int> ManaCurveWidget::analyzeManaCurve()
 {
     manaCurveMap.clear();
-    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
 
+    QList<DecklistCardNode *> cardsInDeck = deckListModel->getDeckList()->getCardNodes();
+
+    for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
             if (info) {
@@ -60,7 +56,6 @@ std::unordered_map<int, int> ManaCurveWidget::analyzeManaCurve()
             }
         }
     }
-    }
 
     updateDisplay();
 

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp

@@ -46,14 +46,10 @@ void ManaDevotionWidget::setDeckModel(DeckListModel *deckModel)
 std::unordered_map<char, int> ManaDevotionWidget::analyzeManaDevotion()
 {
     manaDevotionMap.clear();
-    InnerDecklistNode *listRoot = deckListModel->getDeckList()->getRoot();
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
 
+    QList<DecklistCardNode *> cardsInDeck = deckListModel->getDeckList()->getCardNodes();
+
+    for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
             if (info) {
@@ -62,7 +58,6 @@ std::unordered_map<char, int> ManaDevotionWidget::analyzeManaDevotion()
             }
         }
     }
-    }
 
     updateDisplay();
     return manaDevotionMap;

cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp

@@ -285,21 +285,15 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
 
     // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
-    InnerDecklistNode *listRoot = deckModel->getDeckList()->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes();
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
 
+    for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             if (CardDatabaseManager::query()->getCard(currentCard->toCardRef())) {
                 bannerCardSet.insert({currentCard->getName(), currentCard->getCardProviderId()});
             }
         }
     }
-    }
 
     QList<QPair<QString, QString>> pairList = bannerCardSet.values();
 

cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp

@@ -209,20 +209,9 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
     if (!decklist)
         return setCounts;
 
-    InnerDecklistNode *listRoot = decklist->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-    if (!listRoot)
-        return setCounts;
-
-    for (auto *i : *listRoot) {
-        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
-        if (!countCurrentZone)
-            continue;
-
-        for (auto *cardNode : *countCurrentZone) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (!currentCard)
-                continue;
 
+    for (auto currentCard : cardsInDeck) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
         if (!infoPtr)
             continue;
@@ -232,7 +221,7 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
             setCounts[setName]++;
         }
     }
-    }
+
     return setCounts;
 }
 
@@ -263,20 +252,9 @@ void DlgSelectSetForCards::updateCardLists()
     if (!decklist)
         return;
 
-    InnerDecklistNode *listRoot = decklist->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-    if (!listRoot)
-        return;
-
-    for (auto *i : *listRoot) {
-        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
-        if (!countCurrentZone)
-            continue;
-
-        for (auto *cardNode : *countCurrentZone) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (!currentCard)
-                continue;
 
+    for (auto currentCard : cardsInDeck) {
         bool found = false;
         QString foundSetName;
 
@@ -306,7 +284,6 @@ void DlgSelectSetForCards::updateCardLists()
             modifiedCardsFlowWidget->addWidget(picture_widget);
         }
     }
-    }
 }
 
 void DlgSelectSetForCards::dragEnterEvent(QDragEnterEvent *event)
@@ -364,20 +341,9 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
     if (!decklist)
         return setCards;
 
-    InnerDecklistNode *listRoot = decklist->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-    if (!listRoot)
-        return setCards;
-
-    for (auto *i : *listRoot) {
-        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
-        if (!countCurrentZone)
-            continue;
-
-        for (auto *cardNode : *countCurrentZone) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (!currentCard)
-                continue;
 
+    for (auto currentCard : cardsInDeck) {
         CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
         if (!infoPtr)
             continue;
@@ -387,7 +353,7 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
             setCards[it.key()].append(currentCard->getName());
         }
     }
-    }
+
     return setCards;
 }
 

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp

@@ -266,35 +266,16 @@ int CardAmountWidget::countCardsInZone(const QString &deckZone)
         return -1;
     }
 
-    InnerDecklistNode *listRoot = decklist->getRoot();
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
-    if (!listRoot) {
-        return -1;
-    }
 
     int count = 0;
-
+    for (auto currentCard : cardsInDeck) {
-    for (auto *i : *listRoot) {
-        auto *countCurrentZone = dynamic_cast<InnerDecklistNode *>(i);
-        if (!countCurrentZone) {
-            continue;
-        }
-
-        if (countCurrentZone->getName() != deckZone) {
-            continue;
-        }
-
-        for (auto *cardNode : *countCurrentZone) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (!currentCard) {
-                continue;
-            }
-
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             if (currentCard->getCardProviderId() == rootCard.getPrinting().getProperty("uuid")) {
                 count++;
             }
         }
     }
-    }
+
     return count;
 }

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp

@@ -67,21 +67,13 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
     DeckList *decklist = deckListModel->getDeckList();
     if (!decklist)
         return;
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return;
 
-    for (int i = 0; i < listRoot->size(); i++) {
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+
-        if (!currentZone)
+    for (auto currentCard : cardsInDeck) {
-            continue;
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
         createNameFilter(currentCard->getName());
     }
-    }
+
     updateFilterModel();
 }
 

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -83,23 +83,11 @@ QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGe
     DeckList *decklist = deckListModel->getDeckList();
     if (!decklist)
         return randomCards;
-    InnerDecklistNode *listRoot = decklist->getRoot();
+
-    if (!listRoot)
+    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
-        return randomCards;
 
     // Collect all cards in the main deck, allowing duplicates based on their count
-    for (int i = 0; i < listRoot->size(); i++) {
+    for (auto currentCard : cardsInDeck) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        if (!currentZone)
-            continue;
-        if (currentZone->getName() != DECK_ZONE_MAIN)
-            continue; // Only process the main deck
-
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
-
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
             if (card) {
@@ -107,7 +95,6 @@ QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGe
             }
         }
     }
-    }
 
     if (mainDeckCards.isEmpty())
         return randomCards;

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp

@@ -232,19 +232,14 @@ void DeckPreviewWidget::updateBannerCardComboBox()
 
     // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
-    InnerDecklistNode *listRoot = deckLoader->getDeckList()->getRoot();
-    for (auto i : *listRoot) {
-        auto *currentZone = dynamic_cast<InnerDecklistNode *>(i);
-        for (auto j : *currentZone) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(j);
-            if (!currentCard)
-                continue;
 
+    QList<DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes();
+
+    for (auto currentCard : cardsInDeck) {
         for (int k = 0; k < currentCard->getNumber(); ++k) {
             bannerCardSet.insert(QPair<QString, QString>(currentCard->getName(), currentCard->getCardProviderId()));
         }
     }
-    }
 
     QList<QPair<QString, QString>> pairList = bannerCardSet.values();
 

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp

@@ -563,6 +563,29 @@ QList<CardRef> DeckList::getCardRefList() const
     return result;
 }
 
+QList<DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZones) const
+{
+    QList<DecklistCardNode *> result;
+
+    for (auto *node : *root) {
+        auto *zoneNode = dynamic_cast<InnerDecklistNode *>(node);
+        if (zoneNode == nullptr) {
+            continue;
+        }
+        if (!restrictToZones.isEmpty() && !restrictToZones.contains(node->getName())) {
+            continue;
+        }
+        for (auto *cardNode : *zoneNode) {
+            auto *cardCardNode = dynamic_cast<DecklistCardNode *>(cardNode);
+            if (cardCardNode != nullptr) {
+                result.append(cardCardNode);
+            }
+        }
+    }
+
+    return result;
+}
+
 int DeckList::getSideboardSize() const
 {
     int size = 0;

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h

@@ -289,6 +289,7 @@ public:
     }
     QStringList getCardList() const;
     QList<CardRef> getCardRefList() const;
+    QList<DecklistCardNode *> getCardNodes(const QStringList &restrictToZones = QStringList()) const;
     int getSideboardSize() const;
     InnerDecklistNode *getRoot() const
     {