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

Removed collector number modulo 1000 hack from ScryfallImageSource.getFaceImageUrl() that was used for double-faced cards in Innistrad.

Browse source
This commit is contained in:
Thomas Hess 2020-03-18 20:18:33 +01:00
parent 95c69efa0e
commit 64e862276f
No known key found for this signature in database
GPG key ID: 98602F47D161B13C
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ public enum ScryfallImageSource implements CardImageSource {
private String getFaceImageUrl(Proxy proxy, CardDownloadData card, boolean isToken, String localizationCode) throws Exception { private String getFaceImageUrl(Proxy proxy, CardDownloadData card, boolean isToken, String localizationCode) throws Exception {
// connect to Scryfall API // connect to Scryfall API
final URL cardUrl = new URL("https://api.scryfall.com/cards/" + formatSetName(card.getSet(), isToken) + "/" final URL cardUrl = new URL("https://api.scryfall.com/cards/" + formatSetName(card.getSet(), isToken) + "/"
+ (card.getCollectorIdAsInt() % 1000) + "/" + localizationCode); + card.getCollectorId() + "/" + localizationCode);
URLConnection request = proxy == null ? cardUrl.openConnection() : cardUrl.openConnection(proxy); URLConnection request = proxy == null ? cardUrl.openConnection() : cardUrl.openConnection(proxy);
request.connect(); request.connect();
@ -136,7 +136,7 @@ public enum ScryfallImageSource implements CardImageSource {
JsonElement root = jp.parse(new InputStreamReader((InputStream) request.getContent())); JsonElement root = jp.parse(new InputStreamReader((InputStream) request.getContent()));
JsonObject jsonCard = root.getAsJsonObject(); JsonObject jsonCard = root.getAsJsonObject();
if (!jsonCard.has("card_faces")) { if (!jsonCard.has("card_faces")) {
throw new Exception("Couldn't find card_faces in Card JSON."); throw new Exception("Couldn't find card_faces in Card JSON.: " + cardUrl.toString());
} }
JsonArray jsonCardFaces = jsonCard.getAsJsonArray("card_faces"); JsonArray jsonCardFaces = jsonCard.getAsJsonArray("card_faces");
JsonObject jsonCardFace = jsonCardFaces.get(card.isSecondSide() ? 1 : 0).getAsJsonObject(); JsonObject jsonCardFace = jsonCardFaces.get(card.isSecondSide() ? 1 : 0).getAsJsonObject();
@ -170,7 +170,8 @@ public enum ScryfallImageSource implements CardImageSource {
try { try {
url = getFaceImageUrl(proxy, card, card.isToken(), localizedCode); url = getFaceImageUrl(proxy, card, card.isToken(), localizedCode);
} catch (Exception e) { } catch (Exception e) {
logger.warn("Failed to prepare image URL (back face) for " + card.getName() + " (" + card.getSet() + ") #" + card.getCollectorId()); logger.warn("Failed to prepare image URL (back face) for " + card.getName() + " (" + card.getSet() + ") #"
+ card.getCollectorId() + ", Error Message: " + e.getMessage());
downloadServiceInfo.incErrorCount(); downloadServiceInfo.incErrorCount();
continue; continue;
} }