import be.nikiroo.fanfix.library.RemoteLibrary;
import be.nikiroo.utils.Cache;
import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Proxy;
import be.nikiroo.utils.TempFiles;
import be.nikiroo.utils.TraceHandler;
import be.nikiroo.utils.resources.Bundles;
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:
- tracer = new TraceHandler(true, checkEnv("DEBUG"), checkEnv("DEBUG"));
+ Boolean debug = checkEnv("DEBUG");
+ boolean trace = debug != null && debug;
+ tracer = new TraceHandler(true, trace, trace);
// config dir:
configDir = getConfigDir();
// Most of the rest is dependent upon this:
createConfigs(configDir, false);
-
+
// Proxy support
- // TODO: include new nikiroo-utils version
- // Proxy.use(Instance.getConfig().getString(Config.USE_PROXY));
+ Proxy.use(Instance.getConfig().getString(Config.NETWORK_PROXY));
// update tracer:
- boolean debug = Instance.getConfig()
- .getBoolean(Config.DEBUG_ERR, false);
- boolean trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE,
- false);
-
- if (checkEnv("DEBUG")) {
- debug = true;
- trace = true;
+ if (debug == null) {
+ debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false);
+ trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE, false);
}
tracer = new TraceHandler(true, debug, trace);
remoteDir = new File(configDir, "remote");
lib = createDefaultLibrary(remoteDir);
- // create cache
- File tmp = getFile(Config.CACHE_DIR);
- if (tmp == null) {
- // Could have used: System.getProperty("java.io.tmpdir")
- tmp = new File(configDir, "tmp");
+ // create cache and 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(
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");
*/
public static boolean isVersionCheckNeeded() {
try {
- long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60
+ long wait = config.getInteger(Config.NETWORK_UPDATE_INTERVAL, 0) * 24 * 60
* 60 * 1000;
if (wait >= 0) {
String lastUpString = IOUtils.readSmallFile(new File(configDir,
trans.deleteFile(configDir);
}
- if (checkEnv("NOUTF")) {
+ Boolean noutf = checkEnv("NOUTF");
+ if (noutf != null && noutf) {
trans.setUnicode(false);
transGui.setUnicode(false);
}
String remoteLib = config.getString(Config.DEFAULT_LIBRARY);
if (remoteLib == null || remoteLib.trim().isEmpty()) {
- String libDir = System.getProperty("fanfix.libdir");
+ String libDir = System.getenv("BOOKS_DIR");
if (libDir == null || libDir.isEmpty()) {
- libDir = config.getString(Config.LIBRARY_DIR);
+ libDir = config.getString(Config.LIBRARY_DIR, "$HOME/Books");
}
try {
lib = new LocalLibrary(getFile(libDir));
+ getFile(libDir), e));
}
} else {
+ Exception ex = null;
int pos = remoteLib.lastIndexOf(":");
if (pos >= 0) {
String port = remoteLib.substring(pos + 1).trim();
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));
}
}
*
* @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);
+ if (path != null && path.isEmpty()) {
+ path = def.getPath();
+ }
+
+ return getFile(path);
}
/**
*
* @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);
+ if (path != null && path.isEmpty()) {
+ path = def.getPath();
+ }
+
+ return getFile(path);
}
/**
}
/**
- * Return the home directory from the system properties.
+ * Return the home directory from the environment (FANFIX_DIR) or the system
+ * properties.
+ * <p>
+ * 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()) {
private static String getLang() {
String lang = config.getString(Config.LANG);
- if (lang == null | lang.isEmpty()) {
+ if (lang == null || lang.isEmpty()) {
if (System.getenv("LANG") != null
&& !System.getenv("LANG").isEmpty()) {
lang = System.getenv("LANG");
*
* @return TRUE if it is
*/
- private static boolean checkEnv(String key) {
+ private static Boolean checkEnv(String key) {
String value = System.getenv(key);
if (value != null) {
value = value.trim().toLowerCase();
|| "y".equals(value)) {
return true;
}
+
+ return false;
}
- return false;
+ return null;
}
}
git://git.nikiroo.be / nikiroo-utils.git / blobdiff