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

[DeckList] Fix double-faced cards not importing correctly (#6665)

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

* make tests compile
This commit is contained in:
RickyRister 2026-03-06 11:48:17 -08:00 • committed by GitHub
parent dead993639
commit 2f10634ca2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
View file

@ -1,7 +1,25 @@
#include "card_name_normalizer.h" #include "card_name_normalizer.h"
#include "../database/card_database_manager.h"
#include "../printing/exact_card.h"
#include <QRegularExpression> #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 CardNameNormalizer::operator()(const QString &cardNameString) const
{ {
QString cardName = cardNameString; QString cardName = cardNameString;
@ -41,5 +59,8 @@ QString CardNameNormalizer::operator()(const QString &cardNameString) const
cardName.replace(diff.key(), diff.value()); cardName.replace(diff.key(), diff.value());
} }
// Resolve complete card name
cardName = getCompleteCardName(cardName);
return cardName; return cardName;
} }

2
tests/loading_from_clipboard/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") 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) if(NOT GTEST_FOUND)
add_dependencies(loading_from_clipboard_test gtest) add_dependencies(loading_from_clipboard_test gtest)