X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=82f442791b673262932988b4f3c054cc031e10e0;hb=ae78e5179d241ca5e2439048f960fe6d4a07c990;hp=a06c975420419c00d2998214438e3356101ab397;hpb=99ccbdf63b539f1f40e070f5833f2d15fcf79830;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index a06c975..82f4427 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -11,9 +11,12 @@ import be.nikiroo.fanfix.bundles.StringIdBundle; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.bundles.UiConfigBundle; import be.nikiroo.fanfix.library.BasicLibrary; +import be.nikiroo.fanfix.library.CacheLibrary; import be.nikiroo.fanfix.library.LocalLibrary; -import be.nikiroo.fanfix.output.BasicOutput.OutputType; +import be.nikiroo.fanfix.library.RemoteLibrary; +import be.nikiroo.utils.Cache; import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.TraceHandler; import be.nikiroo.utils.resources.Bundles; /** @@ -22,58 +25,21 @@ import be.nikiroo.utils.resources.Bundles; * @author niki */ public class Instance { - /** - * A handler when a recoverable exception was caught by the program. - * - * @author niki - */ - public interface SyserrHandler { - /** - * An exception happened, log it. - * - * @param e - * the exception - * @param showDetails - * show more details (usually equivalent to the value of - * DEBUG) - */ - public void notify(Exception e, boolean showDetails); - } - - /** - * A handler when a trace message is sent. - * - * @author niki - */ - public interface TraceHandler { - /** - * A trace happened, show it. - *

- * Will only be called if TRACE is true. - * - * @param message - * the trace message - */ - public void trace(String message); - } - private static ConfigBundle config; private static UiConfigBundle uiconfig; private static StringIdBundle trans; private static DataLoader cache; - private static LocalLibrary lib; - private static boolean debug; - private static boolean trace; + private static BasicLibrary lib; private static File coverDir; private static File readerTmp; private static File remoteDir; private static String configDir; - - private static SyserrHandler syserrHandler; - - private static TraceHandler traceHandler; + private static TraceHandler tracer; static { + // Before we can configure it: + tracer = new TraceHandler(true, checkEnv("DEBUG"), checkEnv("DEBUG")); + // Most of the rest is dependent upon this: config = new ConfigBundle(); @@ -83,8 +49,7 @@ public class Instance { } if (configDir == null) { - configDir = new File(System.getProperty("user.home"), ".fanfix") - .getPath(); + configDir = new File(getHome(), ".fanfix").getPath(); } if (!new File(configDir).exists()) { @@ -97,13 +62,13 @@ public class Instance { config = new ConfigBundle(); config.updateFile(configDir); } catch (IOException e) { - syserr(e); + tracer.error(e); } try { uiconfig = new UiConfigBundle(); uiconfig.updateFile(configDir); } catch (IOException e) { - syserr(e); + tracer.error(e); } // No updateFile for this one! (we do not want the user to have custom @@ -113,28 +78,22 @@ public class Instance { // 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); uiconfig = new UiConfigBundle(); trans = new StringIdBundle(getLang()); - 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); - trace = Instance.getConfig().getBoolean(Config.DEBUG_TRACE, false); + 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(getFile(Config.LIBRARY_DIR), "remote"); + remoteDir = new File(configDir, "remote"); if (checkEnv("NOUTF")) { trans.setUnicode(false); @@ -142,6 +101,46 @@ public class Instance { if (checkEnv("DEBUG")) { debug = true; + trace = true; + } + + tracer = new TraceHandler(true, debug, trace); + + String remoteLib = config.getString(Config.DEFAULT_LIBRARY); + if (remoteLib == null || remoteLib.trim().isEmpty()) { + 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)); + } + } else { + int pos = remoteLib.lastIndexOf(":"); + if (pos >= 0) { + String port = remoteLib.substring(pos + 1).trim(); + remoteLib = remoteLib.substring(0, pos); + pos = remoteLib.lastIndexOf(":"); + if (pos >= 0) { + String host = remoteLib.substring(pos + 1).trim(); + String key = remoteLib.substring(0, pos).trim(); + + try { + tracer.trace("Selecting remote library " + host + ":" + + port); + lib = new RemoteLibrary(key, host, + Integer.parseInt(port)); + lib = new CacheLibrary(getRemoteDir(host), lib); + + } catch (Exception e) { + } + } + } + + if (lib == null) { + tracer.error(new IOException( + "Cannot create remote library for: " + remoteLib)); + } } // Could have used: System.getProperty("java.io.tmpdir") @@ -154,23 +153,51 @@ 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; } + 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) { - syserr(new IOException( + tracer.error(new IOException( "Cannot create cache (will continue without cache)", e)); + cache = new DataLoader(ua); + } + + cache.setTraceHandler(tracer); + } + + /** + * 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; + cache.setTraceHandler(tracer); } /** @@ -191,6 +218,42 @@ public class Instance { 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. * @@ -215,6 +278,10 @@ public class Instance { * @return the {@link LocalLibrary} */ public static BasicLibrary getLibrary() { + if (lib == null) { + throw new NullPointerException("We don't have a library to return"); + } + return lib; } @@ -291,61 +358,7 @@ public class Instance { IOUtils.writeSmallFile(new File(configDir), "LAST_UPDATE", Long.toString(new Date().getTime())); } catch (IOException e) { - syserr(e); - } - } - - /** - * Replace the global syserr handler. - * - * @param syserrHandler - * the new syserr handler - */ - public static void setSyserrHandler(SyserrHandler syserrHandler) { - Instance.syserrHandler = syserrHandler; - } - - /** - * Replace the global trace handler. - * - * @param traceHandler - * the new trace handler - */ - public static void setTraceHandler(TraceHandler traceHandler) { - Instance.traceHandler = traceHandler; - } - - /** - * Report an error to the user - * - * @param e - * the {@link Exception} to report - */ - public static void syserr(Exception e) { - if (syserrHandler != null) { - syserrHandler.notify(e, debug); - } else { - if (debug) { - e.printStackTrace(); - } else { - System.err.println(e.getMessage()); - } - } - } - - /** - * Notify of a debug message. - * - * @param message - * the message - */ - public static void trace(String message) { - if (trace) { - if (traceHandler != null) { - traceHandler.trace(message); - } else { - System.out.println(message); - } + tracer.error(e); } } @@ -377,8 +390,7 @@ public class Instance { 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); @@ -387,6 +399,24 @@ public class Instance { 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). *