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

Support saving changes to storage locations

Browse Source
This commit is contained in:
drdev
2014-06-07 02:13:32 +00:00
parent abad25de40
commit 801eaf0fed
3 changed files with 86 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-core/src/main/java/forge/util/FileSection.java
View File

@@ -26,6 +26,8 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
/**
* TODO: Write javadoc for this type.
*
@@ -69,13 +71,15 @@ public class FileSection {
}
public static Map<String, String> parseToMap(final String line, final String kvSeparator, final String pairSeparator) {
final String[] pairs = line.split(Pattern.quote(pairSeparator));
final Pattern splitter = Pattern.compile(Pattern.quote(kvSeparator));
Map<String, String> result = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
for (final String dd : pairs) {
final String[] v = splitter.split(dd, 2);
result.put(v[0].trim(), v.length > 1 ? v[1].trim() : "");
if (!StringUtils.isEmpty(line)) {
final String[] pairs = line.split(Pattern.quote(pairSeparator));
final Pattern splitter = Pattern.compile(Pattern.quote(kvSeparator));
for (final String dd : pairs) {
final String[] v = splitter.split(dd, 2);
result.put(v[0].trim(), v.length > 1 ? v[1].trim() : "");
}
}
return result;
}

28
forge-core/src/main/java/forge/util/FileUtil.java
View File

@@ -92,18 +92,8 @@ public final class FileUtil {
return dir.delete();
}
/**
* <p>
* writeFile.
* </p>
*
* @param filename
* a {@link java.lang.String} object.
* @param data
* a {@link java.util.List} object.
*/
public static void writeFile(final String filename, final List<String> data) {
FileUtil.writeFile(new File(filename), data);
public static void writeFile(String filename, String text) {
FileUtil.writeFile(new File(filename), text);
}
public static void writeFile(File file, String text) {
@@ -116,6 +106,20 @@ public final class FileUtil {
}
}
/**
* <p>
* writeFile.
* </p>
*
* @param filename
* a {@link java.lang.String} object.
* @param data
* a {@link java.util.List} object.
*/
public static void writeFile(String filename, List<String> data) {
FileUtil.writeFile(new File(filename), data);
}
// writes each element of ArrayList on a separate line
// this is used to write a file of Strings
// this will create a new file if needed

71
forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java
View File

@@ -46,7 +46,7 @@ public class ForgeProfileProperties {
private static final String CACHE_DIR_KEY = "cacheDir";
private static final String CARD_PICS_DIR_KEY = "cardPicsDir";
private static final String CARD_PICS_SUB_DIRS_KEY = "cardPicsSubDirs";
private static final String SERVER_PORT = "serverPort";
private static final String SERVER_PORT_KEY = "serverPort";
private ForgeProfileProperties() {
//prevent initializing static class
@@ -64,12 +64,12 @@ public class ForgeProfileProperties {
System.err.println("error while reading from profile properties file");
}
Pair<String, String> defaults = _getDefaultDirs();
Pair<String, String> defaults = getDefaultDirs();
userDir = getDir(props, USER_DIR_KEY, defaults.getLeft());
cacheDir = getDir(props, CACHE_DIR_KEY, defaults.getRight());
cardPicsDir = getDir(props, CARD_PICS_DIR_KEY, cacheDir + "pics/cards/");
cardPicsDir = getDir(props, CARD_PICS_DIR_KEY, cacheDir + "pics" + File.separator + "cards" + File.separator);
cardPicsSubDirs = getMap(props, CARD_PICS_SUB_DIRS_KEY);
serverPort = getInt(props, SERVER_PORT, 0);
serverPort = getInt(props, SERVER_PORT_KEY, 0);
//ensure directories exist
FileUtil.ensureDirectoryExists(userDir);
@@ -82,6 +82,7 @@ public class ForgeProfileProperties {
}
public static void setUserDir(String userDir0) {
userDir = userDir0;
save();
}
public static String getCacheDir() {
@@ -93,6 +94,7 @@ public class ForgeProfileProperties {
cardPicsDir = cacheDir0 + cardPicsDir.substring(idx + cacheDir.length());
}
cacheDir = cacheDir0;
save();
}
public static String getCardPicsDir() {
@@ -100,6 +102,7 @@ public class ForgeProfileProperties {
}
public static void setCardPicsDir(String cardPicsDir0) {
cardPicsDir = cardPicsDir0;
save();
}
public static Map<String, String> getCardPicsSubDirs() {
@@ -140,10 +143,10 @@ public class ForgeProfileProperties {
}
// returns a pair <userDir, cacheDir>
private static Pair<String, String> _getDefaultDirs() {
private static Pair<String, String> getDefaultDirs() {
if (!GuiBase.getInterface().isRunningOnDesktop()) { //special case for mobile devices
String assetsDir = ForgeConstants.ASSETS_DIR;
return Pair.of(assetsDir + "data/", assetsDir + "cache/");
return Pair.of(assetsDir + "data" + File.separator, assetsDir + "cache" + File.separator);
}
String osName = System.getProperty("os.name");
@@ -154,7 +157,7 @@ public class ForgeProfileProperties {
}
String fallbackDataDir = String.format("%s/.forge", homeDir);
if (StringUtils.containsIgnoreCase(osName, "windows")) {
// the split between appdata and localappdata on windows is relatively recent. If
// localappdata is not defined, use appdata for both. and if appdata is not defined,
@@ -167,12 +170,11 @@ public class ForgeProfileProperties {
if (StringUtils.isEmpty(cacheRoot)) {
cacheRoot = appRoot;
}
// just use '/' everywhere instead of file.separator. it always works
// the cache dir is Forge/Cache instead of just Forge since appRoot and cacheRoot might be the
// same directory on windows and we need to distinguish them.
return Pair.of(String.format("%s/Forge", appRoot),
String.format("%s/Forge/Cache", cacheRoot));
} else if (StringUtils.containsIgnoreCase(osName, "mac os x")) {
return Pair.of(appRoot + File.separator + "Forge", cacheRoot + File.separator + "Forge" + File.separator + "Cache");
}
else if (StringUtils.containsIgnoreCase(osName, "mac os x")) {
return Pair.of(String.format("%s/Library/Application Support/Forge", homeDir),
String.format("%s/Library/Caches/Forge", homeDir));
}
@@ -180,4 +182,51 @@ public class ForgeProfileProperties {
// Linux and everything else
return Pair.of(fallbackDataDir, String.format("%s/.cache/forge", homeDir));
}
private static void save() {
Pair<String, String> defaults = getDefaultDirs();
String defaultUserDir = defaults.getLeft() + File.separator;
String defaultCacheDir = defaults.getRight() + File.separator;
String defaultCardPicsDir = defaultCacheDir + "pics" + File.separator + "cards" + File.separator;
//only append values that aren't equal to defaults
StringBuilder sb = new StringBuilder();
if (!userDir.equals(defaultUserDir)) { //ensure backslashes are escaped
sb.append(USER_DIR_KEY + "=" + userDir.replace("\\", "\\\\") + "\n");
}
if (!cacheDir.equals(defaultCacheDir)) {
sb.append(CACHE_DIR_KEY + "=" + cacheDir.replace("\\", "\\\\") + "\n");
}
if (!cardPicsDir.equals(defaultCardPicsDir)) {
sb.append(CARD_PICS_DIR_KEY + "=" + cardPicsDir.replace("\\", "\\\\") + "\n");
}
if (cardPicsSubDirs.size() > 0) {
sb.append(CARD_PICS_SUB_DIRS_KEY + "=");
boolean needDelim = false;
for (Map.Entry<String, String> entry : cardPicsSubDirs.entrySet()) {
if (needDelim) {
sb.append("|");
}
sb.append(entry.getKey() + "->" + entry.getValue());
}
sb.append("\n");
}
if (serverPort != 0) {
sb.append(SERVER_PORT_KEY + "=" + serverPort);
}
if (sb.length() > 0) {
FileUtil.writeFile(ForgeConstants.PROFILE_FILE, sb.toString());
}
else { //delete file if empty
try {
File file = new File(ForgeConstants.PROFILE_FILE);
if (file.exists()) {
file.delete();
}
}
catch (Exception e) {
e.printStackTrace();
}
}
}
}