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

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 1497782..97e9868 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,13 +6,15 @@ import java.util.Date;
 
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
+import be.nikiroo.fanfix.bundles.StringId;
 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.LocalLibrary;
-import be.nikiroo.fanfix.output.BasicOutput.OutputType;
+import be.nikiroo.utils.Cache;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.TraceHandler;
 import be.nikiroo.utils.resources.Bundles;
 
 /**
@@ -21,56 +23,16 @@ import be.nikiroo.utils.resources.Bundles;
  * @author niki
  */
 public class Instance {
-	/**
-	 * A handler when a recoverable exception was caught by the program.
-	 * 
-	 * @author niki
-	 */
-	public interface SyserrHandler {
-		/**
-		 * An exception happened, log it.
-		 * 
-		 * @param e
-		 *            the exception
-		 * @param showDetails
-		 *            show more details (usually equivalent to the value of
-		 *            DEBUG)
-		 */
-		public void notify(Exception e, boolean showDetails);
-	}
-
-	/**
-	 * A handler when a trace message is sent.
-	 * 
-	 * @author niki
-	 */
-	public interface TraceHandler {
-		/**
-		 * A trace happened, show it.
-		 * <p>
-		 * Will only be called if TRACE is true.
-		 * 
-		 * @param message
-		 *            the trace message
-		 */
-		public void trace(String message);
-	}
-
 	private static ConfigBundle config;
 	private static UiConfigBundle uiconfig;
 	private static StringIdBundle trans;
 	private static DataLoader cache;
 	private static LocalLibrary lib;
-	private static boolean debug;
-	private static boolean trace;
 	private static File coverDir;
 	private static File readerTmp;
 	private static File remoteDir;
 	private static String configDir;
-
-	private static SyserrHandler syserrHandler;
-
-	private static TraceHandler traceHandler;
+	private static TraceHandler tracer;
 
 	static {
 		// Most of the rest is dependent upon this:
@@ -104,31 +66,31 @@ public class Instance {
 		} catch (IOException e) {
 			syserr(e);
 		}
-		try {
-			trans = new StringIdBundle(getLang());
-			trans.updateFile(configDir);
-		} catch (IOException e) {
-			syserr(e);
+
+		// No updateFile for this one! (we do not want the user to have custom
+		// translations that won't accept updates from newer versions)
+		trans = new StringIdBundle(getLang());
+
+		// 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);
 		}
 
 		Bundles.setDirectory(configDir);
 
 		uiconfig = new UiConfigBundle();
 		trans = new StringIdBundle(getLang());
-		try {
-			lib = new LocalLibrary(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);
-		trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE, false);
+		boolean debug = Instance.getConfig()
+				.getBoolean(Config.DEBUG_ERR, false);
+		boolean trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE,
+				false);
 		coverDir = getFile(Config.DEFAULT_COVERS_DIR);
 		File tmp = getFile(Config.CACHE_DIR);
 		readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER);
-		remoteDir = new File(getFile(Config.LIBRARY_DIR), "remote");
+		remoteDir = new File(configDir, "remote");
 
 		if (checkEnv("NOUTF")) {
 			trans.setUnicode(false);
@@ -138,6 +100,17 @@ public class Instance {
 			debug = true;
 		}
 
+		tracer = new TraceHandler();
+		tracer.setShowErrorDetails(debug);
+		tracer.setShowTraces(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));
+		}
+
 		// Could have used: System.getProperty("java.io.tmpdir")
 		if (tmp == null) {
 			tmp = new File(configDir, "tmp");
@@ -167,6 +140,25 @@ public class Instance {
 		}
 	}
 
+	/**
+	 * The traces handler for this {@link Cache}.
+	 * 
+	 * @return the traces handler or NULL
+	 */
+	public static TraceHandler getTraceHandler() {
+		return tracer;
+	}
+
+	/**
+	 * The traces handler for this {@link Cache}.
+	 * 
+	 * @param tracer
+	 *            the new traces handler or NULL
+	 */
+	public static void setTraceHandler(TraceHandler tracer) {
+		Instance.tracer = tracer;
+	}
+
 	/**
 	 * Get the (unique) configuration service for the program.
 	 * 
@@ -209,6 +201,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;
 	}
 
@@ -289,26 +285,6 @@ public class Instance {
 		}
 	}
 
-	/**
-	 * Replace the global syserr handler.
-	 * 
-	 * @param syserrHandler
-	 *            the new syserr handler
-	 */
-	public static void setSyserrHandler(SyserrHandler syserrHandler) {
-		Instance.syserrHandler = syserrHandler;
-	}
-
-	/**
-	 * Replace the global trace handler.
-	 * 
-	 * @param traceHandler
-	 *            the new trace handler
-	 */
-	public static void setTraceHandler(TraceHandler traceHandler) {
-		Instance.traceHandler = traceHandler;
-	}
-
 	/**
 	 * Report an error to the user
 	 * 
@@ -316,14 +292,8 @@ public class Instance {
 	 *            the {@link Exception} to report
 	 */
 	public static void syserr(Exception e) {
-		if (syserrHandler != null) {
-			syserrHandler.notify(e, debug);
-		} else {
-			if (debug) {
-				e.printStackTrace();
-			} else {
-				System.err.println(e.getMessage());
-			}
+		if (tracer != null) {
+			tracer.error(e);
 		}
 	}
 
@@ -334,12 +304,8 @@ public class Instance {
 	 *            the message
 	 */
 	public static void trace(String message) {
-		if (trace) {
-			if (traceHandler != null) {
-				traceHandler.trace(message);
-			} else {
-				System.out.println(message);
-			}
+		if (tracer != null) {
+			tracer.trace(message);
 		}
 	}