Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak auto updater

Browse Source
This commit is contained in:
Jesse Boyd 2017-04-05 13:42:52 +10:00
parent 6a6387256b
commit 7c49c34c86
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/boydti/fawe/Fawe.java
View File

@ -275,10 +275,10 @@ public class Fawe {
if (Settings.IMP.UPDATE && isJava8()) { if (Settings.IMP.UPDATE && isJava8()) {
// Delayed updating // Delayed updating
updater = new Updater();
TaskManager.IMP.repeatAsync(new Runnable() { TaskManager.IMP.repeatAsync(new Runnable() {
@Override @Override
public void run() { public void run() {
updater = new Updater();
updater.update(IMP.getPlatform(), getVersion()); updater.update(IMP.getPlatform(), getVersion());
} }
}, 36000); }, 36000);

15
core/src/main/java/com/boydti/fawe/util/Updater.java
View File

@ -12,9 +12,14 @@ import java.util.Scanner;
public class Updater { public class Updater {
private FaweVersion newVersion; private FaweVersion newVersion;
private String changes = "N/A"; private String changes;
public String getChanges() throws IOException { public String getChanges() throws IOException {
if (changes == null) {
try (Scanner scanner = new Scanner(new URL("http://boydti.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8")) {
changes = scanner.useDelimiter("\\A").next();
}
}
return changes; return changes;
} }
@ -29,7 +34,7 @@ public class Updater {
try (Scanner reader = new Scanner(url.openStream())) { try (Scanner reader = new Scanner(url.openStream())) {
String versionString = reader.next(); String versionString = reader.next();
FaweVersion version = new FaweVersion(versionString); FaweVersion version = new FaweVersion(versionString);
if (currentVersion == null || version.isNewer(newVersion != null ? newVersion : currentVersion)) { if (version.isNewer(newVersion != null ? newVersion : currentVersion)) {
newVersion = version; newVersion = version;
URL download = new URL(downloadUrl.replaceAll("%platform%", platform).replaceAll("%version%", versionString)); URL download = new URL(downloadUrl.replaceAll("%platform%", platform).replaceAll("%version%", versionString));
try (ReadableByteChannel rbc = Channels.newChannel(download.openStream())) { try (ReadableByteChannel rbc = Channels.newChannel(download.openStream())) {
@ -48,12 +53,10 @@ public class Updater {
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
} }
Fawe.debug("Updated FAWE to " + versionString); Fawe.debug("Updated FAWE to " + versionString);
Scanner scanner = new Scanner(new URL("http://boydti.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8");
changes = scanner.useDelimiter("\\A").next();
scanner.close();
MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "http://boydti.com/fawe/cl?" + Integer.toHexString(currentVersion.hash)); MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "http://boydti.com/fawe/cl?" + Integer.toHexString(currentVersion.hash));
} }
} else {
System.out.println("Not newer");
} }
} }
} catch (Throwable ignore) {} } catch (Throwable ignore) {}