Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

images: added support of meld cards, fixed #11778 (#12083)

Browse source
This commit is contained in:
Susucre 2024-04-08 21:57:13 +02:00 • committed by GitHub
parent 9ea9621acd
commit a69583dbfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSource.java
View file

@ -96,6 +96,7 @@ public enum ScryfallImageSource implements CardImageSource {
}
// double faced cards (modal double faces cards too)
// meld cards are excluded.
if (card.isSecondSide()) {
// back face - must be prepared before
logger.warn("Can't find back face info in prepared list "

54
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
View file

@ -11,7 +11,6 @@ import mage.client.dialog.DownloadImagesDialog;
import mage.client.dialog.PreferencesDialog;
import mage.client.util.CardLanguage;
import mage.client.util.GUISizeHelper;
import mage.client.util.ImageCaches;
import mage.client.util.sets.ConstructedFormats;
import mage.remote.Connection;
import net.java.truevfs.access.TFile;
@ -22,6 +21,7 @@ import org.apache.log4j.Logger;
import org.mage.plugins.card.dl.DownloadServiceInfo;
import org.mage.plugins.card.dl.sources.*;
import org.mage.plugins.card.utils.CardImageUtils;
import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
import javax.swing.*;
import java.awt.*;
@ -36,8 +36,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
/**
* @author JayDi85
*/
@ -221,7 +219,9 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
this.cardsDownloadQueue.clear();
updateGlobalMessage("Loading cards list...");
this.cardsAll = Collections.synchronizedList(CardRepository.instance.findCards(new CardCriteria()));
this.cardsAll = Collections.synchronizedList(CardRepository.instance.findCards(
new CardCriteria().nightCard(null) // meld cards need to be in the target cards, so we allow for night cards
));
updateGlobalMessage("Finding missing images...");
this.cardsMissing = prepareMissingCards(this.cardsAll, uiDialog.getRedownloadCheckbox().isSelected());
@ -438,25 +438,26 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
if (!card.getCardNumber().isEmpty()
&& !"0".equals(card.getCardNumber())
&& !card.getSetCode().isEmpty()) {
String cardName = card.getName();
CardDownloadData url = new CardDownloadData(
cardName,
card.getSetCode(),
card.getCardNumber(),
card.usesVariousArt(),
0);
url.setSecondSide(card.isNightCard());
// variations must have diff file names with additional postfix
if (url.getUsesVariousArt()) {
url.setDownloadName(createDownloadName(card));
// main side for non-night cards.
// At the exception of Meld Card, as they are not the back of an image for download
if (!card.isNightCard() || card.isMeldCard()) {
String cardName = card.getName();
CardDownloadData url = new CardDownloadData(
cardName,
card.getSetCode(),
card.getCardNumber(),
card.usesVariousArt(),
0);
// variations must have diff file names with additional postfix
if (url.getUsesVariousArt()) {
url.setDownloadName(createDownloadName(card));
}
url.setSplitCard(card.isSplitCard());
allCardsUrls.add(url);
}
url.setSplitCard(card.isSplitCard());
// main side
allCardsUrls.add(url);
// second side
// xmage doesn't search night cards by default, so add it and other types manually
if (card.isDoubleFaced()) {
@ -466,10 +467,10 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
CardInfo secondSideCard = CardRepository.instance.findCardWithPreferredSetAndNumber(card.getSecondSideName(), card.getSetCode(), card.getCardNumber());
if (secondSideCard == null) {
throw new IllegalStateException("Can''t find second side card in database: " + card.getSecondSideName());
throw new IllegalStateException("Can't find second side card in database: " + card.getSecondSideName());
}
url = new CardDownloadData(
CardDownloadData url = new CardDownloadData(
card.getSecondSideName(),
card.getSetCode(),
secondSideCard.getCardNumber(),
@ -491,7 +492,8 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
0
);
cardDownloadData.setFlippedSide(true);
cardDownloadData.setSecondSide(card.isNightCard());
// meld cards urls are on their own
cardDownloadData.setSecondSide(card.isNightCard() && !card.isMeldCard());
allCardsUrls.add(cardDownloadData);
}
if (card.getMeldsToCardName() != null) {
@ -501,11 +503,11 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
CardInfo meldsToCard = CardRepository.instance.findCardWithPreferredSetAndNumber(card.getMeldsToCardName(), card.getSetCode(), card.getCardNumber());
if (meldsToCard == null) {
throw new IllegalStateException("Can''t find meldsToCard in database: " + card.getMeldsToCardName());
throw new IllegalStateException("Can't find meldsToCard in database: " + card.getMeldsToCardName());
}
// meld cards are normal cards from the set, so no needs to set two faces/sides here
url = new CardDownloadData(
CardDownloadData url = new CardDownloadData(
card.getMeldsToCardName(),
card.getSetCode(),
meldsToCard.getCardNumber(),

13
Mage/src/main/java/mage/cards/repository/CardCriteria.java
View file

@ -32,7 +32,7 @@ public class CardCriteria {
private Boolean variousArt;
private Boolean doubleFaced;
private Boolean modalDoubleFaced;
private boolean nightCard;
private Boolean nightCard;
private boolean black;
private boolean blue;
private boolean green;
@ -114,7 +114,7 @@ public class CardCriteria {
return this;
}
public CardCriteria nightCard(boolean nightCard) {
public CardCriteria nightCard(Boolean nightCard) {
this.nightCard = nightCard;
return this;
}
@ -217,9 +217,14 @@ public class CardCriteria {
optimize();
Where where = qb.where();
where.eq("nightCard", nightCard);
int clausesCount = 0;
if (nightCard != null) {
where.eq("nightCard", nightCard);
clausesCount++;
}
where.eq("splitCardHalf", false);
int clausesCount = 2;
clausesCount++;
if (nameContains != null) {
where.like("name", new SelectArg('%' + nameContains + '%'));
clausesCount++;

7
Mage/src/main/java/mage/cards/repository/CardInfo.java
View file

@ -100,6 +100,8 @@ public class CardInfo {
@DatabaseField(indexName = "nightCard_index")
protected boolean nightCard;
@DatabaseField
protected boolean meldCard;
@DatabaseField
protected String flipCardName;
@DatabaseField
protected String secondSideName;
@ -149,6 +151,7 @@ public class CardInfo {
this.doubleFaced = card.isTransformable() && card.getSecondCardFace() != null;
this.nightCard = card.isNightCard();
this.meldCard = card instanceof MeldCard;
Card secondSide = card.getSecondCardFace();
if (secondSide != null) {
this.secondSideName = secondSide.getName();
@ -458,6 +461,10 @@ public class CardInfo {
return nightCard;
}
public boolean isMeldCard() {
return meldCard;
}
public String getSecondSideName() {
return secondSideName;
}