X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=f9060f440b5e2cc9fecd95090508bfd45d692291;hp=ea66aec0d1b3c7fcedc65dfc31366e29a9b67708;hb=68e2c6d20049d713de1bd31b749450b2f60d8340;hpb=948637bc8cc1dcf76f783870cf46f71794a9805d diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index ea66aec..f9060f4 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -2,10 +2,15 @@ package be.nikiroo.fanfix; import java.io.File; import java.io.IOException; +import java.util.Date; import be.nikiroo.fanfix.bundles.Config; import be.nikiroo.fanfix.bundles.ConfigBundle; import be.nikiroo.fanfix.bundles.StringIdBundle; +import be.nikiroo.fanfix.bundles.UiConfig; +import be.nikiroo.fanfix.bundles.UiConfigBundle; +import be.nikiroo.fanfix.output.BasicOutput.OutputType; +import be.nikiroo.utils.IOUtils; import be.nikiroo.utils.resources.Bundles; /** @@ -15,23 +20,72 @@ import be.nikiroo.utils.resources.Bundles; */ public class Instance { private static ConfigBundle config; + private static UiConfigBundle uiconfig; private static StringIdBundle trans; private static Cache cache; - private static Library lib; + private static LocalLibrary lib; private static boolean debug; private static File coverDir; private static File readerTmp; + private static File remoteDir; + private static String configDir; static { // Most of the rest is dependent upon this: config = new ConfigBundle(); + configDir = System.getProperty("CONFIG_DIR"); + if (configDir == null) { + configDir = System.getenv("CONFIG_DIR"); + } + + if (configDir == null) { + configDir = new File(System.getProperty("user.home"), ".fanfix") + .getPath(); + } + + if (!new File(configDir).exists()) { + new File(configDir).mkdirs(); + } else { + Bundles.setDirectory(configDir); + } + + try { + config = new ConfigBundle(); + config.updateFile(configDir); + } catch (IOException e) { + syserr(e); + } + try { + uiconfig = new UiConfigBundle(); + uiconfig.updateFile(configDir); + } catch (IOException e) { + syserr(e); + } + try { + trans = new StringIdBundle(getLang()); + trans.updateFile(configDir); + } catch (IOException e) { + syserr(e); + } + + Bundles.setDirectory(configDir); + + uiconfig = new UiConfigBundle(); trans = new StringIdBundle(getLang()); - lib = new Library(getFile(Config.LIBRARY_DIR)); + try { + lib = new LocalLibrary(getFile(Config.LIBRARY_DIR), + OutputType.INFO_TEXT, OutputType.CBZ); + } catch (Exception e) { + syserr(new IOException("Cannot create library for directory: " + + getFile(Config.LIBRARY_DIR), e)); + } + 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); + readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER); + remoteDir = new File(getFile(Config.LIBRARY_DIR), "remote"); if (checkEnv("NOUTF")) { trans.setUnicode(false); @@ -41,20 +95,14 @@ public class Instance { debug = true; } - 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) { - readerTmp = new File(tmpDir, "fanfic-reader"); - } - } else { - syserr(new IOException( - "The system does not have a default temporary directory")); - } + // Could have used: System.getProperty("java.io.tmpdir") + if (tmp == null) { + tmp = new File(configDir, "tmp"); } + if (readerTmp == null) { + readerTmp = new File(configDir, "tmp-reader"); + } + // if (coverDir != null && !coverDir.exists()) { syserr(new IOException( @@ -63,34 +111,6 @@ public class Instance { coverDir = null; } - String configDir = System.getenv("CONFIG_DIR"); - if (configDir == null) { - configDir = new File(System.getProperty("user.home"), ".fanfix") - .getPath(); - } - if (configDir != null) { - if (!new File(configDir).exists()) { - new File(configDir).mkdirs(); - } else { - Bundles.setDirectory(configDir); - } - - try { - config = new ConfigBundle(); - config.updateFile(configDir); - } catch (IOException e) { - syserr(e); - } - try { - trans = new StringIdBundle(getLang()); - trans.updateFile(configDir); - } catch (IOException e) { - syserr(e); - } - - Bundles.setDirectory(configDir); - } - try { String ua = config.getString(Config.USER_AGENT); int hours = config.getInteger(Config.CACHE_MAX_TIME_CHANGING, -1); @@ -113,6 +133,15 @@ public class Instance { return config; } + /** + * Get the (unique) UI configuration service for the program. + * + * @return the configuration service + */ + public static UiConfigBundle getUiConfig() { + return uiconfig; + } + /** * Get the (unique) {@link Cache} for the program. * @@ -124,7 +153,7 @@ public class Instance { /** * Get the (unique) {link StringIdBundle} for the program. - * + * * @return the {link StringIdBundle} */ public static StringIdBundle getTrans() { @@ -132,11 +161,11 @@ public class Instance { } /** - * Get the (unique) {@link Library} for the program. + * Get the (unique) {@link LocalLibrary} for the program. * - * @return the {@link Library} + * @return the {@link LocalLibrary} */ - public static Library getLibrary() { + public static BasicLibrary getLibrary() { return lib; } @@ -158,6 +187,65 @@ public class Instance { return readerTmp; } + /** + * Return the directory where to store temporary files for the remote + * {@link LocalLibrary}. + * + * @param host + * the remote for this host + * + * @return the directory + */ + public static File getRemoteDir(String host) { + remoteDir.mkdirs(); + + if (host != null) { + return new File(remoteDir, host); + } + + return remoteDir; + } + + /** + * Check if we need to check that a new version of Fanfix is available. + * + * @return TRUE if we need to + */ + public static boolean isVersionCheckNeeded() { + try { + long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60 + * 60 * 1000; + if (wait >= 0) { + String lastUpString = IOUtils.readSmallFile(new File(configDir, + "LAST_UPDATE")); + long delay = new Date().getTime() + - Long.parseLong(lastUpString); + if (delay > wait) { + return true; + } + } else { + return false; + } + } catch (Exception e) { + // No file or bad file: + return true; + } + + return false; + } + + /** + * Notify that we checked for a new version of Fanfix. + */ + public static void setVersionChecked() { + try { + IOUtils.writeSmallFile(new File(configDir), "LAST_UPDATE", + Long.toString(new Date().getTime())); + } catch (IOException e) { + syserr(e); + } + } + /** * Report an error to the user * @@ -178,8 +266,25 @@ public class Instance { * @return the path */ private static File getFile(Config id) { + return getFile(config.getString(id)); + } + + /** + * Return a path, but support the special $HOME variable. + * + * @return the path + */ + private static File getFile(UiConfig id) { + return getFile(uiconfig.getString(id)); + } + + /** + * Return a path, but support the special $HOME variable. + * + * @return the path + */ + private static File getFile(String path) { File file = null; - String path = config.getString(id); if (path != null && !path.isEmpty()) { path = path.replace('/', File.separatorChar); if (path.contains("$HOME")) {