X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=733c16cf9a6e8705e1a602ec279e2b8309d6f395;hb=6d9ddecc2037127390dc44b03a3644679f2f2145;hp=c265861aefb3f2b8c3e7e324c216ded7cad1682d;hpb=9f705f1afe91f215836e405c2a09cbbf926298cd;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java index c265861..733c16c 100644 --- a/src/be/nikiroo/fanfix/Instance.java +++ b/src/be/nikiroo/fanfix/Instance.java @@ -8,6 +8,7 @@ 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.StringIdGuiBundle; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.bundles.UiConfigBundle; import be.nikiroo.fanfix.library.BasicLibrary; @@ -16,6 +17,7 @@ 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.TempFiles; import be.nikiroo.utils.TraceHandler; import be.nikiroo.utils.resources.Bundles; @@ -29,12 +31,14 @@ public class Instance { private static UiConfigBundle uiconfig; private static StringIdBundle trans; private static DataLoader cache; + private static StringIdGuiBundle transGui; private static BasicLibrary lib; private static File coverDir; private static File readerTmp; private static File remoteDir; private static String configDir; private static TraceHandler tracer; + private static TempFiles tempFiles; static { // Before we can configure it: @@ -47,7 +51,11 @@ public class Instance { } // Most of the rest is dependent upon this: - createConfigs(configDir, true); + createConfigs(configDir, false); + + // Proxy support + // TODO: include new nikiroo-utils version + // Proxy.use(Instance.getConfig().getString(Config.USE_PROXY)); // update tracer: boolean debug = Instance.getConfig() @@ -99,6 +107,12 @@ public class Instance { + coverDir)); coverDir = null; } + + try { + tempFiles = new TempFiles("fanfix"); + } catch (IOException e) { + tracer.error(new IOException("Cannot create temporary directory", e)); + } } /** @@ -192,6 +206,8 @@ public class Instance { /** * Get the (unique) {link StringIdBundle} for the program. + *
+ * This is used for the translations of the core parts of Fanfix. * * @return the {link StringIdBundle} */ @@ -199,6 +215,17 @@ public class Instance { return trans; } + /** + * Get the (unique) {link StringIdGuiBundle} for the program. + *
+ * This is used for the translations of the GUI parts of Fanfix. + * + * @return the {link StringIdGuiBundle} + */ + public static StringIdGuiBundle getTransGui() { + return transGui; + } + /** * Get the (unique) {@link LocalLibrary} for the program. * @@ -304,6 +331,17 @@ public class Instance { } } + /** + * The facility to use temporary files in this program. + *
+ * MUST be closed at end of program. + * + * @return the facility + */ + public static TempFiles getTempFiles() { + return tempFiles; + } + /** * The configuration directory (will check, in order of preference, * {@link Bundles#getDirectory()}, the system properties, the environment @@ -331,12 +369,13 @@ public class Instance { /** * Create the config variables ({@link Instance#config}, - * {@link Instance#uiconfig} and {@link Instance#trans}). + * {@link Instance#uiconfig}, {@link Instance#trans} and + * {@link Instance#transGui}). * * @param configDir * the directory where to find the configuration files * @param refresh - * TRUE to refresh the configuration files from the default + * TRUE to reset the configuration files from the default * included ones */ private static void createConfigs(String configDir, boolean refresh) { @@ -361,6 +400,7 @@ public class Instance { // 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()); + transGui = new StringIdGuiBundle(getLang()); // Fix an old bug (we used to store custom translation files by // default): @@ -370,6 +410,7 @@ public class Instance { if (checkEnv("NOUTF")) { trans.setUnicode(false); + transGui.setUnicode(false); } Bundles.setDirectory(configDir); @@ -390,7 +431,7 @@ public class Instance { if (remoteLib == null || remoteLib.trim().isEmpty()) { String libDir = System.getProperty("fanfix.libdir"); if (libDir == null || libDir.isEmpty()) { - config.getString(Config.LIBRARY_DIR); + libDir = config.getString(Config.LIBRARY_DIR); } try { lib = new LocalLibrary(getFile(libDir)); @@ -508,8 +549,11 @@ public class Instance { private static String getLang() { String lang = config.getString(Config.LANG); - if (System.getenv("LANG") != null && !System.getenv("LANG").isEmpty()) { - lang = System.getenv("LANG"); + if (lang == null | lang.isEmpty()) { + if (System.getenv("LANG") != null + && !System.getenv("LANG").isEmpty()) { + lang = System.getenv("LANG"); + } } if (lang != null && lang.isEmpty()) {