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

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index ea66aec..9c20682 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,6 +6,7 @@ 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.output.BasicOutput.OutputType;
 import be.nikiroo.utils.resources.Bundles;
 
 /**
@@ -26,8 +27,43 @@ public class Instance {
 		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
+		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).exists()) {
+				new File(configDir).mkdirs();
+			} else {
+				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);
+		}
+
 		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);
@@ -63,34 +99,6 @@ public class Instance {
 			coverDir = null;
 		}
 
-		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).exists()) {
-				new File(configDir).mkdirs();
-			} else {
-				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);