X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=4dde3fa642b8cfaae5265250e86606b494ec0328;hb=16a81ef7656c5c692fb831927e75edde25dd77a0;hp=97e9868b8858ad2475b96cb7f51df3ae50d04683;hpb=778d8d85f288c7b67c1a5156e5aedfc944997be0;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 97e9868..4dde3fa 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"), false);
+
 		// Most of the rest is dependent upon this:
 		config = new ConfigBundle();
 
@@ -58,13 +63,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
@@ -100,15 +105,44 @@ public class Instance {
 			debug = true;
 		}
 
-		tracer = new TraceHandler();
-		tracer.setShowErrorDetails(debug);
-		tracer.setShowTraces(trace);
+		tracer = new TraceHandler(true, debug, trace);
 
-		try {
-			lib = new LocalLibrary(getFile(Config.LIBRARY_DIR));
-		} catch (Exception e) {
-			syserr(new IOException("Cannot create library for directory: "
-					+ getFile(Config.LIBRARY_DIR), e));
+		String remoteLib = config.getString(Config.DEFAULT_LIBRARY);
+		if (remoteLib == null || remoteLib.trim().isEmpty()) {
+			try {
+				lib = new LocalLibrary(getFile(Config.LIBRARY_DIR));
+			} catch (Exception e) {
+				tracer.error(new IOException(
+						"Cannot create library for directory: "
+								+ getFile(Config.LIBRARY_DIR), 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: "
+								+ getFile(Config.DEFAULT_LIBRARY)));
+			}
 		}
 
 		// Could have used: System.getProperty("java.io.tmpdir")
@@ -121,7 +155,7 @@ 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;
@@ -135,15 +169,17 @@ public class Instance {
 
 			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));
 		}
 	}
 
 	/**
 	 * 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;
@@ -156,6 +192,10 @@ 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;
 	}
 
@@ -281,34 +321,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.
 	 *