external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

more robust and reliable method to check for card images

Browse Source 
The getImagefile will be invoked since this method will also account for any difference in `full` and `fullborder` naming for card images.
In particular, it will try everything possible before giving up and assume the card has no image.
This is **crucial** for cardDB card retrieval, as well as determines the boolean value returned by PaperCard.hasImage method/property
This commit is contained in:
leriomaggio
2021-07-24 10:51:26 +01:00
parent 4c001b9462
commit ec89ff755b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-core/src/main/java/forge/ImageKeys.java
View File

@@ -1,15 +1,14 @@
package forge; package forge;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.util.FileUtil; import forge.util.FileUtil;
import forge.util.ImageUtil; import forge.util.ImageUtil;
import forge.util.TextUtil; import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
public final class ImageKeys { public final class ImageKeys {
public static final String CARD_PREFIX = "c:"; public static final String CARD_PREFIX = "c:";
@@ -216,6 +215,6 @@ public final class ImageKeys {
editionImageLookup.put(pc.getEdition(), editionHasImage); editionImageLookup.put(pc.getEdition(), editionHasImage);
} }
//avoid checking for file if edition doesn't have any images //avoid checking for file if edition doesn't have any images
return editionHasImage && findFile(CACHE_CARD_PICS_DIR, ImageUtil.getImageKey(pc, false, true)) != null; return editionHasImage && getImageFile(ImageUtil.getImageKey(pc, false, true)) != null;
} }
} }