X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FUpdateChecker.java;h=2c2f12111a423b3ca4614c6518fdf8336785d7c5;hp=8114118c84dac849fb206fae129e3f055a4a1314;hb=179e7da4d8d8a474d0b622d60b5f5d32d6ab4052;hpb=59f2d124406df88153b8c5e05bdb524c9b594116

diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
index 8114118..2c2f121 100644
--- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
+++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UpdateChecker.java - Copyright © 2011–2013 David Roden
+ * Sone - UpdateChecker.java - Copyright © 2011–2019 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,8 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.FreenetInterface.Fetched;
+import javax.inject.Singleton;
+
 import net.pterodactylus.sone.core.event.UpdateFoundEvent;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.io.Closer;
@@ -42,13 +43,12 @@ import freenet.support.api.Bucket;
 
 /**
  * Watches the official Sone homepage for new releases.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class UpdateChecker {
 
 	/** The logger. */
-	private static final Logger logger = getLogger("Sone.UpdateChecker");
+	private static final Logger logger = getLogger(UpdateChecker.class.getName());
 
 	/** The event bus. */
 	private final EventBus eventBus;
@@ -60,10 +60,11 @@ public class UpdateChecker {
 	private FreenetURI currentUri;
 
 	/** The latest known edition. */
-	private long latestEdition;
+	private long latestEdition = SonePlugin.getLatestEdition();
 
 	/** The current latest known version. */
-	private Version currentLatestVersion = SonePlugin.VERSION;
+	private Version currentLatestVersion;
+	private final Version currentRunningVersion;
 
 	/** The release date of the latest version. */
 	private long latestVersionDate;
@@ -77,9 +78,11 @@ public class UpdateChecker {
 	 *            The freenet interface to use
 	 */
 	@Inject
-	public UpdateChecker(EventBus eventBus, FreenetInterface freenetInterface) {
+	public UpdateChecker(EventBus eventBus, FreenetInterface freenetInterface, Version currentVersion) {
 		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
+		this.currentRunningVersion = currentVersion;
+		this.currentLatestVersion = currentVersion;
 	}
 
 	//
@@ -93,7 +96,7 @@ public class UpdateChecker {
 	 * @return {@code true} if a new version was found
 	 */
 	public boolean hasLatestVersion() {
-		return currentLatestVersion.compareTo(SonePlugin.VERSION) > 0;
+		return currentLatestVersion.compareTo(currentRunningVersion) > 0;
 	}
 
 	/**
@@ -218,9 +221,22 @@ public class UpdateChecker {
 		if (version.compareTo(currentLatestVersion) > 0) {
 			currentLatestVersion = version;
 			latestVersionDate = releaseTime;
-			logger.log(Level.INFO, String.format("Found new version: %s (%tc)", version, new Date(releaseTime)));
-			eventBus.post(new UpdateFoundEvent(version, releaseTime, edition));
+			boolean disruptive = disruptiveVersionBetweenCurrentAndFound(properties);
+			logger.log(Level.INFO, String.format("Found new version: %s (%tc%s)", version, new Date(releaseTime), disruptive ? ", disruptive" : ""));
+			eventBus.post(new UpdateFoundEvent(version, releaseTime, edition, disruptive));
+		}
+	}
+
+	private boolean disruptiveVersionBetweenCurrentAndFound(Properties properties) {
+		for (String key : properties.stringPropertyNames()) {
+			if (key.startsWith("DisruptiveVersion/")) {
+				Version disruptiveVersion = Version.parse(key.substring("DisruptiveVersion/".length()));
+				if (disruptiveVersion.compareTo(currentRunningVersion) > 0) {
+					return true;
+				}
+			}
 		}
+		return false;
 	}
 
 }