Fix name of imported cbz, fix library check

[nikiroo-utils.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..97e9868b8858ad2475b96cb7f51df3ae50d04683 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -6,11 +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.output.BasicOutput.OutputType;
+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;
 
 /**
@@ -22,13 +26,13 @@ public class Instance {
        private static ConfigBundle config;
        private static UiConfigBundle uiconfig;
        private static StringIdBundle trans;
-       private static Cache cache;
-       private static Library lib;
-       private static boolean debug;
+       private static DataLoader cache;
+       private static LocalLibrary lib;
        private static File coverDir;
        private static File readerTmp;
        private static File remoteDir;
        private static String configDir;
+       private static TraceHandler tracer;
 
        static {
                // Most of the rest is dependent upon this:
@@ -62,30 +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 Library(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);
+               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);
@@ -95,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");
@@ -117,13 +133,32 @@ 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));
                }
        }
 
+       /**
+        * 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.
         * 
@@ -143,11 +178,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 +196,15 @@ 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() {
+               if (lib == null) {
+                       throw new NullPointerException("We don't have a library to return");
+               }
+
                return lib;
        }
 
@@ -189,7 +228,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
@@ -253,10 +292,20 @@ public class Instance {
         *            the {@link Exception} to report
         */
        public static void syserr(Exception e) {
-               if (debug) {
-                       e.printStackTrace();
-               } else {
-                       System.err.println(e.getMessage());
+               if (tracer != null) {
+                       tracer.error(e);
+               }
+       }
+
+       /**
+        * Notify of a debug message.
+        * 
+        * @param message
+        *            the message
+        */
+       public static void trace(String message) {
+               if (tracer != null) {
+                       tracer.trace(message);
                }
        }