From d60ee9307d7d280d5a9f6e2da8a18f6db242d828 Mon Sep 17 00:00:00 2001
From: Chris H <zenchristo@gmail.com>
Date: Mon, 8 Jan 2018 21:16:26 -0500
Subject: [PATCH] Grab LQ picture from primary server

---
 .../src/main/java/forge/card/CardRules.java   |  4 +++
 .../src/main/java/forge/util/ImageUtil.java   | 31 -------------------
 .../forge/download/GuiDownloadPicturesLQ.java | 16 +++++-----
 3 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java
index 0837697d1eb..61bb1a29dc2 100644
--- a/forge-core/src/main/java/forge/card/CardRules.java
+++ b/forge-core/src/main/java/forge/card/CardRules.java
@@ -231,7 +231,11 @@ public final class CardRules implements ICardCharacteristics {
     // Downloadable image
     private String dlUrl;
     private String dlUrlOtherSide;
+
+    @Deprecated
     public String getPictureUrl(boolean backface ) { return backface ? dlUrlOtherSide : dlUrl; }
+
+    @Deprecated
     public void setDlUrls(String[] dlUrls) { this.dlUrl = dlUrls[0]; this.dlUrlOtherSide = dlUrls[1]; }
 
     public ColorSet getColorIdentity() {
diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 29ddd5a9c06..8dbbe9c6186 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -118,37 +118,6 @@ public class ImageUtil {
     public static String getDownloadUrl(PaperCard cp, boolean backFace) {
         return getImageRelativePath(cp, backFace, true, true);
     }
-    
-    public static String[] getDownloadUrlAndDestination(String cacheCardPicsDir, PaperCard c, boolean backFace) {
-        final CardRules cardRules = c.getRules();
-        final String urls = cardRules.getPictureUrl(backFace);
-        if (StringUtils.isEmpty(urls)) {
-            return null;
-        }
-
-        String filename = ImageUtil.getImageKey(c, backFace, false);
-        final File destFile = new File(cacheCardPicsDir, filename + ".jpg");
-        if (destFile.exists()) {
-            return null;
-        }
-
-        filename = destFile.getAbsolutePath();
-
-        final String urlToDownload;
-        int urlIndex = 0;
-        int allUrlsLen = 1;
-        if (!urls.contains("\\")) {
-            urlToDownload = urls;
-        } else {
-            final String[] allUrls = urls.split("\\\\");
-            allUrlsLen = allUrls.length;
-            urlIndex = (c.getArtIndex()-1) % allUrlsLen;
-            urlToDownload = allUrls[urlIndex];
-        }
-        // System.out.println(c.getName() + "|" + c.getEdition() + " - " + c.getArtIndex() + " -> " + urlIndex + "/" + allUrlsLen + " === " + filename + " <<< " + urlToDownload);
-
-        return new String[] { urlToDownload, filename };
-    }
 
     public static String toMWSFilename(String in) {
         final StringBuilder out = new StringBuilder();
diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
index 6707f6251c4..6861b10e402 100644
--- a/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
+++ b/forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
@@ -22,6 +22,7 @@ import forge.model.FModel;
 import forge.properties.ForgeConstants;
 import forge.util.ImageUtil;
 
+import java.io.File;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -53,15 +54,16 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
     }
 
     private static void addDLObject(final PaperCard c, final Map<String, String> downloads, final boolean backFace) {
-        String[] result = ImageUtil.getDownloadUrlAndDestination(ForgeConstants.CACHE_CARD_PICS_DIR, c, backFace);
-        if (result == null) {
-            return;
-        }
-        final String urlToDownload = result[0];
-        final String destPath = result[1];
+        final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + ImageUtil.getImageKey(c, backFace, false);
         if (downloads.containsKey(destPath)) {
             return;
         }
-        downloads.put(destPath, urlToDownload);
+
+        File destFile = new File(destPath);
+        if (destFile.exists()) {
+            return;
+        }
+
+        downloads.put(destPath, ForgeConstants.URL_PIC_DOWNLOAD + ImageUtil.getDownloadUrl(c, backFace));
     }
 }