X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=82f442791b673262932988b4f3c054cc031e10e0;hb=ae78e5179d241ca5e2439048f960fe6d4a07c990;hp=1266ac7e437f700564165dadec15521383f4083b;hpb=b42117f163c9c0dd96424d43730fb95fb088b4be;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index 1266ac7..82f4427 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -6,11 +6,17 @@ 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.CacheLibrary; +import be.nikiroo.fanfix.library.LocalLibrary; +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,14 +28,18 @@ 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 BasicLibrary 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"), checkEnv("DEBUG")); + // Most of the rest is dependent upon this: config = new ConfigBundle(); @@ -39,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()) { @@ -53,37 +62,38 @@ 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); } - try { - trans = new StringIdBundle(getLang()); - trans.updateFile(configDir); - } catch (IOException e) { - syserr(e); + + // 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) { + trans.deleteFile(configDir); } 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)); - } - debug = Instance.getConfig().getBoolean(Config.DEBUG_ERR, 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(configDir, "remote"); if (checkEnv("NOUTF")) { trans.setUnicode(false); @@ -91,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") @@ -103,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 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)); + 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); } /** @@ -141,11 +219,47 @@ public class Instance { } /** - * Get the (unique) {@link Cache} for the program. + * 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. * - * @return the {@link Cache} + * @return the {@link DataLoader} */ - public static Cache getCache() { + public static DataLoader getCache() { return cache; } @@ -159,11 +273,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; } @@ -185,6 +303,25 @@ 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. * @@ -192,7 +329,8 @@ public class Instance { */ public static boolean isVersionCheckNeeded() { try { - long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60 * 60; + long wait = config.getInteger(Config.UPDATE_INTERVAL, 1) * 24 * 60 + * 60 * 1000; if (wait >= 0) { String lastUpString = IOUtils.readSmallFile(new File(configDir, "LAST_UPDATE")); @@ -220,21 +358,7 @@ public class Instance { IOUtils.writeSmallFile(new File(configDir), "LAST_UPDATE", Long.toString(new Date().getTime())); } catch (IOException e) { - syserr(e); - } - } - - /** - * Report an error to the user - * - * @param e - * the {@link Exception} to report - */ - public static void syserr(Exception e) { - if (debug) { - e.printStackTrace(); - } else { - System.err.println(e.getMessage()); + tracer.error(e); } } @@ -266,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); @@ -276,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). *