static {
// Before we can configure it:
- tracer = new TraceHandler(true, checkEnv("DEBUG"), false);
+ tracer = new TraceHandler(true, checkEnv("DEBUG"), checkEnv("DEBUG"));
// Most of the rest is dependent upon this:
config = new ConfigBundle();
}
if (configDir == null) {
- configDir = new File(System.getProperty("user.home"), ".fanfix")
- .getPath();
+ configDir = new File(getHome(), ".fanfix").getPath();
}
if (!new File(configDir).exists()) {
// 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);
+ trans.deleteFile(configDir);
}
Bundles.setDirectory(configDir);
if (checkEnv("DEBUG")) {
debug = true;
+ trace = true;
}
tracer = new TraceHandler(true, debug, trace);
if (lib == null) {
tracer.error(new IOException(
- "Cannot create remote library for: "
- + getFile(Config.DEFAULT_LIBRARY)));
+ "Cannot create remote library for: " + remoteLib));
}
}
coverDir = null;
}
+ String ua = config.getString(Config.USER_AGENT);
try {
- String ua = config.getString(Config.USER_AGENT);
int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
int hoursLarge = config
.getInteger(Config.CACHE_MAX_TIME_STABLE, -1);
-
cache = new DataLoader(tmp, ua, hours, hoursLarge);
} catch (IOException e) {
tracer.error(new IOException(
"Cannot create cache (will continue without cache)", e));
+ cache = new DataLoader(ua);
}
+
+ cache.setTraceHandler(tracer);
}
/**
}
Instance.tracer = tracer;
+ cache.setTraceHandler(tracer);
}
/**
return uiconfig;
}
+ /**
+ * Reset the configuration.
+ *
+ * @param resetTrans
+ * also reset the translation files
+ */
+ public static void resetConfig(boolean resetTrans) {
+ String dir = Bundles.getDirectory();
+ Bundles.setDirectory(null);
+ try {
+ try {
+ ConfigBundle config = new ConfigBundle();
+ config.updateFile(configDir);
+ } catch (IOException e) {
+ tracer.error(e);
+ }
+ try {
+ UiConfigBundle uiconfig = new UiConfigBundle();
+ uiconfig.updateFile(configDir);
+ } catch (IOException e) {
+ tracer.error(e);
+ }
+
+ if (resetTrans) {
+ try {
+ StringIdBundle trans = new StringIdBundle(null);
+ trans.updateFile(configDir);
+ } catch (IOException e) {
+ tracer.error(e);
+ }
+ }
+ } finally {
+ Bundles.setDirectory(dir);
+ }
+ }
+
/**
* Get the (unique) {@link DataLoader} for the program.
*
if (path != null && !path.isEmpty()) {
path = path.replace('/', File.separatorChar);
if (path.contains("$HOME")) {
- path = path.replace("$HOME",
- "" + System.getProperty("user.home"));
+ path = path.replace("$HOME", getHome());
}
file = new File(path);
return file;
}
+ /**
+ * Return the home directory from the system properties.
+ *
+ * @return the home
+ */
+ private static String getHome() {
+ String home = System.getProperty("user.home");
+ if (home == null || home.trim().isEmpty()) {
+ home = System.getProperty("java.io.tmpdir");
+ }
+
+ if (home == null) {
+ home = "";
+ }
+
+ return home;
+ }
+
/**
* The language to use for the application (NULL = default system language).
*