Revert "Use scryfall for Download LQ Set Pictures instead of https://…

…downloads.cardforge.org/images/cards/" This reverts commit 0f7d88a.
misha-colbourne · Nov 20, 2024 · 3c94e14 · 3c94e14
1 parent ace3075
commit 3c94e14
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadService.java
@@ -270,7 +270,6 @@ public void run() {
                     if(url.contains("api.scryfall.com")) {
                         conn.setInstanceFollowRedirects(true);
                         TimeUnit.MILLISECONDS.sleep(100);
-                        fullborder = true;
                     } else {
                         conn.setInstanceFollowRedirects(false);
                     }

diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java
@@ -62,23 +62,20 @@ protected final Map<String, String> getNeededFiles() {
                 continue;
             }
 
-//            if (!(existingSets.contains(setCode3) || existingSets.contains(setCode2))) {
-//                // If set doesn't exist on server, don't try to download cards for it
-//                if (!missingSets.contains(setCode3)) {
-//                    missingSets.add(setCode3);
-//                    System.out.println(setCode3 + " not found on server. Ignoring downloads for this set.");
-//                }
-//
-//                continue;
-//            }
-
-            final String setCode = setCode3.toLowerCase();
-            addDLObject(ImageUtil.getScryfallDownloadUrl(c, "", setCode, "", false), ImageUtil.getImageKey(c, "", true), downloads, true);
-//            addDLObject(ImageUtil.getDownloadUrl(c, ""), ImageUtil.getImageKey(c, "", true), downloads);
+            if (!(existingSets.contains(setCode3) || existingSets.contains(setCode2))) {
+                // If set doesn't exist on server, don't try to download cards for it
+                if (!missingSets.contains(setCode3)) {
+                    missingSets.add(setCode3);
+                    System.out.println(setCode3 + " not found on server. Ignoring downloads for this set.");
+                }
+
+                continue;
+            }
+
+            addDLObject(ImageUtil.getDownloadUrl(c, ""), ImageUtil.getImageKey(c, "", true), downloads);
 
             if (c.hasBackFace()) {
-//                addDLObject(ImageUtil.getDownloadUrl(c, "back"), ImageUtil.getImageKey(c, "back", true), downloads);
-                addDLObject(ImageUtil.getScryfallDownloadUrl(c, "back", setCode, "", false), ImageUtil.getImageKey(c, "back", true), downloads, true);
+                addDLObject(ImageUtil.getDownloadUrl(c, "back"), ImageUtil.getImageKey(c, "back", true), downloads);
             }
         }
 
@@ -90,7 +87,7 @@ protected final Map<String, String> getNeededFiles() {
         return downloads;
     }
 
-    private static void addDLObject(final String urlPath, final String filename, final Map<String, String> downloads, final boolean scryfall) {
+    private static void addDLObject(final String urlPath, final String filename, final Map<String, String> downloads) {
         final File destFile = new File(ForgeConstants.CACHE_CARD_PICS_DIR, filename + ".jpg");
         String modifier = !filename.contains(".full") ? ".fullborder" : "";
         final File fullborder = new File(ForgeConstants.CACHE_CARD_PICS_DIR, TextUtil.fastReplace(filename, ".full", ".fullborder") + modifier + ".jpg");
@@ -99,8 +96,7 @@ private static void addDLObject(final String urlPath, final String filename, fin
             return; //don't add on download if you have an existing fullborder image in this set...
 
         if (!destFile.exists()) {
-            String url = scryfall ? ForgeConstants.URL_PIC_SCRYFALL_DOWNLOAD + urlPath : ForgeConstants.URL_PIC_DOWNLOAD + urlPath;
-            downloads.put(destFile.getAbsolutePath(), url);
+            downloads.put(destFile.getAbsolutePath(), ForgeConstants.URL_PIC_DOWNLOAD + urlPath);
         }
     }
 }