X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=ea66aec0d1b3c7fcedc65dfc31366e29a9b67708;hp=94e854aa19536a77e405e3b3223a1958ffdedf82;hb=948637bc8cc1dcf76f783870cf46f71794a9805d;hpb=3727aae2b0516c5ed5366cde29544565f1d6c6b0

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 94e854a..ea66aec 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -23,9 +23,9 @@ public class Instance {
 	private static File readerTmp;
 
 	static {
+		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
-		// config dependent:
 		trans = new StringIdBundle(getLang());
 		lib = new Library(getFile(Config.LIBRARY_DIR));
 		debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
@@ -33,6 +33,14 @@ public class Instance {
 		File tmp = getFile(Config.CACHE_DIR);
 		readerTmp = getFile(Config.CACHE_DIR_LOCAL_READER);
 
+		if (checkEnv("NOUTF")) {
+			trans.setUnicode(false);
+		}
+
+		if (checkEnv("DEBUG")) {
+			debug = true;
+		}
+
 		if (tmp == null || readerTmp == null) {
 			String tmpDir = System.getProperty("java.io.tmpdir");
 			if (tmpDir != null) {
@@ -40,7 +48,7 @@ public class Instance {
 					tmp = new File(tmpDir, "fanfic-tmp");
 				}
 				if (readerTmp == null) {
-					tmp = new File(tmpDir, "fanfic-reader");
+					readerTmp = new File(tmpDir, "fanfic-reader");
 				}
 			} else {
 				syserr(new IOException(
@@ -54,42 +62,36 @@ public class Instance {
 							+ coverDir));
 			coverDir = null;
 		}
-		//
-
-		String noutf = System.getenv("NOUTF");
-		if (noutf != null) {
-			noutf = noutf.trim().toLowerCase();
-			if ("yes".equals(noutf) || "true".equals(noutf)
-					|| "on".equals(noutf) || "1".equals(noutf)
-					|| "y".equals(noutf)) {
-				trans.setUnicode(false);
-			}
-		}
 
 		String configDir = System.getenv("CONFIG_DIR");
+		if (configDir == null) {
+			configDir = new File(System.getProperty("user.home"), ".fanfix")
+					.getPath();
+		}
 		if (configDir != null) {
-			if (new File(configDir).isDirectory()) {
-				Bundles.setDirectory(configDir);
-				try {
-					config = new ConfigBundle();
-					config.updateFile(configDir);
-				} catch (IOException e) {
-					syserr(e);
-				}
-				try {
-					trans = new StringIdBundle(getLang());
-					trans.updateFile(configDir);
-				} catch (IOException e) {
-					syserr(e);
-				}
+			if (!new File(configDir).exists()) {
+				new File(configDir).mkdirs();
 			} else {
-				syserr(new IOException("Configuration directory not found: "
-						+ configDir));
+				Bundles.setDirectory(configDir);
+			}
+
+			try {
+				config = new ConfigBundle();
+				config.updateFile(configDir);
+			} catch (IOException e) {
+				syserr(e);
 			}
+			try {
+				trans = new StringIdBundle(getLang());
+				trans.updateFile(configDir);
+			} catch (IOException e) {
+				syserr(e);
+			}
+
+			Bundles.setDirectory(configDir);
 		}
 
 		try {
-
 			String ua = config.getString(Config.USER_AGENT);
 			int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
 			int hoursLarge = config
@@ -209,4 +211,26 @@ public class Instance {
 
 		return lang;
 	}
+
+	/**
+	 * Check that the given environment variable is "enabled".
+	 * 
+	 * @param key
+	 *            the variable to check
+	 * 
+	 * @return TRUE if it is
+	 */
+	private static boolean checkEnv(String key) {
+		String value = System.getenv(key);
+		if (value != null) {
+			value = value.trim().toLowerCase();
+			if ("yes".equals(value) || "true".equals(value)
+					|| "on".equals(value) || "1".equals(value)
+					|| "y".equals(value)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 }