From 061a24a88cfec0cf239a218d5cc782d4f0136365 Mon Sep 17 00:00:00 2001
From: asvitkine <alexei.svitkine@gmail.com>
Date: Wed, 2 Nov 2022 14:01:17 -0400
Subject: [PATCH] Image fetcher: Don't download card images that are already
 present.

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.
---
 .../src/main/java/forge/CachedCardImage.java         | 11 +++++++----
 .../src/main/java/forge/ImageCache.java              | 12 ++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/CachedCardImage.java b/forge-gui-desktop/src/main/java/forge/CachedCardImage.java
index 67c57a1d1bd..9ef873044ec 100644
--- a/forge-gui-desktop/src/main/java/forge/CachedCardImage.java
+++ b/forge-gui-desktop/src/main/java/forge/CachedCardImage.java
@@ -21,10 +21,13 @@ public abstract class CachedCardImage implements ImageFetcher.Callback {
         this.viewers = viewers;
         this.width = width;
         this.height = height;
-        BufferedImage image = ImageCache.getImageNoDefault(card, viewers, width, height);
-        if (image == null) {
-            String key = card.getCurrentState().getImageKey(viewers);
-            fetcher.fetchImage(key, this);
+        if (ImageCache.isSupportedImageSize(width, height)) {
+            BufferedImage image = ImageCache.getImageNoDefault(card, viewers, width, height);
+            if (image == null) {
+                String key = card.getCurrentState().getImageKey(viewers);
+                System.err.println("Fetch due to missing key: " + key + " for " + card);
+                fetcher.fetchImage(key, this);
+            }
         }
     }
 
diff --git a/forge-gui-desktop/src/main/java/forge/ImageCache.java b/forge-gui-desktop/src/main/java/forge/ImageCache.java
index c9e83c0fc28..3c8872f0f60 100644
--- a/forge-gui-desktop/src/main/java/forge/ImageCache.java
+++ b/forge-gui-desktop/src/main/java/forge/ImageCache.java
@@ -48,7 +48,6 @@ import forge.gui.FThreads;
 import forge.gui.GuiBase;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
-import forge.item.PaperCard;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.ForgePreferences;
 import forge.localinstance.properties.ForgePreferences.FPref;
@@ -227,7 +226,7 @@ public class ImageCache {
         if (useArtCrop) {
             if (ipc != null && ipc.getRules().getSplitType() == CardSplitType.Flip) {
                 // 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");
         }
@@ -330,9 +329,13 @@ public class ImageCache {
             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
     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
             return null;
         }
@@ -347,7 +350,8 @@ public class ImageCache {
         Pair<BufferedImage, Boolean> orgImgs = getOriginalImageInternal(key, useDefaultImage, cardView);
         BufferedImage original = orgImgs.getLeft();
         boolean isPlaceholder = orgImgs.getRight();
-        if (original == null) { return null; }
+        if (original == null) {             System.err.println("Null2");
+            return null; }
 
         if (original == _defaultImage) {
             // Don't put the default image in the cache under the key for the card.