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

Check for existing images in a single IO request.

Browse Source
This commit is contained in:
Chris H
2018-01-14 17:49:46 -05:00
parent d646240c63
commit 43455723f6
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,8 @@ import forge.properties.ForgeConstants;
import forge.util.ImageUtil; import forge.util.ImageUtil;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@@ -36,15 +38,18 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
protected final Map<String, String> getNeededFiles() { protected final Map<String, String> getNeededFiles() {
final Map<String, String> downloads = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); final Map<String, String> downloads = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
File f = new File(ForgeConstants.CACHE_CARD_PICS_DIR);
ArrayList<String> existingImages = new ArrayList<String>(Arrays.asList(f.list()));
for (final PaperCard c : FModel.getMagicDb().getCommonCards().getAllCards()) { for (final PaperCard c : FModel.getMagicDb().getCommonCards().getAllCards()) {
addDLObject(c, downloads, false); addDLObject(c, downloads, false, existingImages);
if (ImageUtil.hasBackFacePicture(c)) { if (ImageUtil.hasBackFacePicture(c)) {
addDLObject(c, downloads, true); addDLObject(c, downloads, true, existingImages);
} }
} }
for (final PaperCard c : FModel.getMagicDb().getVariantCards().getAllCards()) { for (final PaperCard c : FModel.getMagicDb().getVariantCards().getAllCards()) {
addDLObject(c, downloads, false); addDLObject(c, downloads, false, existingImages);
} }
// Add missing tokens to the list of things to download. // Add missing tokens to the list of things to download.
@@ -53,14 +58,15 @@ public class GuiDownloadPicturesLQ extends GuiDownloadService {
return downloads; return downloads;
} }
private static void addDLObject(final PaperCard c, final Map<String, String> downloads, final boolean backFace) { private static void addDLObject(final PaperCard c, final Map<String, String> downloads, final boolean backFace, ArrayList<String> existingImages) {
final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + ImageUtil.getImageKey(c, backFace, false); final String imageKey = ImageUtil.getImageKey(c, backFace, false);
if (downloads.containsKey(destPath)) { final String destPath = ForgeConstants.CACHE_CARD_PICS_DIR + imageKey;
if (existingImages.contains(imageKey)) {
return; return;
} }
File destFile = new File(destPath); if (downloads.containsKey(destPath)) {
if (destFile.exists()) {
return; return;
} }