X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=cd57efe038532e78d6983e2e2cbd410184e16884;hb=b4dc6ab518ded2dd92e4cbb02ac615b1d57e8e6d;hp=ae96d481a930d60ffe9576e397eaf6493e05917d;hpb=68686a37a591a767f6d1af428ea0d5f3d3a1ddc1;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index ae96d48..cd57efe 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;
@@ -44,6 +48,12 @@ public class Instance {
 			} 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);
@@ -54,18 +64,20 @@ public class Instance {
 			Bundles.setDirectory(configDir);
 		}
 
+		uiconfig = new UiConfigBundle();
 		trans = new StringIdBundle(getLang());
 		try {
-			lib = new Library(getFile(Config.LIBRARY_DIR));
+			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);
@@ -119,6 +131,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.
 	 * 
@@ -184,8 +205,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")) {