lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跳过更新时记录日志

Browse Source
This commit is contained in:
yushijinhun
2018-06-17 13:44:04 +08:00
parent 936a74597f
commit 520923ba08
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java
View File

@@ -27,10 +27,11 @@ import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.task.TaskResult; import org.jackhuang.hmcl.task.TaskResult;
import org.jackhuang.hmcl.ui.construct.MessageBox; import org.jackhuang.hmcl.ui.construct.MessageBox;
import org.jackhuang.hmcl.util.Constants; import org.jackhuang.hmcl.util.Constants;
import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.NetworkUtils; import org.jackhuang.hmcl.util.NetworkUtils;
import org.jackhuang.hmcl.util.VersionNumber; import org.jackhuang.hmcl.util.VersionNumber;
import static org.jackhuang.hmcl.util.Logging.LOG;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@@ -78,8 +79,10 @@ public final class UpdateChecker {
@Override @Override
public void execute() throws Exception { public void execute() throws Exception {
if (isDevelopmentVersion(Launcher.VERSION)) if (isDevelopmentVersion(Launcher.VERSION)) {
LOG.info("Current version is a development version, skip updating");
return; return;
}
if (value == null) { if (value == null) {
versionString = http.getResult(); versionString = http.getResult();
@@ -87,7 +90,7 @@ public final class UpdateChecker {
} }
if (value == null) { if (value == null) {
Logging.LOG.warning("Unable to check update..."); LOG.warning("Unable to check update...");
if (showMessage) if (showMessage)
MessageBox.show(Launcher.i18n("update.failed")); MessageBox.show(Launcher.i18n("update.failed"));
} else if (base.compareTo(value) < 0) } else if (base.compareTo(value) < 0)
@@ -129,11 +132,12 @@ public final class UpdateChecker {
return new TaskResult<Map<String, String>>() { return new TaskResult<Map<String, String>>() {
@Override @Override
public void execute() { public void execute() {
if (download_link == null) if (download_link == null) {
try { try {
download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update_link.php")), Map.class); download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update_link.php")), Map.class);
} catch (JsonSyntaxException | IOException e) { } catch (JsonSyntaxException | IOException e) {
Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e); LOG.log(Level.SEVERE, "Failed to get update link.", e);
}
} }
setResult(download_link); setResult(download_link);
} }