From 3873d9852f784b0b50b8f36e5cee1019dba14b16 Mon Sep 17 00:00:00 2001 From: myk Date: Sun, 10 Mar 2013 01:48:02 +0000 Subject: [PATCH] make cardPicsDir separately configurable --- .../forge/properties/ForgeProfileProperties.java | 14 ++++++++++---- src/main/java/forge/properties/NewConstants.java | 9 +++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/properties/ForgeProfileProperties.java b/src/main/java/forge/properties/ForgeProfileProperties.java index 4a9e0d1e1e7..fe454a94e0d 100644 --- a/src/main/java/forge/properties/ForgeProfileProperties.java +++ b/src/main/java/forge/properties/ForgeProfileProperties.java @@ -33,9 +33,11 @@ import org.apache.commons.lang3.tuple.Pair; public class ForgeProfileProperties { public final String userDir; public final String cacheDir; + public final String cardPicsDir; - private final String _USER_DIR_KEY = "userDir"; - private final String _CACHE_DIR_KEY = "cacheDir"; + private final String _USER_DIR_KEY = "userDir"; + private final String _CACHE_DIR_KEY = "cacheDir"; + private final String _CARD_PICS_DIR_KEY = "cardPicsDir"; public ForgeProfileProperties(String filename) { Properties props = new Properties(); @@ -60,8 +62,12 @@ public class ForgeProfileProperties { propUserDir += propUserDir.endsWith("/") || propUserDir.endsWith(File.pathSeparator) ? "" : "/"; propCacheDir += propCacheDir.endsWith("/") || propCacheDir.endsWith(File.pathSeparator) ? "" : "/"; - userDir = propUserDir; - cacheDir = propCacheDir; + String propCardPicsDir = props.getProperty(_CARD_PICS_DIR_KEY, propCacheDir + "pics/cards/"); + propCardPicsDir += propCardPicsDir.endsWith("/") || propCardPicsDir.endsWith(File.pathSeparator) ? "" : "/"; + + userDir = propUserDir; + cacheDir = propCacheDir; + cardPicsDir = propCardPicsDir; } // returns a pair diff --git a/src/main/java/forge/properties/NewConstants.java b/src/main/java/forge/properties/NewConstants.java index e2b7ec17500..af19082418c 100644 --- a/src/main/java/forge/properties/NewConstants.java +++ b/src/main/java/forge/properties/NewConstants.java @@ -49,10 +49,12 @@ public final class NewConstants { // data tree roots private static final String _USER_DIR; private static final String _CACHE_DIR; + public static final String CACHE_CARD_PICS_DIR; static { ForgeProfileProperties profileProps = new ForgeProfileProperties(PROFILE_FILE); - _USER_DIR = profileProps.userDir; - _CACHE_DIR = profileProps.cacheDir; + _USER_DIR = profileProps.userDir; + _CACHE_DIR = profileProps.cacheDir; + CACHE_CARD_PICS_DIR = profileProps.cardPicsDir; } // data that is only in the profile dirs @@ -78,9 +80,8 @@ public final class NewConstants { public static final FileLocation EDITOR_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, _USER_PREFS_DIR, "editor.xml"); // data that is only in the cached dir - private static final String _DB_DIR = _CACHE_DIR + "db/"; + private static final String _DB_DIR = _CACHE_DIR + "db/"; private static final String _PICS_DIR = _CACHE_DIR + "pics/"; - public static final String CACHE_CARD_PICS_DIR = _PICS_DIR + "cards/"; public static final String CACHE_TOKEN_PICS_DIR = _PICS_DIR + "tokens/"; public static final String CACHE_ICON_PICS_DIR = _PICS_DIR + "icons/"; public static final String CACHE_BOOSTER_PICS_DIR = _PICS_DIR + "boosters/";