X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=fe73f7f51351ee44b3b664ced844f4f063894871;hb=e91d9858849065203785e77b6e1990b240ea1910;hp=c48b119052ff24f5c184ccf89c79edf8dd78961c;hpb=581d42c09b2673025e719a25477565362ebf4482;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index c48b119..fe73f7f 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -11,7 +11,9 @@ import be.nikiroo.fanfix.bundles.StringIdBundle;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.bundles.UiConfigBundle;
 import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.library.CacheLibrary;
 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.TraceHandler;
@@ -27,7 +29,7 @@ public class Instance {
 	private static UiConfigBundle uiconfig;
 	private static StringIdBundle trans;
 	private static DataLoader cache;
-	private static LocalLibrary lib;
+	private static BasicLibrary lib;
 	private static File coverDir;
 	private static File readerTmp;
 	private static File remoteDir;
@@ -35,6 +37,9 @@ public class Instance {
 	private static TraceHandler tracer;
 
 	static {
+		// Before we can configure it:
+		tracer = new TraceHandler(true, checkEnv("DEBUG"), checkEnv("DEBUG"));
+
 		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
@@ -44,8 +49,7 @@ public class Instance {
 		}
 
 		if (configDir == null) {
-			configDir = new File(System.getProperty("user.home"), ".fanfix")
-					.getPath();
+			configDir = new File(getHome(), ".fanfix").getPath();
 		}
 
 		if (!new File(configDir).exists()) {
@@ -58,13 +62,13 @@ public class Instance {
 			config = new ConfigBundle();
 			config.updateFile(configDir);
 		} catch (IOException e) {
-			syserr(e);
+			tracer.error(e);
 		}
 		try {
 			uiconfig = new UiConfigBundle();
 			uiconfig.updateFile(configDir);
 		} catch (IOException e) {
-			syserr(e);
+			tracer.error(e);
 		}
 
 		// No updateFile for this one! (we do not want the user to have custom
@@ -74,20 +78,13 @@ public class Instance {
 		// Fix an old bug (we used to store custom translation files by
 		// default):
 		if (trans.getString(StringId.INPUT_DESC_CBZ) == null) {
-			// TODO: create the deleteFile method
-			// trans.deleteFile(configDir);
+			trans.deleteFile(configDir);
 		}
 
 		Bundles.setDirectory(configDir);
 
 		uiconfig = new UiConfigBundle();
 		trans = new StringIdBundle(getLang());
-		try {
-			lib = new LocalLibrary(getFile(Config.LIBRARY_DIR));
-		} catch (Exception e) {
-			syserr(new IOException("Cannot create library for directory: "
-					+ getFile(Config.LIBRARY_DIR), e));
-		}
 
 		boolean debug = Instance.getConfig()
 				.getBoolean(Config.DEBUG_ERR, false);
@@ -104,11 +101,51 @@ public class Instance {
 
 		if (checkEnv("DEBUG")) {
 			debug = true;
+			trace = true;
 		}
 
-		tracer = new TraceHandler();
-		tracer.setShowErrorDetails(debug);
-		tracer.setShowTraces(trace);
+		tracer = new TraceHandler(true, debug, trace);
+
+		String remoteLib = config.getString(Config.DEFAULT_LIBRARY);
+		if (remoteLib == null || remoteLib.trim().isEmpty()) {
+			String libDir = System.getProperty("fanfix.libdir");
+			if (libDir == null || libDir.isEmpty()) {
+				config.getString(Config.LIBRARY_DIR);
+			}
+			try {
+				lib = new LocalLibrary(getFile(libDir));
+			} catch (Exception e) {
+				tracer.error(new IOException(
+						"Cannot create library for directory: "
+								+ getFile(libDir), e));
+			}
+		} else {
+			int pos = remoteLib.lastIndexOf(":");
+			if (pos >= 0) {
+				String port = remoteLib.substring(pos + 1).trim();
+				remoteLib = remoteLib.substring(0, pos);
+				pos = remoteLib.lastIndexOf(":");
+				if (pos >= 0) {
+					String host = remoteLib.substring(pos + 1).trim();
+					String key = remoteLib.substring(0, pos).trim();
+
+					try {
+						tracer.trace("Selecting remote library " + host + ":"
+								+ port);
+						lib = new RemoteLibrary(key, host,
+								Integer.parseInt(port));
+						lib = new CacheLibrary(getRemoteDir(host), lib);
+
+					} catch (Exception e) {
+					}
+				}
+			}
+
+			if (lib == null) {
+				tracer.error(new IOException(
+						"Cannot create remote library for: " + remoteLib));
+			}
+		}
 
 		// Could have used: System.getProperty("java.io.tmpdir")
 		if (tmp == null) {
@@ -120,29 +157,33 @@ public class Instance {
 		//
 
 		if (coverDir != null && !coverDir.exists()) {
-			syserr(new IOException(
+			tracer.error(new IOException(
 					"The 'default covers' directory does not exists: "
 							+ coverDir));
 			coverDir = null;
 		}
 
+		String ua = config.getString(Config.USER_AGENT);
 		try {
-			String ua = config.getString(Config.USER_AGENT);
 			int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
 			int hoursLarge = config
 					.getInteger(Config.CACHE_MAX_TIME_STABLE, -1);
-
 			cache = new DataLoader(tmp, ua, hours, hoursLarge);
 		} catch (IOException e) {
-			syserr(new IOException(
+			tracer.error(new IOException(
 					"Cannot create cache (will continue without cache)", e));
+			cache = new DataLoader(ua);
 		}
+
+		cache.setTraceHandler(tracer);
 	}
 
 	/**
 	 * The traces handler for this {@link Cache}.
+	 * <p>
+	 * It is never NULL.
 	 * 
-	 * @return the traces handler or NULL
+	 * @return the traces handler (never NULL)
 	 */
 	public static TraceHandler getTraceHandler() {
 		return tracer;
@@ -155,7 +196,12 @@ public class Instance {
 	 *            the new traces handler or NULL
 	 */
 	public static void setTraceHandler(TraceHandler tracer) {
+		if (tracer == null) {
+			tracer = new TraceHandler(false, false, false);
+		}
+
 		Instance.tracer = tracer;
+		cache.setTraceHandler(tracer);
 	}
 
 	/**
@@ -176,6 +222,42 @@ public class Instance {
 		return uiconfig;
 	}
 
+	/**
+	 * Reset the configuration.
+	 * 
+	 * @param resetTrans
+	 *            also reset the translation files
+	 */
+	public static void resetConfig(boolean resetTrans) {
+		String dir = Bundles.getDirectory();
+		Bundles.setDirectory(null);
+		try {
+			try {
+				ConfigBundle config = new ConfigBundle();
+				config.updateFile(configDir);
+			} catch (IOException e) {
+				tracer.error(e);
+			}
+			try {
+				UiConfigBundle uiconfig = new UiConfigBundle();
+				uiconfig.updateFile(configDir);
+			} catch (IOException e) {
+				tracer.error(e);
+			}
+
+			if (resetTrans) {
+				try {
+					StringIdBundle trans = new StringIdBundle(null);
+					trans.updateFile(configDir);
+				} catch (IOException e) {
+					tracer.error(e);
+				}
+			}
+		} finally {
+			Bundles.setDirectory(dir);
+		}
+	}
+
 	/**
 	 * Get the (unique) {@link DataLoader} for the program.
 	 * 
@@ -200,6 +282,10 @@ public class Instance {
 	 * @return the {@link LocalLibrary}
 	 */
 	public static BasicLibrary getLibrary() {
+		if (lib == null) {
+			throw new NullPointerException("We don't have a library to return");
+		}
+
 		return lib;
 	}
 
@@ -276,34 +362,10 @@ public class Instance {
 			IOUtils.writeSmallFile(new File(configDir), "LAST_UPDATE",
 					Long.toString(new Date().getTime()));
 		} catch (IOException e) {
-			syserr(e);
-		}
-	}
-
-	/**
-	 * Report an error to the user
-	 * 
-	 * @param e
-	 *            the {@link Exception} to report
-	 */
-	public static void syserr(Exception e) {
-		if (tracer != null) {
 			tracer.error(e);
 		}
 	}
 
-	/**
-	 * Notify of a debug message.
-	 * 
-	 * @param message
-	 *            the message
-	 */
-	public static void trace(String message) {
-		if (tracer != null) {
-			tracer.trace(message);
-		}
-	}
-
 	/**
 	 * Return a path, but support the special $HOME variable.
 	 * 
@@ -332,8 +394,7 @@ public class Instance {
 		if (path != null && !path.isEmpty()) {
 			path = path.replace('/', File.separatorChar);
 			if (path.contains("$HOME")) {
-				path = path.replace("$HOME",
-						"" + System.getProperty("user.home"));
+				path = path.replace("$HOME", getHome());
 			}
 
 			file = new File(path);
@@ -342,6 +403,38 @@ public class Instance {
 		return file;
 	}
 
+	/**
+	 * Return the home directory from the system properties.
+	 * 
+	 * @return the home
+	 */
+	private static String getHome() {
+		String home = System.getProperty("fanfix.home");
+		if (home != null && new File(home).isFile()) {
+			home = null;
+		}
+
+		if (home == null || home.trim().isEmpty()) {
+			home = System.getProperty("user.home");
+			if (!new File(home).isDirectory()) {
+				home = null;
+			}
+		}
+
+		if (home == null || home.trim().isEmpty()) {
+			home = System.getProperty("java.io.tmpdir");
+			if (!new File(home).isDirectory()) {
+				home = null;
+			}
+		}
+
+		if (home == null) {
+			home = "";
+		}
+
+		return home;
+	}
+
 	/**
 	 * The language to use for the application (NULL = default system language).
 	 *