X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=a6462323492bf3356413403778bcaeb29b504b4d;hb=27f3b37ff1bb4b7eed69b44e0ccd7b23380dcf44;hp=b7a284ccbb82e11c760c6b5973faacbc3bc2b14f;hpb=7cd006eb6525c3225cca01d1b064b355f3d59bdc;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index b7a284c..a646232 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -93,7 +93,7 @@ public class Instance {
 		createConfigs(configDir, false);
 
 		// Proxy support
-		Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
+		Proxy.use(Instance.getConfig().getString(Config.NETWORK_PROXY));
 
 		// update tracer:
 		if (debug == null) {
@@ -114,7 +114,7 @@ public class Instance {
 		}
 		Image.setTemporaryFilesRoot(new File(tmp.getParent(), "tmp.images"));
 
-		String ua = config.getString(Config.USER_AGENT, "");
+		String ua = config.getString(Config.NETWORK_USER_AGENT, "");
 		try {
 			int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, 0);
 			int hoursLarge = config.getInteger(Config.CACHE_MAX_TIME_STABLE, 0);
@@ -325,8 +325,8 @@ public class Instance {
 	 */
 	public static boolean isVersionCheckNeeded() {
 		try {
-			long wait = config.getInteger(Config.UPDATE_INTERVAL, 0) * 24 * 60
-					* 60 * 1000;
+			long wait = config.getInteger(Config.NETWORK_UPDATE_INTERVAL, 0)
+					* 24 * 60 * 60 * 1000;
 			if (wait >= 0) {
 				String lastUpString = IOUtils.readSmallFile(new File(configDir,
 						"LAST_UPDATE"));
@@ -370,18 +370,14 @@ public class Instance {
 	}
 
 	/**
-	 * The configuration directory (will check, in order of preference,
-	 * {@link Bundles#getDirectory()}, the system properties, the environment
-	 * and then defaults to $HOME/.fanfix).
+	 * The configuration directory (will check, in order of preference, the
+	 * system properties, the environment and then defaults to
+	 * {@link Instance#getHome()}/.fanfix).
 	 * 
 	 * @return the config directory
 	 */
 	private static String getConfigDir() {
-		String configDir = Bundles.getDirectory();
-
-		if (configDir == null) {
-			configDir = System.getProperty("CONFIG_DIR");
-		}
+		String configDir = System.getProperty("CONFIG_DIR");
 
 		if (configDir == null) {
 			configDir = System.getenv("CONFIG_DIR");
@@ -460,6 +456,9 @@ public class Instance {
 			String libDir = System.getenv("BOOKS_DIR");
 			if (libDir == null || libDir.isEmpty()) {
 				libDir = config.getString(Config.LIBRARY_DIR, "$HOME/Books");
+				if (!getFile(libDir).isAbsolute()) {
+					libDir = new File(configDir, libDir).getPath();
+				}
 			}
 			try {
 				lib = new LocalLibrary(getFile(libDir));
@@ -508,11 +507,7 @@ public class Instance {
 	 * @return the path
 	 */
 	private static File getFile(Config id, File def) {
-		String path = config.getString(id);
-		if (path != null && path.isEmpty()) {
-			path = def.getPath();
-		}
-
+		String path = config.getString(id, def.getPath());
 		return getFile(path);
 	}
 
@@ -522,11 +517,7 @@ public class Instance {
 	 * @return the path
 	 */
 	private static File getFile(UiConfig id, File def) {
-		String path = uiconfig.getString(id);
-		if (path != null && path.isEmpty()) {
-			path = def.getPath();
-		}
-
+		String path = uiconfig.getString(id, def.getPath());
 		return getFile(path);
 	}