From 2f10634ca2478521f02a85dc4bc4cfe010940077 Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Fri, 6 Mar 2026 11:48:17 -0800
Subject: [PATCH] [DeckList] Fix double-faced cards not importing correctly
 (#6665)

* [DeckList] Fix double-faced cards not importing correctly

* make tests compile
---
 .../card/import/card_name_normalizer.cpp      | 21 +++++++++++++++++++
 tests/loading_from_clipboard/CMakeLists.txt   |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
index 2349dc3e8..91ebd6647 100644
--- a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
+++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
@@ -1,7 +1,25 @@
 #include "card_name_normalizer.h"
 
+#include "../database/card_database_manager.h"
+#include "../printing/exact_card.h"
+
 #include <QRegularExpression>
 
+/**
+ * @brief Resolves the complete display name of a card.
+ * @param cardName Base name.
+ * @return Full display name, or the cardName unchanged if a display name is not found.
+ */
+static QString getCompleteCardName(const QString &cardName)
+{
+    ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
+    if (temp) {
+        return temp.getName();
+    }
+
+    return cardName;
+}
+
 QString CardNameNormalizer::operator()(const QString &cardNameString) const
 {
     QString cardName = cardNameString;
@@ -41,5 +59,8 @@ QString CardNameNormalizer::operator()(const QString &cardNameString) const
         cardName.replace(diff.key(), diff.value());
     }
 
+    // Resolve complete card name
+    cardName = getCompleteCardName(cardName);
+
     return cardName;
 }
\ No newline at end of file
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index eecaafcbb..85133a8e8 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
-add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
+add_executable(loading_from_clipboard_test ${VERSION_STRING_CPP} clipboard_testing.cpp loading_from_clipboard_test.cpp)
 
 if(NOT GTEST_FOUND)
   add_dependencies(loading_from_clipboard_test gtest)