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) {
}
Image.setTemporaryFilesRoot(new File(tmp.getParent(), "tmp.images"));
- String ua = config.getString(Config.USER_AGENT, "");
+ String ua = config.getString(Config.NETWORK_USER_AGENT, "");
try {
int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, 0);
int hoursLarge = config.getInteger(Config.CACHE_MAX_TIME_STABLE, 0);
*/
public static boolean isVersionCheckNeeded() {
try {
- long wait = config.getInteger(Config.UPDATE_INTERVAL, 0) * 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"));
}
/**
- * 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");
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();
+ }
}
try {
lib = new LocalLibrary(getFile(libDir));
* @return the path
*/
private static File getFile(Config id, File def) {
- String path = config.getString(id);
- if (path != null && path.isEmpty()) {
- path = def.getPath();
- }
-
+ String path = config.getString(id, def.getPath());
return getFile(path);
}
* @return the path
*/
private static File getFile(UiConfig id, File def) {
- String path = uiconfig.getString(id);
- if (path != null && path.isEmpty()) {
- path = def.getPath();
- }
-
+ String path = uiconfig.getString(id, def.getPath());
return getFile(path);
}