+ * 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 force. + *
+ * Before calling this method, you may call + * {@link Bundles#setDirectory(String)} if wanted. + *
+ * 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 + * force 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; @@ -58,7 +93,7 @@ public class Instance { createConfigs(configDir, false); // Proxy support - Proxy.use(Instance.getConfig().getString(Config.USE_PROXY)); + Proxy.use(Instance.getConfig().getString(Config.NETWORK_PROXY)); // update tracer: if (debug == null) { @@ -73,17 +108,16 @@ public class Instance { lib = createDefaultLibrary(remoteDir); // create cache and TMP - Image.setTemporaryFilesRoot(new File(configDir, "tmp.images")); - File tmp = getFile(Config.CACHE_DIR); - if (tmp == null) { - // Could have used: System.getProperty("java.io.tmpdir") - tmp = new File(configDir, "tmp"); + File tmp = getFile(Config.CACHE_DIR, new File(configDir, "tmp")); + if (!tmp.isAbsolute()) { + tmp = new File(configDir, tmp.getPath()); } - String ua = config.getString(Config.USER_AGENT); + Image.setTemporaryFilesRoot(new File(tmp.getParent(), "tmp.images")); + + String ua = config.getString(Config.NETWORK_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( @@ -94,18 +128,12 @@ public class Instance { cache.setTraceHandler(tracer); // readerTmp / coverDir - readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER); - if (readerTmp == null) { - readerTmp = new File(configDir, "tmp-reader"); - } + readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER, new File( + configDir, "tmp-reader")); - coverDir = getFile(Config.DEFAULT_COVERS_DIR); - if (coverDir != null && !coverDir.exists()) { - tracer.error(new IOException( - "The 'default covers' directory does not exists: " - + coverDir)); - coverDir = null; - } + coverDir = getFile(Config.DEFAULT_COVERS_DIR, new File(configDir, + "covers")); + coverDir.mkdirs(); try { tempFiles = new TempFiles("fanfix"); @@ -297,8 +325,8 @@ public class Instance { */ public static boolean isVersionCheckNeeded() { try { - long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60 - * 60 * 1000; + long wait = config.getInteger(Config.NETWORK_UPDATE_INTERVAL, 0) + * 24 * 60 * 60 * 1000; if (wait >= 0) { String lastUpString = IOUtils.readSmallFile(new File(configDir, "LAST_UPDATE")); @@ -342,18 +370,14 @@ public class Instance { } /** - * The configuration directory (will check, in order of preference, - * {@link Bundles#getDirectory()}, the system properties, the environment - * and then defaults to $HOME/.fanfix). + * The configuration directory (will check, in order of preference, the + * system properties, the environment and then defaults to + * {@link Instance#getHome()}/.fanfix). * * @return the config directory */ private static String getConfigDir() { - String configDir = Bundles.getDirectory(); - - if (configDir == null) { - configDir = System.getProperty("CONFIG_DIR"); - } + String configDir = System.getProperty("CONFIG_DIR"); if (configDir == null) { configDir = System.getenv("CONFIG_DIR"); @@ -427,45 +451,39 @@ public class Instance { private static BasicLibrary createDefaultLibrary(File remoteDir) { BasicLibrary lib = null; - String remoteLib = config.getString(Config.DEFAULT_LIBRARY); - if (remoteLib == null || remoteLib.trim().isEmpty()) { - String libDir = System.getProperty("fanfix.libdir"); - if (libDir == null || libDir.isEmpty()) { - libDir = config.getString(Config.LIBRARY_DIR); - } + boolean useRemote = config.getBoolean(Config.REMOTE_LIBRARY_ENABLED, + false); + + if (useRemote) { + String host = null; + int port = -1; try { - lib = new LocalLibrary(getFile(libDir)); + host = config.getString(Config.REMOTE_LIBRARY_HOST); + port = config.getInteger(Config.REMOTE_LIBRARY_PORT, -1); + String key = config.getString(Config.REMOTE_LIBRARY_KEY); + + tracer.trace("Selecting remote library " + host + ":" + port); + lib = new RemoteLibrary(key, host, port); + lib = new CacheLibrary(getRemoteDir(remoteDir, host), lib); } catch (Exception e) { tracer.error(new IOException( - "Cannot create library for directory: " - + getFile(libDir), e)); + "Cannot create remote library for: " + host + ":" + + port, e)); } } else { - int pos = remoteLib.lastIndexOf(":"); - if (pos >= 0) { - String port = remoteLib.substring(pos + 1).trim(); - remoteLib = remoteLib.substring(0, pos); - pos = remoteLib.lastIndexOf(":"); - if (pos >= 0) { - String host = remoteLib.substring(pos + 1).trim(); - String key = remoteLib.substring(0, pos).trim(); - - try { - tracer.trace("Selecting remote library " + host + ":" - + port); - lib = new RemoteLibrary(key, host, - Integer.parseInt(port)); - lib = new CacheLibrary(getRemoteDir(remoteDir, host), - lib); - - } catch (Exception e) { - } + String libDir = System.getenv("BOOKS_DIR"); + if (libDir == null || libDir.isEmpty()) { + libDir = config.getString(Config.LIBRARY_DIR, "$HOME/Books"); + if (!getFile(libDir).isAbsolute()) { + libDir = new File(configDir, libDir).getPath(); } } - - if (lib == null) { + try { + lib = new LocalLibrary(getFile(libDir)); + } catch (Exception e) { tracer.error(new IOException( - "Cannot create remote library for: " + remoteLib)); + "Cannot create library for directory: " + + getFile(libDir), e)); } } @@ -477,8 +495,9 @@ public class Instance { * * @return the path */ - private static File getFile(Config id) { - return getFile(config.getString(id)); + private static File getFile(Config id, File def) { + String path = config.getString(id, def.getPath()); + return getFile(path); } /** @@ -486,8 +505,9 @@ public class Instance { * * @return the path */ - private static File getFile(UiConfig id) { - return getFile(uiconfig.getString(id)); + private static File getFile(UiConfig id, File def) { + String path = uiconfig.getString(id, def.getPath()); + return getFile(path); } /** @@ -510,16 +530,28 @@ public class Instance { } /** - * Return the home directory from the system properties. + * Return the home directory from the environment (FANFIX_DIR) or the system + * properties. + *
+ * The environment variable is tested first. Then, the custom property + * "fanfix.home" is tried, followed by the usual "user.home" then + * "java.io.tmp" if nothing else is found. * * @return the home */ private static String getHome() { - String home = System.getProperty("fanfix.home"); + String home = System.getenv("FANFIX_DIR"); if (home != null && new File(home).isFile()) { home = null; } + if (home == null || home.trim().isEmpty()) { + home = System.getProperty("fanfix.home"); + if (home != null && new File(home).isFile()) { + home = null; + } + } + if (home == null || home.trim().isEmpty()) { home = System.getProperty("user.home"); if (!new File(home).isDirectory()) {