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

Image fetcher: Don't download card images that are already present.

Browse Source 
Fixes a bug where a card's image will be repeatedly downloaded when ImageCache would return for a reason other than the image not being present, such as when requesting a very small image. That happened in practice during the drawing a card animation, where the card is scaled during the animation.
This commit is contained in:
asvitkine
2022-11-02 14:01:17 -04:00
parent 95d9c80508
commit 061a24a88c
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/CachedCardImage.java
View File

@@ -21,12 +21,15 @@ public abstract class CachedCardImage implements ImageFetcher.Callback {
this.viewers = viewers; this.viewers = viewers;
this.width = width; this.width = width;
this.height = height; this.height = height;
if (ImageCache.isSupportedImageSize(width, height)) {
BufferedImage image = ImageCache.getImageNoDefault(card, viewers, width, height); BufferedImage image = ImageCache.getImageNoDefault(card, viewers, width, height);
if (image == null) { if (image == null) {
String key = card.getCurrentState().getImageKey(viewers); String key = card.getCurrentState().getImageKey(viewers);
System.err.println("Fetch due to missing key: " + key + " for " + card);
fetcher.fetchImage(key, this); fetcher.fetchImage(key, this);
} }
} }
}
public BufferedImage getImage() { public BufferedImage getImage() {
return ImageCache.getImage(card, viewers, width, height); return ImageCache.getImage(card, viewers, width, height);

12
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -48,7 +48,6 @@ import forge.gui.FThreads;
import forge.gui.GuiBase; import forge.gui.GuiBase;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants; import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.properties.ForgePreferences; import forge.localinstance.properties.ForgePreferences;
import forge.localinstance.properties.ForgePreferences.FPref; import forge.localinstance.properties.ForgePreferences.FPref;
@@ -227,7 +226,7 @@ public class ImageCache {
if (useArtCrop) { if (useArtCrop) {
if (ipc != null && ipc.getRules().getSplitType() == CardSplitType.Flip) { if (ipc != null && ipc.getRules().getSplitType() == CardSplitType.Flip) {
// Art crop will always use front face as image key for flip cards // Art crop will always use front face as image key for flip cards
imageKey = ((PaperCard) ipc).getCardImageKey(); imageKey = ipc.getCardImageKey();
} }
imageKey = TextUtil.fastReplace(imageKey, ".full", ".artcrop"); imageKey = TextUtil.fastReplace(imageKey, ".full", ".artcrop");
} }
@@ -330,9 +329,13 @@ public class ImageCache {
setCode.equals("6E") || setCode.equals("7E") || setCode.equals("8E") || setCode.equals("9E"); setCode.equals("6E") || setCode.equals("7E") || setCode.equals("8E") || setCode.equals("9E");
} }
public static boolean isSupportedImageSize(final int width, final int height) {
return !((3 > width && -1 != width) || (3 > height && -1 != height));
}
// cardView is for Emblem, since there is no paper card for them // cardView is for Emblem, since there is no paper card for them
public static BufferedImage scaleImage(String key, final int width, final int height, boolean useDefaultImage, CardView cardView) { public static BufferedImage scaleImage(String key, final int width, final int height, boolean useDefaultImage, CardView cardView) {
if (StringUtils.isEmpty(key) || (3 > width && -1 != width) || (3 > height && -1 != height)) { if (StringUtils.isEmpty(key) || !isSupportedImageSize(width, height)) {
// picture too small or key not defined; return a blank // picture too small or key not defined; return a blank
return null; return null;
} }
@@ -347,7 +350,8 @@ public class ImageCache {
Pair<BufferedImage, Boolean> orgImgs = getOriginalImageInternal(key, useDefaultImage, cardView); Pair<BufferedImage, Boolean> orgImgs = getOriginalImageInternal(key, useDefaultImage, cardView);
BufferedImage original = orgImgs.getLeft(); BufferedImage original = orgImgs.getLeft();
boolean isPlaceholder = orgImgs.getRight(); boolean isPlaceholder = orgImgs.getRight();
if (original == null) { return null; } if (original == null) { System.err.println("Null2");
return null; }
if (original == _defaultImage) { if (original == _defaultImage) {
// Don't put the default image in the cache under the key for the card. // Don't put the default image in the cache under the key for the card.