X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=ef0ba15ec6ac4d1766e82a4265567f10a231253f;hb=62c63b0724f4bc45999cb2e7186b4b3ada479a0a;hp=aacf0c50860064a0f980077ad641ab36aa5d837d;hpb=68e370a441d8e6b10bfaa904ecacb29e7d6160d8;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index aacf0c5..ef0ba15 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -2,13 +2,19 @@ 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.StringId; 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.fanfix.library.BasicLibrary; +import be.nikiroo.fanfix.library.LocalLibrary; +import be.nikiroo.utils.Cache; +import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.TraceHandler; import be.nikiroo.utils.resources.Bundles; /** @@ -20,64 +26,74 @@ 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 boolean debug; + private static DataLoader cache; + private static LocalLibrary lib; private static File coverDir; private static File readerTmp; + private static File remoteDir; + private static String configDir; + private static TraceHandler tracer; static { + // Before we can configure it: + tracer = new TraceHandler(true, checkEnv("DEBUG"), false); + // Most of the rest is dependent upon this: config = new ConfigBundle(); - String configDir = System.getenv("CONFIG_DIR"); + 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 (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 { - uiconfig = new UiConfigBundle(); - uiconfig.updateFile(configDir); - } catch (IOException e) { - syserr(e); - } - try { - trans = new StringIdBundle(getLang()); - trans.updateFile(configDir); - } catch (IOException e) { - syserr(e); - } + if (!new File(configDir).exists()) { + new File(configDir).mkdirs(); + } else { Bundles.setDirectory(configDir); } - uiconfig = new UiConfigBundle(); - trans = new StringIdBundle(getLang()); try { - lib = new Library(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)); + config = new ConfigBundle(); + config.updateFile(configDir); + } catch (IOException e) { + tracer.error(e); + } + try { + uiconfig = new UiConfigBundle(); + uiconfig.updateFile(configDir); + } catch (IOException e) { + tracer.error(e); } - debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, false); + // No updateFile for this one! (we do not want the user to have custom + // translations that won't accept updates from newer versions) + trans = new StringIdBundle(getLang()); + + // 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); + } + + Bundles.setDirectory(configDir); + + uiconfig = new UiConfigBundle(); + trans = new StringIdBundle(getLang()); + + boolean debug = Instance.getConfig() + .getBoolean(Config.DEBUG_ERR, false); + boolean trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE, + false); coverDir = getFile(Config.DEFAULT_COVERS_DIR); File tmp = getFile(Config.CACHE_DIR); readerTmp = getFile(UiConfig.CACHE_DIR_LOCAL_READER); + remoteDir = new File(configDir, "remote"); if (checkEnv("NOUTF")) { trans.setUnicode(false); @@ -87,6 +103,16 @@ public class Instance { debug = true; } + tracer = new TraceHandler(true, debug, trace); + + try { + lib = new LocalLibrary(getFile(Config.LIBRARY_DIR)); + } catch (Exception e) { + tracer.error(new IOException( + "Cannot create library for directory: " + + getFile(Config.LIBRARY_DIR), e)); + } + // Could have used: System.getProperty("java.io.tmpdir") if (tmp == null) { tmp = new File(configDir, "tmp"); @@ -97,7 +123,7 @@ public class Instance { // if (coverDir != null && !coverDir.exists()) { - syserr(new IOException( + tracer.error(new IOException( "The 'default covers' directory does not exists: " + coverDir)); coverDir = null; @@ -109,13 +135,38 @@ public class Instance { int hoursLarge = config .getInteger(Config.CACHE_MAX_TIME_STABLE, -1); - cache = new Cache(tmp, ua, hours, hoursLarge); + cache = new DataLoader(tmp, ua, hours, hoursLarge); } catch (IOException e) { - syserr(new IOException( + tracer.error(new IOException( "Cannot create cache (will continue without cache)", e)); } } + /** + * The traces handler for this {@link Cache}. + *

+ * It is never NULL. + * + * @return the traces handler (never NULL) + */ + public static TraceHandler getTraceHandler() { + return tracer; + } + + /** + * The traces handler for this {@link Cache}. + * + * @param tracer + * the new traces handler or NULL + */ + public static void setTraceHandler(TraceHandler tracer) { + if (tracer == null) { + tracer = new TraceHandler(false, false, false); + } + + Instance.tracer = tracer; + } + /** * Get the (unique) configuration service for the program. * @@ -135,17 +186,17 @@ public class Instance { } /** - * Get the (unique) {@link Cache} for the program. + * Get the (unique) {@link DataLoader} for the program. * - * @return the {@link Cache} + * @return the {@link DataLoader} */ - public static Cache getCache() { + public static DataLoader getCache() { return cache; } /** * Get the (unique) {link StringIdBundle} for the program. - * + * * @return the {link StringIdBundle} */ public static StringIdBundle getTrans() { @@ -153,11 +204,15 @@ 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() { + if (lib == null) { + throw new NullPointerException("We don't have a library to return"); + } + return lib; } @@ -180,16 +235,61 @@ public class Instance { } /** - * Report an error to the user + * Return the directory where to store temporary files for the remote + * {@link LocalLibrary}. + * + * @param host + * the remote for this host * - * @param e - * the {@link Exception} to report + * @return the directory */ - public static void syserr(Exception e) { - if (debug) { - e.printStackTrace(); - } else { - System.err.println(e.getMessage()); + 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) { + tracer.error(e); } }