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

update booster image list and refine image file searching algorithm

Browse Source
This commit is contained in:
myk
2013-03-08 10:24:17 +00:00
parent c1bf5c18b1
commit 86110ccf5a
2 changed files with 96 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
res/quest/booster-images.txt
View File

@@ -1,76 +1,81 @@
http://www.cardforge.org/fpics/products/boosters/2ED.jpg http://www.cardforge.org/fpics/products/boosters/2ED.png
http://www.cardforge.org/fpics/products/boosters/3ED.jpg http://www.cardforge.org/fpics/products/boosters/3ED.png
http://www.cardforge.org/fpics/products/boosters/4ED.jpg http://www.cardforge.org/fpics/products/boosters/4ED.png
http://www.cardforge.org/fpics/products/boosters/5DN.jpg http://www.cardforge.org/fpics/products/boosters/5DN.png
http://www.cardforge.org/fpics/products/boosters/5ED.jpg http://www.cardforge.org/fpics/products/boosters/5ED.png
http://www.cardforge.org/fpics/products/boosters/6ED.jpg http://www.cardforge.org/fpics/products/boosters/6ED.png
http://www.cardforge.org/fpics/products/boosters/7ED.jpg http://www.cardforge.org/fpics/products/boosters/7E.png
http://www.cardforge.org/fpics/products/boosters/8ED.jpg http://www.cardforge.org/fpics/products/boosters/8ED.png
http://www.cardforge.org/fpics/products/boosters/9ED.jpg http://www.cardforge.org/fpics/products/boosters/9ED.png
http://www.cardforge.org/fpics/products/boosters/10E.jpg http://www.cardforge.org/fpics/products/boosters/10E.png
http://www.cardforge.org/fpics/products/boosters/ALA.jpg http://www.cardforge.org/fpics/products/boosters/ALA.png
http://www.cardforge.org/fpics/products/boosters/ALL.jpg http://www.cardforge.org/fpics/products/boosters/ALL.png
http://www.cardforge.org/fpics/products/boosters/APC.jpg http://www.cardforge.org/fpics/products/boosters/AP.png
http://www.cardforge.org/fpics/products/boosters/ARB.jpg http://www.cardforge.org/fpics/products/boosters/ARB.png
http://www.cardforge.org/fpics/products/boosters/ARN.jpg http://www.cardforge.org/fpics/products/boosters/ARN.png
http://www.cardforge.org/fpics/products/boosters/ATQ.jpg http://www.cardforge.org/fpics/products/boosters/ATQ.png
http://www.cardforge.org/fpics/products/boosters/BOK.jpg http://www.cardforge.org/fpics/products/boosters/AVR.png
http://www.cardforge.org/fpics/products/boosters/CFX.jpg http://www.cardforge.org/fpics/products/boosters/BOK.png
http://www.cardforge.org/fpics/products/boosters/CHK.jpg http://www.cardforge.org/fpics/products/boosters/CFX.png
http://www.cardforge.org/fpics/products/boosters/CHR.jpg http://www.cardforge.org/fpics/products/boosters/CHK.png
http://www.cardforge.org/fpics/products/boosters/CSP.jpg http://www.cardforge.org/fpics/products/boosters/CHR.png
http://www.cardforge.org/fpics/products/boosters/DIS.jpg http://www.cardforge.org/fpics/products/boosters/CSP.png
http://www.cardforge.org/fpics/products/boosters/DKA.jpg http://www.cardforge.org/fpics/products/boosters/DIS.png
http://www.cardforge.org/fpics/products/boosters/DRK.jpg http://www.cardforge.org/fpics/products/boosters/DKA.png
http://www.cardforge.org/fpics/products/boosters/DST.jpg http://www.cardforge.org/fpics/products/boosters/DPA.png
http://www.cardforge.org/fpics/products/boosters/EVE.jpg http://www.cardforge.org/fpics/products/boosters/DRK.png
http://www.cardforge.org/fpics/products/boosters/EXO.jpg http://www.cardforge.org/fpics/products/boosters/DST.png
http://www.cardforge.org/fpics/products/boosters/FEM.jpg http://www.cardforge.org/fpics/products/boosters/EVE.png
http://www.cardforge.org/fpics/products/boosters/FUT.jpg http://www.cardforge.org/fpics/products/boosters/EX.png
http://www.cardforge.org/fpics/products/boosters/GPT.jpg http://www.cardforge.org/fpics/products/boosters/FEM.png
http://www.cardforge.org/fpics/products/boosters/HML.jpg http://www.cardforge.org/fpics/products/boosters/FUT.png
http://www.cardforge.org/fpics/products/boosters/ICE.jpg http://www.cardforge.org/fpics/products/boosters/GPT.png
http://www.cardforge.org/fpics/products/boosters/INV.jpg http://www.cardforge.org/fpics/products/boosters/GTC.png
http://www.cardforge.org/fpics/products/boosters/ISD.jpg http://www.cardforge.org/fpics/products/boosters/HML.png
http://www.cardforge.org/fpics/products/boosters/JUD.jpg http://www.cardforge.org/fpics/products/boosters/ICE.png
http://www.cardforge.org/fpics/products/boosters/LEA.jpg http://www.cardforge.org/fpics/products/boosters/IN.png
http://www.cardforge.org/fpics/products/boosters/LEB.jpg http://www.cardforge.org/fpics/products/boosters/ISD.png
http://www.cardforge.org/fpics/products/boosters/LEG.jpg http://www.cardforge.org/fpics/products/boosters/JUD.png
http://www.cardforge.org/fpics/products/boosters/LGN.jpg http://www.cardforge.org/fpics/products/boosters/LEA.png
http://www.cardforge.org/fpics/products/boosters/LRW.jpg http://www.cardforge.org/fpics/products/boosters/LEB.png
http://www.cardforge.org/fpics/products/boosters/M10.jpg http://www.cardforge.org/fpics/products/boosters/LEG.png
http://www.cardforge.org/fpics/products/boosters/M11.jpg http://www.cardforge.org/fpics/products/boosters/LGN.png
http://www.cardforge.org/fpics/products/boosters/M12.jpg http://www.cardforge.org/fpics/products/boosters/LRW.png
http://www.cardforge.org/fpics/products/boosters/MBS.jpg http://www.cardforge.org/fpics/products/boosters/M10.png
http://www.cardforge.org/fpics/products/boosters/MIR.jpg http://www.cardforge.org/fpics/products/boosters/M11.png
http://www.cardforge.org/fpics/products/boosters/MMQ.jpg http://www.cardforge.org/fpics/products/boosters/M12.png
http://www.cardforge.org/fpics/products/boosters/MOR.jpg http://www.cardforge.org/fpics/products/boosters/M13.png
http://www.cardforge.org/fpics/products/boosters/MRD.jpg http://www.cardforge.org/fpics/products/boosters/MBS.png
http://www.cardforge.org/fpics/products/boosters/NMS.jpg http://www.cardforge.org/fpics/products/boosters/MI.png
http://www.cardforge.org/fpics/products/boosters/NPH.jpg http://www.cardforge.org/fpics/products/boosters/MMQ.png
http://www.cardforge.org/fpics/products/boosters/ODY.jpg http://www.cardforge.org/fpics/products/boosters/MOR.png
http://www.cardforge.org/fpics/products/boosters/ONS.jpg http://www.cardforge.org/fpics/products/boosters/MRD.png
http://www.cardforge.org/fpics/products/boosters/PCY.jpg http://www.cardforge.org/fpics/products/boosters/NMS.png
http://www.cardforge.org/fpics/products/boosters/PLC.jpg http://www.cardforge.org/fpics/products/boosters/NPH.png
http://www.cardforge.org/fpics/products/boosters/PLS.jpg http://www.cardforge.org/fpics/products/boosters/OD.png
http://www.cardforge.org/fpics/products/boosters/PO2.jpg http://www.cardforge.org/fpics/products/boosters/ONS.png
http://www.cardforge.org/fpics/products/boosters/POR.jpg http://www.cardforge.org/fpics/products/boosters/PCY.png
http://www.cardforge.org/fpics/products/boosters/PTK.jpg http://www.cardforge.org/fpics/products/boosters/PLC.png
http://www.cardforge.org/fpics/products/boosters/RAV.jpg http://www.cardforge.org/fpics/products/boosters/PO2.png
http://www.cardforge.org/fpics/products/boosters/ROE.jpg http://www.cardforge.org/fpics/products/boosters/POR.png
http://www.cardforge.org/fpics/products/boosters/S99.jpg http://www.cardforge.org/fpics/products/boosters/PS.png
http://www.cardforge.org/fpics/products/boosters/SCG.jpg http://www.cardforge.org/fpics/products/boosters/PTK.png
http://www.cardforge.org/fpics/products/boosters/SHM.jpg http://www.cardforge.org/fpics/products/boosters/RAV.png
http://www.cardforge.org/fpics/products/boosters/SOK.jpg http://www.cardforge.org/fpics/products/boosters/ROE.png
http://www.cardforge.org/fpics/products/boosters/SOM.jpg http://www.cardforge.org/fpics/products/boosters/RTR.png
http://www.cardforge.org/fpics/products/boosters/STH.jpg http://www.cardforge.org/fpics/products/boosters/S99.png
http://www.cardforge.org/fpics/products/boosters/TMP.jpg http://www.cardforge.org/fpics/products/boosters/SCG.png
http://www.cardforge.org/fpics/products/boosters/TOR.jpg http://www.cardforge.org/fpics/products/boosters/SHM.png
http://www.cardforge.org/fpics/products/boosters/TSP.jpg http://www.cardforge.org/fpics/products/boosters/SOK.png
http://www.cardforge.org/fpics/products/boosters/UDS.jpg http://www.cardforge.org/fpics/products/boosters/SOM.png
http://www.cardforge.org/fpics/products/boosters/ULG.jpg http://www.cardforge.org/fpics/products/boosters/ST.png
http://www.cardforge.org/fpics/products/boosters/USG.jpg http://www.cardforge.org/fpics/products/boosters/TE.png
http://www.cardforge.org/fpics/products/boosters/VIS.jpg http://www.cardforge.org/fpics/products/boosters/TOR.png
http://www.cardforge.org/fpics/products/boosters/WTH.jpg http://www.cardforge.org/fpics/products/boosters/TSP.png
http://www.cardforge.org/fpics/products/boosters/WWK.jpg http://www.cardforge.org/fpics/products/boosters/UD.png
http://www.cardforge.org/fpics/products/boosters/ZEN.jpg http://www.cardforge.org/fpics/products/boosters/UL.png
http://www.cardforge.org/fpics/products/boosters/UZ.png
http://www.cardforge.org/fpics/products/boosters/VI.png
http://www.cardforge.org/fpics/products/boosters/WL.png
http://www.cardforge.org/fpics/products/boosters/WWK.png
http://www.cardforge.org/fpics/products/boosters/ZEN.png

20
src/main/java/forge/ImageLoader.java
View File

@@ -13,7 +13,8 @@ import forge.properties.NewConstants;
final class ImageLoader extends CacheLoader<String, BufferedImage> { final class ImageLoader extends CacheLoader<String, BufferedImage> {
// image file extensions for various formats in order of likelihood // image file extensions for various formats in order of likelihood
private static final String[] _FILE_EXTENSIONS = { ".jpg", ".png" }; // the last, empty, string is for keys that come in with an extension already in place
private static final String[] _FILE_EXTENSIONS = { ".jpg", ".png", "" };
@Override @Override
public BufferedImage load(String key) { public BufferedImage load(String key) {
@@ -41,9 +42,17 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
BufferedImage ret = _findFile(key, path, filename); BufferedImage ret = _findFile(key, path, filename);
// try without set prefix (if any) // try without set prefix and/or '.full' suffix
if (null == ret && filename.contains("/")) { if (null == ret && (filename.contains("/") || filename.contains(".full"))) {
ret = _findFile(key, path, filename.substring(filename.indexOf('/') + 1)); String bareFilename = filename;
if (bareFilename.contains("/")) {
bareFilename = filename.substring(filename.indexOf('/') + 1);
}
if (bareFilename.endsWith(".full")) {
bareFilename = bareFilename.substring(0, bareFilename.length() - 5);
}
ret = _findFile(key, path, bareFilename);
} }
if (null == ret) { if (null == ret) {
@@ -66,8 +75,9 @@ final class ImageLoader extends CacheLoader<String, BufferedImage> {
private static BufferedImage _findFile(String key, String path, String filename) { private static BufferedImage _findFile(String key, String path, String filename) {
for (String ext : _FILE_EXTENSIONS) { for (String ext : _FILE_EXTENSIONS) {
File file = new File(path, filename + ext); File file = new File(path, filename + ext);
//System.out.println(String.format("Searching for %s at: %s", key, file.getAbsolutePath()));
if (file.exists()) { if (file.exists()) {
System.out.println(String.format("Found %s at: %s", key, file.getAbsolutePath())); //System.out.println(String.format("Found %s at: %s", key, file.getAbsolutePath()));
return getImage(file); return getImage(file);
} }
} }