nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-11-23 17:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prioritize checking official repository for an update

Browse Source
This commit is contained in:
UnfamiliarLegacy 2024-06-23 22:15:55 +02:00
parent b5c34e53b7
commit 89b10eb8ec
2 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
G-Earth/src/main/java/gearth/GEarth.java
View File

@ -26,7 +26,7 @@ import java.util.Properties;
public class GEarth extends Application { public class GEarth extends Application {
private static final String OFFICIAL_REPOSITORY = "sirjonasxx/G-Earth"; public static final String OFFICIAL_REPOSITORY = "sirjonasxx/G-Earth";
private static final Logger logger = LoggerFactory.getLogger(GEarth.class); private static final Logger logger = LoggerFactory.getLogger(GEarth.class);

65
G-Earth/src/main/java/gearth/misc/UpdateChecker.java
View File

@ -4,13 +4,12 @@ import gearth.GEarth;
import gearth.ui.titlebar.TitleBarController; import gearth.ui.titlebar.TitleBarController;
import gearth.ui.translations.LanguageBundle; import gearth.ui.translations.LanguageBundle;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.geometry.Insets;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Hyperlink; import javafx.scene.control.Hyperlink;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane; import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Region; import javafx.scene.layout.Region;
import javafx.scene.web.WebView;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.versioning.ComparableVersion; import org.apache.maven.artifact.versioning.ComparableVersion;
import org.json.JSONObject; import org.json.JSONObject;
@ -26,43 +25,54 @@ public class UpdateChecker {
private static final Logger logger = LoggerFactory.getLogger(UpdateChecker.class); private static final Logger logger = LoggerFactory.getLogger(UpdateChecker.class);
public static void checkForUpdates() { public static void checkForUpdates() {
final String currentVersion = GEarth.version;
final String latestReleaseApi = String.format("https://api.github.com/repos/%s/releases/latest", GEarth.repository);
final String latestRelease = String.format("https://github.com/%s/releases/latest", GEarth.repository);
new Thread(() -> { new Thread(() -> {
// Check official repository first.
if (!GEarth.repository.equals(GEarth.OFFICIAL_REPOSITORY)) {
if (checkRepository(GEarth.OFFICIAL_REPOSITORY)) {
return;
}
}
// Check repository of the fork.
checkRepository("UnfamiliarLegacy/G-Earth");
}).start();
}
private static boolean checkRepository(String repository) {
final String currentVersion = GEarth.version;
final String latestReleaseApi = String.format("https://api.github.com/repos/%s/releases/latest", repository);
final String latestRelease = String.format("https://github.com/%s/releases/latest", repository);
try { try {
JSONObject object = new JSONObject(IOUtils.toString( JSONObject object = new JSONObject(IOUtils.toString(
new URL(latestReleaseApi).openStream(), StandardCharsets.UTF_8)); new URL(latestReleaseApi).openStream(), StandardCharsets.UTF_8));
String gitv = (String)object.get("tag_name"); String gitv = (String)object.get("tag_name");
if (gitv.startsWith("v")) {
gitv = gitv.substring(1);
}
if (new ComparableVersion(currentVersion).compareTo(new ComparableVersion(gitv)) < 0) { if (new ComparableVersion(currentVersion).compareTo(new ComparableVersion(gitv)) < 0) {
final String newVersion = gitv;
Platform.runLater(() -> { Platform.runLater(() -> {
String body = (String)object.get("body"); final String body = (String)object.get("body");
boolean isForcedUpdate = body.contains("(!)"); final boolean isForcedUpdate = body.contains("(!)");
final Alert alert = new Alert(isForcedUpdate ? Alert.AlertType.ERROR : Alert.AlertType.INFORMATION);
Alert alert = new Alert(isForcedUpdate ? Alert.AlertType.ERROR : Alert.AlertType.INFORMATION, LanguageBundle.get("alert.outdated.title"), ButtonType.OK);
FlowPane fp = new FlowPane(); FlowPane fp = new FlowPane();
Label lbl = new Label(LanguageBundle.get("alert.outdated.content.newversion") + " ("+gitv+")" + System.lineSeparator()+ System.lineSeparator() + LanguageBundle.get("alert.outdated.content.update") + ":"); Label lbl = new Label(LanguageBundle.get("alert.outdated.content.newversion") + " ("+newVersion+")" + System.lineSeparator() + System.lineSeparator() + LanguageBundle.get("alert.outdated.content.update"));
Hyperlink link = new Hyperlink(latestRelease); Hyperlink link = new Hyperlink(latestRelease);
fp.getChildren().addAll( lbl, link); link.setPadding(Insets.EMPTY);
fp.getChildren().addAll(lbl, link);
link.setOnAction(event -> { link.setOnAction(event -> {
GEarth.main.getHostServices().showDocument(link.getText()); GEarth.main.getHostServices().showDocument(link.getText());
event.consume(); event.consume();
}); });
alert.setTitle(LanguageBundle.get("alert.outdated.title"));
alert.setHeaderText(null);
WebView webView = new WebView();
webView.getEngine().loadContent(String.format("<html>%s (%s)<br><br>%s:<br><a href=\"%s\">%s</a></html>",
LanguageBundle.get("alert.outdated.content.newversion"),
gitv,
LanguageBundle.get("alert.outdated.content.update"),
latestRelease,
latestRelease));
webView.setPrefSize(500, 200);
alert.setResizable(false); alert.setResizable(false);
alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE); alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
alert.getDialogPane().setContent(fp); alert.getDialogPane().setContent(fp);
@ -72,16 +82,17 @@ public class UpdateChecker {
try { try {
TitleBarController.create(alert).showAlert(); TitleBarController.create(alert).showAlert();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); logger.error("Failed to show alert", e);
} }
}); });
}
return true;
}
} catch (IOException e) { } catch (IOException e) {
logger.error("Failed to check for updates", e); logger.error("Failed to check for updates", e);
} }
}).start();
return false;
} }
} }