X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FVersionCheck.java;h=f64159abb97c3fe3236bc272710402a1e32631f7;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=3359bacbce41b977a6a7ee9daf089a02a8331e61;hpb=b42117f163c9c0dd96424d43730fb95fb088b4be;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/VersionCheck.java b/src/be/nikiroo/fanfix/VersionCheck.java
index 3359bac..f64159a 100644
--- a/src/be/nikiroo/fanfix/VersionCheck.java
+++ b/src/be/nikiroo/fanfix/VersionCheck.java
@@ -8,12 +8,19 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import be.nikiroo.utils.Version;
 
+/**
+ * Version checker: can check the current version of the program against a
+ * remote changelog, and list the missed updates and their description.
+ * 
+ * @author niki
+ */
 public class VersionCheck {
-	private static final String url = "https://github.com/nikiroo/fanfix/raw/master/changelog.md";
+	private static final String base = "https://github.com/nikiroo/fanfix/raw/master/changelog${LANG}.md";
 
 	private Version current;
 	private List<Version> newer;
@@ -86,7 +93,7 @@ public class VersionCheck {
 	 * time has elapsed.
 	 */
 	public void ok() {
-		Instance.setVersionChecked();
+		Instance.getInstance().setVersionChecked();
 	}
 
 	/**
@@ -100,25 +107,48 @@ public class VersionCheck {
 		List<Version> newer = new ArrayList<Version>();
 		Map<Version, List<String>> changes = new HashMap<Version, List<String>>();
 
-		if (Instance.isVersionCheckNeeded()) {
+		if (Instance.getInstance().isVersionCheckNeeded()) {
 			try {
-				InputStream in = Instance.getCache().openNoCache(new URL(url),
-						null);
+				// Prepare the URLs according to the user's language
+				Locale lang = Instance.getInstance().getTrans().getLocale();
+				String fr = lang.getLanguage();
+				String BE = lang.getCountry().replace(".UTF8", "");
+				String urlFrBE = base.replace("${LANG}", "-" + fr + "_" + BE);
+				String urlFr = base.replace("${LANG}", "-" + fr);
+				String urlDefault = base.replace("${LANG}", "");
+
+				InputStream in = null;
+				for (String url : new String[] { urlFrBE, urlFr, urlDefault }) {
+					try {
+						in = Instance.getInstance().getCache().open(new URL(url), null, false);
+						break;
+					} catch (IOException e) {
+					}
+				}
+
+				if (in == null) {
+					throw new IOException("No changelog found");
+				}
+
 				BufferedReader reader = new BufferedReader(
 						new InputStreamReader(in, "UTF-8"));
 				try {
+					Version version = new Version();
 					for (String line = reader.readLine(); line != null; line = reader
 							.readLine()) {
 						if (line.startsWith("## Version ")) {
-							String v = line.substring("## Version ".length());
-							Version version = new Version(v);
+							version = new Version(line.substring("## Version "
+									.length()));
 							if (version.isNewerThan(current)) {
 								newer.add(version);
 								changes.put(version, new ArrayList<String>());
+							} else {
+								version = new Version();
 							}
-						} else if (!newer.isEmpty() && !line.isEmpty()) {
-							Version version = newer.get(newer.size() - 1);
-							List<String> ch = changes.get(version);
+						} else if (!version.isEmpty() && !newer.isEmpty()
+								&& !line.isEmpty()) {
+							List<String> ch = changes.get(newer.get(newer
+									.size() - 1));
 							if (!ch.isEmpty() && !line.startsWith("- ")) {
 								int i = ch.size() - 1;
 								ch.set(i, ch.get(i) + " " + line.trim());
@@ -131,7 +161,8 @@ public class VersionCheck {
 					reader.close();
 				}
 			} catch (IOException e) {
-				Instance.syserr(e);
+				Instance.getInstance().getTraceHandler()
+						.error(new IOException("Cannot download latest changelist on github.com", e));
 			}
 		}