X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=94e854aa19536a77e405e3b3223a1958ffdedf82;hp=5c198ee73d9580f50773bfd3fcffe92c9751a3ab;hb=3727aae2b0516c5ed5366cde29544565f1d6c6b0;hpb=89cb07a69f3ee217f9ea6a4284bec0df94ef77fa diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index 5c198ee..94e854a 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -20,6 +20,7 @@ public class Instance { private static Library lib; private static boolean debug; private static File coverDir; + private static File readerTmp; static { config = new ConfigBundle(); @@ -29,6 +30,23 @@ public class Instance { lib = new Library(getFile(Config.LIBRARY_DIR)); debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false); coverDir = getFile(Config.DEFAULT_COVERS_DIR); + File tmp = getFile(Config.CACHE_DIR); + readerTmp = getFile(Config.CACHE_DIR_LOCAL_READER); + + if (tmp == null || readerTmp == null) { + String tmpDir = System.getProperty("java.io.tmpdir"); + if (tmpDir != null) { + if (tmp == null) { + tmp = new File(tmpDir, "fanfic-tmp"); + } + if (readerTmp == null) { + tmp = new File(tmpDir, "fanfic-reader"); + } + } else { + syserr(new IOException( + "The system does not have a default temporary directory")); + } + } if (coverDir != null && !coverDir.exists()) { syserr(new IOException( @@ -71,22 +89,12 @@ public class Instance { } try { - File tmp = getFile(Config.CACHE_DIR); + 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); - if (tmp == null) { - String tmpDir = System.getProperty("java.io.tmpdir"); - if (tmpDir != null) { - tmp = new File(tmpDir, "fanfic-tmp"); - } else { - syserr(new IOException( - "The system does not have a default temporary directory")); - } - } - cache = new Cache(tmp, ua, hours, hoursLarge); } catch (IOException e) { syserr(new IOException( @@ -139,6 +147,15 @@ public class Instance { return coverDir; } + /** + * Return the directory where to store temporary files for the local reader. + * + * @return the directory + */ + public static File getReaderDir() { + return readerTmp; + } + /** * Report an error to the user *