X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FInstance.java;h=28849b325510ccec2b17b813de99d8fef9036650;hb=0d781e306746cf460f1f41338eb437f32cf9db33;hp=9c20682fd8d6798da64eea8406ddfc86fa1c9dee;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/Instance.java b/src/be/nikiroo/fanfix/Instance.java
index 9c20682..28849b3 100644
--- a/src/be/nikiroo/fanfix/Instance.java
+++ b/src/be/nikiroo/fanfix/Instance.java
@@ -2,11 +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;
 
 /**
@@ -16,45 +20,57 @@ 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 boolean debug;
 	private static File coverDir;
 	private static File readerTmp;
+	private static String configDir;
 
 	static {
 		// 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 {
-				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);
 		}
 
+		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());
 		try {
 			lib = new Library(getFile(Config.LIBRARY_DIR),
@@ -67,7 +83,7 @@ public class Instance {
 		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);
 
 		if (checkEnv("NOUTF")) {
 			trans.setUnicode(false);
@@ -77,20 +93,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(
@@ -121,6 +131,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.
 	 * 
@@ -132,7 +151,7 @@ public class Instance {
 
 	/**
 	 * Get the (unique) {link StringIdBundle} for the program.
-	 *
+	 * 
 	 * @return the {link StringIdBundle}
 	 */
 	public static StringIdBundle getTrans() {
@@ -166,6 +185,46 @@ public class Instance {
 		return readerTmp;
 	}
 
+	/**
+	 * 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
 	 * 
@@ -186,8 +245,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")) {