change config bundle to better work with new nikiroo-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 b6849c279dd298f3b1d1f139367c613a87d9c980..2479c612dc45b97cf224158c36640c88721ecc42 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -42,7 +42,42 @@ public class Instance {
        private static TraceHandler tracer;
        private static TempFiles tempFiles;
 
-       static {
+       private static boolean init;
+
+       /**
+        * Initialise the instance -- if already initialised, nothing will happen.
+        * <p>
+        * Before calling this method, you may call
+        * {@link Bundles#setDirectory(String)} if wanted.
+        */
+       static public void init() {
+               init(false);
+       }
+
+       /**
+        * Initialise the instance -- if already initialised, nothing will happen
+        * unless you pass TRUE to <tt>force</tt>.
+        * <p>
+        * Before calling this method, you may call
+        * {@link Bundles#setDirectory(String)} if wanted.
+        * <p>
+        * Note: forcing the initialisation can be dangerous, so make sure to only
+        * make it under controlled circumstances -- for instance, at the start of
+        * the program, you could call {@link Instance#init()}, change some settings
+        * because you want to force those settings (it will also forbid users to
+        * change them!) and then call {@link Instance#init(boolean)} with
+        * <tt>force</tt> set to TRUE.
+        * 
+        * @param force
+        *            force the initialisation even if already initialised
+        */
+       static public void init(boolean force) {
+               if (init && !force) {
+                       return;
+               }
+
+               init = true;
+
                // Before we can configure it:
                Boolean debug = checkEnv("DEBUG");
                boolean trace = debug != null && debug;
@@ -79,11 +114,10 @@ public class Instance {
                        // Could have used: System.getProperty("java.io.tmpdir")
                        tmp = new File(configDir, "tmp");
                }
-               String ua = config.getString(Config.USER_AGENT);
+               String ua = config.getString(Config.USER_AGENT, "");
                try {
-                       int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
-                       int hoursLarge = config
-                                       .getInteger(Config.CACHE_MAX_TIME_STABLE, -1);
+                       int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, 0);
+                       int hoursLarge = config.getInteger(Config.CACHE_MAX_TIME_STABLE, 0);
                        cache = new DataLoader(tmp, ua, hours, hoursLarge);
                } catch (IOException e) {
                        tracer.error(new IOException(
@@ -297,7 +331,7 @@ public class Instance {
         */
        public static boolean isVersionCheckNeeded() {
                try {
-                       long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60
+                       long wait = config.getInteger(Config.UPDATE_INTERVAL, 0) * 24 * 60
                                        * 60 * 1000;
                        if (wait >= 0) {
                                String lastUpString = IOUtils.readSmallFile(new File(configDir,
@@ -441,6 +475,7 @@ public class Instance {
                                                                + getFile(libDir), e));
                        }
                } else {
+                       Exception ex = null;
                        int pos = remoteLib.lastIndexOf(":");
                        if (pos >= 0) {
                                String port = remoteLib.substring(pos + 1).trim();
@@ -459,13 +494,14 @@ public class Instance {
                                                                lib);
 
                                        } catch (Exception e) {
+                                               ex = e;
                                        }
                                }
                        }
 
                        if (lib == null) {
                                tracer.error(new IOException(
-                                               "Cannot create remote library for: " + remoteLib));
+                                               "Cannot create remote library for: " + remoteLib, ex));
                        }
                }