github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added support for importing double-faced cards in the deck-editor.

Browse source
This commit is contained in:
Alex Vasile 2022-01-29 19:39:11 -05:00
parent 8688cacd46
commit 6647c36f07
1 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -442,7 +442,6 @@ public enum CardRepository {
cards = findCards(name); cards = findCards(name);
} }
if (!cards.isEmpty()) { if (!cards.isEmpty()) {
CardInfo cardToUse = null;
for (CardInfo cardinfo : cards) { for (CardInfo cardinfo : cards) {
if (cardinfo.getSetCode() != null && expansion != null && expansion.equalsIgnoreCase(cardinfo.getSetCode())) { if (cardinfo.getSetCode() != null && expansion != null && expansion.equalsIgnoreCase(cardinfo.getSetCode())) {
return cardinfo; return cardinfo;
@ -470,9 +469,25 @@ public enum CardRepository {
if (limitByMaxAmount > 0) { if (limitByMaxAmount > 0) {
queryBuilder.limit(limitByMaxAmount); queryBuilder.limit(limitByMaxAmount);
} }
return cardDao.query(queryBuilder.prepare());
List<CardInfo> result = cardDao.query(queryBuilder.prepare());
// Got no results, could be because the name referred to a double-face cards (e.g. Malakir Rebirth // Malakir Mire)
if (result.isEmpty() && name.contains(" // ")) {
// If there IS a " // " then the card could be either a double-face card (e.g. Malakir Rebirth // Malakir Mire)
// OR a split card (e.g. Assault // Battery).
// Since you can't tell based on the name, we split the text based on " // " and try the operation again with
// the string on the left side of " // " (double-faced cards are stored under the name on the left of the " // ").
queryBuilder.where().eq("name", new SelectArg(name.split(" // ", 2)[0]));
result = cardDao.query(queryBuilder.prepare());
}
return result;
} catch (SQLException ex) { } catch (SQLException ex) {
Logger.getLogger(CardRepository.class).error("Error during execution of raw sql statement", ex);
} }
return Collections.emptyList(); return Collections.emptyList();
} }
@ -482,6 +497,7 @@ public enum CardRepository {
queryBuilder.where().eq("className", new SelectArg(canonicalClassName)); queryBuilder.where().eq("className", new SelectArg(canonicalClassName));
return cardDao.query(queryBuilder.prepare()); return cardDao.query(queryBuilder.prepare());
} catch (SQLException ex) { } catch (SQLException ex) {
Logger.getLogger(CardRepository.class).error("Error during execution of raw sql statement", ex);
} }
return Collections.emptyList(); return Collections.emptyList();
} }
@ -492,14 +508,29 @@ public enum CardRepository {
GenericRawResults<CardInfo> rawResults = cardDao.queryRaw( GenericRawResults<CardInfo> rawResults = cardDao.queryRaw(
"select * from " + CardRepository.VERSION_ENTITY_NAME + " where lower_name = '" + sqlName + '\'', "select * from " + CardRepository.VERSION_ENTITY_NAME + " where lower_name = '" + sqlName + '\'',
cardDao.getRawRowMapper()); cardDao.getRawRowMapper());
List<CardInfo> result = new ArrayList<>();
for (CardInfo cardinfo : rawResults) { List<CardInfo> result = rawResults.getResults();
result.add(cardinfo);
// Got no results, could be because the name referred to a double-face cards (e.g. Malakir Rebirth // Malakir Mire)
if (result.isEmpty() && sqlName.contains(" // ")) {
// If there IS a " // " then the card could be either a double-face card (e.g. Malakir Rebirth // Malakir Mire)
// OR a split card (e.g. Assault // Battery).
// Since you can't tell based on the name, we split the text based on " // " and try the operation again with
// the string on the left side of " // " (double-faced cards are stored under the name on the left of the " // ").
String leftCardName = sqlName.split(" // ", 2)[0];
GenericRawResults<CardInfo> rawResults2 = cardDao.queryRaw(
"select * from " + CardRepository.VERSION_ENTITY_NAME + " where lower_name = '" + leftCardName + '\'',
cardDao.getRawRowMapper());
result = rawResults2.getResults();
} }
return result; return result;
} catch (SQLException ex) { } catch (SQLException ex) {
Logger.getLogger(CardRepository.class).error("Error during execution of raw sql statement", ex); Logger.getLogger(CardRepository.class).error("Error during execution of raw sql statement", ex);
} }
return Collections.emptyList(); return Collections.emptyList();
} }