From 581d42c09b2673025e719a25477565362ebf4482 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 26 Nov 2017 20:39:39 +0100 Subject: [PATCH] Fix the traces handler system --- ...es.jar => nikiroo-utils-2.2.3-sources.jar} | Bin 260060 -> 260661 bytes src/be/nikiroo/fanfix/Instance.java | 111 ++++++------------ .../fanfix/reader/TuiReaderApplication.java | 21 +--- .../fanfix/supported/FimfictionApi.java | 1 + src/be/nikiroo/fanfix/test/Test.java | 2 + 5 files changed, 40 insertions(+), 95 deletions(-) rename libs/{nikiroo-utils-2.2.2-sources.jar => nikiroo-utils-2.2.3-sources.jar} (95%) 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 318670fd7d1ef25318a10d5eeddfb1fcc7914f23..55e697f78d6e10fd86287141f04ed0be09b162da 100644 GIT binary patch delta 7580 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 a$2sg9{fl77vIJRzZfHOt`dQ#{O#UB!crBR# delta 7087 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 BBBTHS 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. - *

- * 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)); } -- 2.27.0