Use Downloader/Cache from utils

[fanfix.git] / src / be / nikiroo / fanfix / Instance.java

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 42e141e60bcc2dda445c55a77abc26dcd27a7e05..14977822bec55ca032a26e266ac35445ca96c570 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -9,6 +9,8 @@ import be.nikiroo.fanfix.bundles.ConfigBundle;
 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.IOUtils;
 import be.nikiroo.utils.resources.Bundles;
@@ -19,17 +21,57 @@ 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 Cache cache;
-       private static Library lib;
+       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;
+
        static {
                // Most of the rest is dependent upon this:
                config = new ConfigBundle();
@@ -74,7 +116,7 @@ public class Instance {
                uiconfig = new UiConfigBundle();
                trans = new StringIdBundle(getLang());
                try {
-                       lib = new Library(getFile(Config.LIBRARY_DIR),
+                       lib = new LocalLibrary(getFile(Config.LIBRARY_DIR),
                                        OutputType.INFO_TEXT, OutputType.CBZ);
                } catch (Exception e) {
                        syserr(new IOException("Cannot create library for directory: "
@@ -82,6 +124,7 @@ public class Instance {
                }
 
                debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
+               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);
@@ -117,7 +160,7 @@ public class Instance {
                        int hoursLarge = config
                                        .getInteger(Config.CACHE_MAX_TIME_STABLE, -1);
 
-                       cache = new Cache(tmp, ua, hours, hoursLarge);
+                       cache = new DataLoader(tmp, ua, hours, hoursLarge);
                } catch (IOException e) {
                        syserr(new IOException(
                                        "Cannot create cache (will continue without cache)", e));
@@ -143,11 +186,11 @@ public class Instance {
        }
 
        /**
-        * Get the (unique) {@link Cache} for the program.
+        * Get the (unique) {@link DataLoader} for the program.
         * 
-        * @return the {@link Cache}
+        * @return the {@link DataLoader}
         */
-       public static Cache getCache() {
+       public static DataLoader getCache() {
                return cache;
        }
 
@@ -161,11 +204,11 @@ public class Instance {
        }
 
        /**
-        * Get the (unique) {@link Library} for the program.
+        * Get the (unique) {@link LocalLibrary} for the program.
         * 
-        * @return the {@link Library}
+        * @return the {@link LocalLibrary}
         */
-       public static Library getLibrary() {
+       public static BasicLibrary getLibrary() {
                return lib;
        }
 
@@ -189,7 +232,7 @@ public class Instance {
 
        /**
         * Return the directory where to store temporary files for the remote
-        * {@link Library}.
+        * {@link LocalLibrary}.
         * 
         * @param host
         *            the remote for this host
@@ -246,6 +289,26 @@ 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
         * 
@@ -253,10 +316,30 @@ public class Instance {
         *            the {@link Exception} to report
         */
        public static void syserr(Exception e) {
-               if (debug) {
-                       e.printStackTrace();
+               if (syserrHandler != null) {
+                       syserrHandler.notify(e, debug);
                } else {
-                       System.err.println(e.getMessage());
+                       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);
+                       }
                }
        }