Revert "Revert "fix some default paths""

[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 2479c612dc45b97cf224158c36640c88721ecc42..74221b00916e499f3a2cbfdf41d6e1b65aa2fbf4 100644 (file)
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -93,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) {
@@ -108,13 +108,13 @@ 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, 0);
                        int hoursLarge = config.getInteger(Config.CACHE_MAX_TIME_STABLE, 0);
@@ -128,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");
@@ -331,8 +325,8 @@ public class Instance {
         */
        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"));
@@ -376,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");
@@ -463,9 +453,12 @@ public class Instance {
 
                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");
+                               if (!getFile(libDir).isAbsolute()) {
+                                       libDir = new File(configDir, libDir).getPath();
+                               }
                        }
                        try {
                                lib = new LocalLibrary(getFile(libDir));
@@ -513,8 +506,13 @@ 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);
+               if (path != null && path.isEmpty()) {
+                       path = def.getPath();
+               }
+
+               return getFile(path);
        }
 
        /**
@@ -522,8 +520,13 @@ 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);
+               if (path != null && path.isEmpty()) {
+                       path = def.getPath();
+               }
+
+               return getFile(path);
        }
 
        /**
@@ -546,16 +549,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.
+        * <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()) {