Update nikiroo-utils, remove Instance.syserr/trace
[nikiroo-utils.git] / src / be / nikiroo / fanfix / Instance.java
index df990d7f3b1431aabc81c3a3d6ceabaa91a21a94..ef0ba15ec6ac4d1766e82a4265567f10a231253f 100644 (file)
@@ -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,58 +23,21 @@ 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 {
+               // Before we can configure it:
+               tracer = new TraceHandler(true, checkEnv("DEBUG"), false);
+
                // Most of the rest is dependent upon this:
                config = new ConfigBundle();
 
@@ -96,13 +61,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
@@ -120,15 +85,11 @@ public class Instance {
 
                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));
-               }
 
-               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 +103,16 @@ public class Instance {
                        debug = true;
                }
 
+               tracer = new TraceHandler(true, debug, trace);
+
+               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));
+               }
+
                // Could have used: System.getProperty("java.io.tmpdir")
                if (tmp == null) {
                        tmp = new File(configDir, "tmp");
@@ -152,7 +123,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;
@@ -166,11 +137,36 @@ 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 (never 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) {
+               if (tracer == null) {
+                       tracer = new TraceHandler(false, false, false);
+               }
+
+               Instance.tracer = tracer;
+       }
+
        /**
         * Get the (unique) configuration service for the program.
         * 
@@ -213,6 +209,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,61 +289,7 @@ public class Instance {
                        IOUtils.writeSmallFile(new File(configDir), "LAST_UPDATE",
                                        Long.toString(new Date().getTime()));
                } catch (IOException e) {
-                       syserr(e);
-               }
-       }
-
-       /**
-        * 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
-        * 
-        * @param e
-        *            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());
-                       }
-               }
-       }
-
-       /**
-        * Notify of a debug message.
-        * 
-        * @param message
-        *            the message
-        */
-       public static void trace(String message) {
-               if (trace) {
-                       if (traceHandler != null) {
-                               traceHandler.trace(message);
-                       } else {
-                               System.out.println(message);
-                       }
+                       tracer.error(e);
                }
        }