X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=84a583e6635d8ec966c7fb8cf1ef334ecaa0bb9a;hb=ee9b7083501b94c9ff00ab1d7e481d6f8dec8b05;hp=c547a2b121bdf07ae3e48ad146ad28ea07ed9c04;hpb=e39e560faae7c7bf3cf6fb098be5c4b209ac29e3;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index c547a2b..84a583e 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -17,6 +17,7 @@ import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.library.RemoteLibrary;
 import be.nikiroo.utils.Cache;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Proxy;
 import be.nikiroo.utils.TempFiles;
 import be.nikiroo.utils.TraceHandler;
@@ -41,7 +42,21 @@ public class Instance {
 	private static TraceHandler tracer;
 	private static TempFiles tempFiles;
 
-	static {
+	private static boolean init;
+
+	/**
+	 * Initialise the instance -- if already initialised, nothing will happen.
+	 * <p>
+	 * Before calling this method, you may call {@link Bundles#getDirectory()}
+	 * if wanted.
+	 */
+	static public void init() {
+		if (init) {
+			return;
+		}
+
+		init = true;
+
 		// Before we can configure it:
 		Boolean debug = checkEnv("DEBUG");
 		boolean trace = debug != null && debug;
@@ -71,7 +86,8 @@ public class Instance {
 		remoteDir = new File(configDir, "remote");
 		lib = createDefaultLibrary(remoteDir);
 
-		// create cache
+		// create cache and TMP
+		Image.setTemporaryFilesRoot(new File(configDir, "tmp.images"));
 		File tmp = getFile(Config.CACHE_DIR);
 		if (tmp == null) {
 			// Could have used: System.getProperty("java.io.tmpdir")
@@ -439,6 +455,7 @@ public class Instance {
 								+ getFile(libDir), e));
 			}
 		} else {
+			Exception ex = null;
 			int pos = remoteLib.lastIndexOf(":");
 			if (pos >= 0) {
 				String port = remoteLib.substring(pos + 1).trim();
@@ -457,13 +474,14 @@ public class Instance {
 								lib);
 
 					} catch (Exception e) {
+						ex = e;
 					}
 				}
 			}
 
 			if (lib == null) {
 				tracer.error(new IOException(
-						"Cannot create remote library for: " + remoteLib));
+						"Cannot create remote library for: " + remoteLib, ex));
 			}
 		}
 
@@ -547,7 +565,7 @@ public class Instance {
 	private static String getLang() {
 		String lang = config.getString(Config.LANG);
 
-		if (lang == null | lang.isEmpty()) {
+		if (lang == null || lang.isEmpty()) {
 			if (System.getenv("LANG") != null
 					&& !System.getenv("LANG").isEmpty()) {
 				lang = System.getenv("LANG");