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

Add support for "upcoming" folder in Card Workshop, and better filename calculation.

Browse Source
This commit is contained in:
Rob Schnautz
2018-01-16 04:04:40 +00:00
parent 3404d267f7
commit 1fcde1cd4b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui/src/main/java/forge/card/CardScriptInfo.java
View File

@@ -68,14 +68,18 @@ public final class CardScriptInfo {
public static CardScriptInfo getScriptFor(final String name) { public static CardScriptInfo getScriptFor(final String name) {
CardScriptInfo script = allScripts.get(name); CardScriptInfo script = allScripts.get(name);
if (script == null) { //attempt to load script if not previously loaded if (script == null) { //attempt to load script if not previously loaded
final String filename = name.toLowerCase().replace(' ', '_').replace('-', '_').replace("'", "").replace(",", "") + ".txt"; final String filename = name.toLowerCase().replaceAll("[^-a-z0-9\\s]","").replaceAll("[-\\s]","_") + ".txt";
final File file = new File(ForgeConstants.CARD_DATA_DIR + filename.charAt(0) + File.separator + filename); String[] folders = { String.valueOf(filename.charAt(0)), "upcoming"};
if (file.exists()) {
script = new CardScriptInfo(FileUtil.readFileToString(file), file); for(String folder : folders){
allScripts.put(name, script); final File file = new File(ForgeConstants.CARD_DATA_DIR + filename.charAt(0) + File.separator + filename);
if (file.exists()) {
script = new CardScriptInfo(FileUtil.readFileToString(file), file);
allScripts.put(name, script);
break;
}
} }
} }
return script; return script;
} }
} }