From: Niki Roo <niki@nikiroo.be>
Date: Sun, 26 Nov 2017 19:39:39 +0000 (+0100)
Subject: Fix the traces handler system
X-Git-Tag: fanfix-swing-0.0.1~12^2~407
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=581d42c09b2673025e719a25477565362ebf4482;p=fanfix-swing.git

Fix the traces handler system
---

diff --git a/libs/nikiroo-utils-2.2.2-sources.jar b/libs/nikiroo-utils-2.2.3-sources.jar
similarity index 95%
rename from libs/nikiroo-utils-2.2.2-sources.jar
rename to libs/nikiroo-utils-2.2.3-sources.jar
index 318670fd..55e697f7 100644
Binary files a/libs/nikiroo-utils-2.2.2-sources.jar and b/libs/nikiroo-utils-2.2.3-sources.jar differ
diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index df990d7f..c48b1190 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -12,7 +12,9 @@ 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.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:
@@ -127,8 +89,10 @@ public class Instance {
 					+ 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);
@@ -142,6 +106,10 @@ public class Instance {
 			debug = true;
 		}
 
+		tracer = new TraceHandler();
+		tracer.setShowErrorDetails(debug);
+		tracer.setShowTraces(trace);
+
 		// Could have used: System.getProperty("java.io.tmpdir")
 		if (tmp == null) {
 			tmp = new File(configDir, "tmp");
@@ -171,6 +139,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.
 	 * 
@@ -293,26 +280,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
 	 * 
@@ -320,14 +287,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);
 		}
 	}
 
@@ -338,12 +299,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);
 		}
 	}
 
diff --git a/src/be/nikiroo/fanfix/reader/TuiReaderApplication.java b/src/be/nikiroo/fanfix/reader/TuiReaderApplication.java
index fd585092..c1bba5a8 100644
--- a/src/be/nikiroo/fanfix/reader/TuiReaderApplication.java
+++ b/src/be/nikiroo/fanfix/reader/TuiReaderApplication.java
@@ -14,8 +14,6 @@ import jexer.TWindow;
 import jexer.event.TMenuEvent;
 import jexer.menu.TMenu;
 import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.Instance.SyserrHandler;
-import be.nikiroo.fanfix.Instance.TraceHandler;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
@@ -140,21 +138,8 @@ class TuiReaderApplication extends TApplication implements Reader {
 	private void init(Reader reader) {
 		this.reader = reader;
 
-		// Do not allow traces/debug to pollute the screen:
-		Instance.setSyserrHandler(new SyserrHandler() {
-			@Override
-			public void notify(Exception e, boolean showDetails) {
-				// TODO
-			}
-		});
-
-		Instance.setTraceHandler(new TraceHandler() {
-			@Override
-			public void trace(String message) {
-				// TODO
-			}
-		});
-		//
+		// TODO: traces/errors?
+		Instance.setTraceHandler(null);
 
 		// Add the menus TODO: i18n
 		TMenu fileMenu = addMenu("&File");
@@ -188,7 +173,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 		case MENU_EXIT:
 			if (messageBox("Confirmation", "(TODO: i18n) Exit application?",
 					TMessageBox.Type.YESNO).getResult() == TMessageBox.Result.YES) {
-				//exit(false);
+				// exit(false);
 			}
 
 			return true;
diff --git a/src/be/nikiroo/fanfix/supported/FimfictionApi.java b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
index 3319bbee..ee436f16 100644
--- a/src/be/nikiroo/fanfix/supported/FimfictionApi.java
+++ b/src/be/nikiroo/fanfix/supported/FimfictionApi.java
@@ -254,6 +254,7 @@ class FimfictionApi extends BasicSupport {
 				null, null);
 
 		String jsonToken = IOUtils.readSmallStream(in);
+		in.close();
 
 		// Extract token type and token from: {
 		// token_type = "Bearer",
diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index e0832b14..0dc544b8 100644
--- a/src/be/nikiroo/fanfix/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java
@@ -5,6 +5,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.resources.Bundles;
@@ -18,6 +19,7 @@ import be.nikiroo.utils.test.TestLauncher;
 public class Test extends TestLauncher {
 	public Test(String[] args) {
 		super("Fanfix", args);
+		Instance.setTraceHandler(null);
 		addSeries(new BasicSupportTest(args));
 		addSeries(new LibraryTest(args));
 	}