X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=33c65e003aeddc21a7f70e36b342b123a9e6f5ac;hp=4e4705b352a5aa569cd958b4fc1244b004c1a227;hb=2284842831ea46e89b97dd22b6e294caad361f30;hpb=d011400048cae6884f0d94c320498429b45fb48a

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 4e4705b..33c65e0 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,6 +6,9 @@ import java.io.IOException;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.fanfix.bundles.StringIdBundle;
+import be.nikiroo.fanfix.bundles.UiConfig;
+import be.nikiroo.fanfix.bundles.UiConfigBundle;
+import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.resources.Bundles;
 
 /**
@@ -15,6 +18,7 @@ import be.nikiroo.utils.resources.Bundles;
  */
 public class Instance {
 	private static ConfigBundle config;
+	private static UiConfigBundle uiconfig;
 	private static StringIdBundle trans;
 	private static Cache cache;
 	private static Library lib;
@@ -23,15 +27,61 @@ public class Instance {
 	private static File readerTmp;
 
 	static {
-		// Most of the rest is dependant upon this:
+		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
+		String configDir = System.getProperty("CONFIG_DIR");
+		if (configDir == null) {
+			configDir = System.getenv("CONFIG_DIR");
+		}
+		if (configDir == null) {
+			configDir = new File(System.getProperty("user.home"), ".fanfix")
+					.getPath();
+		}
+		
+		if (configDir != null) {
+			if (!new File(configDir).exists()) {
+				new File(configDir).mkdirs();
+			} else {
+				Bundles.setDirectory(configDir);
+			}
+
+			try {
+				config = new ConfigBundle();
+				config.updateFile(configDir);
+			} catch (IOException e) {
+				syserr(e);
+			}
+			try {
+				uiconfig = new UiConfigBundle();
+				uiconfig.updateFile(configDir);
+			} catch (IOException e) {
+				syserr(e);
+			}
+			try {
+				trans = new StringIdBundle(getLang());
+				trans.updateFile(configDir);
+			} catch (IOException e) {
+				syserr(e);
+			}
+
+			Bundles.setDirectory(configDir);
+		}
+
+		uiconfig = new UiConfigBundle();
 		trans = new StringIdBundle(getLang());
-		lib = new Library(getFile(Config.LIBRARY_DIR));
+		try {
+			lib = new Library(getFile(Config.LIBRARY_DIR),
+					OutputType.INFO_TEXT, OutputType.CBZ);
+		} catch (Exception e) {
+			syserr(new IOException("Cannot create library for directory: "
+					+ getFile(Config.LIBRARY_DIR), e));
+		}
+
 		debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
 		coverDir = getFile(Config.DEFAULT_COVERS_DIR);
 		File tmp = getFile(Config.CACHE_DIR);
-		readerTmp = getFile(Config.CACHE_DIR_LOCAL_READER);
+		readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER);
 
 		if (checkEnv("NOUTF")) {
 			trans.setUnicode(false);
@@ -41,20 +91,14 @@ public class Instance {
 			debug = true;
 		}
 
-		if (tmp == null || readerTmp == null) {
-			String tmpDir = System.getProperty("java.io.tmpdir");
-			if (tmpDir != null) {
-				if (tmp == null) {
-					tmp = new File(tmpDir, "fanfic-tmp");
-				}
-				if (readerTmp == null) {
-					tmp = new File(tmpDir, "fanfic-reader");
-				}
-			} else {
-				syserr(new IOException(
-						"The system does not have a default temporary directory"));
-			}
+		// Could have used: System.getProperty("java.io.tmpdir")
+		if (tmp == null) {
+			tmp = new File(configDir, "tmp");
 		}
+		if (readerTmp == null) {
+			readerTmp = new File(configDir, "tmp-reader");
+		}
+		//
 
 		if (coverDir != null && !coverDir.exists()) {
 			syserr(new IOException(
@@ -63,28 +107,6 @@ public class Instance {
 			coverDir = null;
 		}
 
-		String configDir = System.getenv("CONFIG_DIR");
-		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);
-				}
-			} else {
-				syserr(new IOException("Configuration directory not found: "
-						+ configDir));
-			}
-		}
-
 		try {
 			String ua = config.getString(Config.USER_AGENT);
 			int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
@@ -107,6 +129,15 @@ public class Instance {
 		return config;
 	}
 
+	/**
+	 * Get the (unique) UI configuration service for the program.
+	 * 
+	 * @return the configuration service
+	 */
+	public static UiConfigBundle getUiConfig() {
+		return uiconfig;
+	}
+
 	/**
 	 * Get the (unique) {@link Cache} for the program.
 	 * 
@@ -172,8 +203,25 @@ public class Instance {
 	 * @return the path
 	 */
 	private static File getFile(Config id) {
+		return getFile(config.getString(id));
+	}
+
+	/**
+	 * Return a path, but support the special $HOME variable.
+	 * 
+	 * @return the path
+	 */
+	private static File getFile(UiConfig id) {
+		return getFile(uiconfig.getString(id));
+	}
+
+	/**
+	 * Return a path, but support the special $HOME variable.
+	 * 
+	 * @return the path
+	 */
+	private static File getFile(String path) {
 		File file = null;
-		String path = config.getString(id);
 		if (path != null && !path.isEmpty()) {
 			path = path.replace('/', File.separatorChar);
 			if (path.contains("$HOME")) {