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

Merge branch 'newBranch' into 'master'

Browse Source 
Update LQ Downloader

See merge request core-developers/forge!2297
This commit is contained in:
Michael Kamensky
2019-11-24 04:35:01 +00:00
parent 560f8ac14a 1dc8fed6e8
commit 2fb2b64d33
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java
View File

@@ -22,6 +22,7 @@ import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.util.ImageUtil; import forge.util.ImageUtil;
import forge.util.TextUtil;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
@@ -62,6 +63,13 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
private void addDLObject(final PaperCard c, final boolean backFace) { private void addDLObject(final PaperCard c, final boolean backFace) {
final String imageKey = ImageUtil.getImageKey(c, backFace, false); final String imageKey = ImageUtil.getImageKey(c, backFace, false);
final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg"; final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey + ".jpg";
final String setcode2 = StaticData.instance().getEditions().getCode2ByCode(c.getEdition());
final String fullborderPath = ForgeConstants.CACHE_CARD_PICS_DIR + setcode2 + "\\" + TextUtil.fastReplace(imageKey,".full",".fullborder") + ".jpg";
final File existingFB = new File (fullborderPath);
if (existingFB.exists()) {
return; //don't download equivalent full image with an existing fullborder image
}
if (existingImages.contains(imageKey + ".jpg")) { if (existingImages.contains(imageKey + ".jpg")) {
return; return;

7
forge-gui/src/main/java/forge/download/GuiDownloadSetPicturesLQ.java
View File

@@ -24,6 +24,7 @@ import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.util.ImageUtil; import forge.util.ImageUtil;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.File; import java.io.File;
@@ -83,6 +84,12 @@ public class GuiDownloadSetPicturesLQ extends GuiDownloadService {
private static void addDLObject(final String urlPath, final String filename, final Map<String, String> downloads) { 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"); 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");
if (fullborder.exists())
return; //don't add on download if you have an existing fullborder image in this set...
// System.out.println(filename); // System.out.println(filename);
if (!destFile.exists()) { if (!destFile.exists()) {
downloads.put(destFile.getAbsolutePath(), ForgeConstants.URL_PIC_DOWNLOAD + urlPath); downloads.put(destFile.getAbsolutePath(), ForgeConstants.URL_PIC_DOWNLOAD + urlPath);