1
0
Fork 0
mirror of https://gitlab.com/kauron/jstudy synced 2024-12-22 08:23:33 +01:00

Auto-update from Gitlab's latest tag

This commit is contained in:
Carlos Galindo 2019-09-12 19:17:39 +02:00
parent c608f52c61
commit 1b5f07bb7d
Signed by: kauron
GPG key ID: 83E68706DEE119A3
7 changed files with 111 additions and 6 deletions

View file

@ -5,13 +5,15 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources-filtered" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
<orderEntry type="library" name="Maven: com.jfoenix:jfoenix:8.0.9" level="project" /> <orderEntry type="library" name="Maven: com.jfoenix:jfoenix:8.0.9" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
</component> </component>
</module> </module>

18
pom.xml
View file

@ -14,7 +14,7 @@
</repositories> </repositories>
<name>jstudy</name> <name>jstudy</name>
<url>http://maven.apache.org</url> <url>http://gitlab.com/kauron/jstudy</url>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -27,8 +27,24 @@
<artifactId>jfoenix</artifactId> <artifactId>jfoenix</artifactId>
<version>8.0.9</version> <version>8.0.9</version>
</dependency> </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20190722</version>
<type>bundle</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
</resource>
<resource>
<directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>

View file

@ -24,16 +24,25 @@ import javafx.scene.layout.BorderPane;
import javafx.stage.FileChooser; import javafx.stage.FileChooser;
import javafx.stage.Window; import javafx.stage.Window;
import javafx.stage.WindowEvent; import javafx.stage.WindowEvent;
import org.json.JSONArray;
import org.json.JSONObject;
import java.awt.*; import java.awt.*;
import java.io.File; import java.io.*;
import java.io.IOException; import java.net.HttpURLConnection;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.util.List; import java.util.List;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public class Controller implements Initializable { public class Controller implements Initializable {
private static final String PROJECT_URL = "https://gitlab.com/kauron/jstudy";
@FXML @FXML
private TabPane tabPane; private TabPane tabPane;
@ -45,6 +54,7 @@ public class Controller implements Initializable {
private final BooleanProperty tabIsTable = new SimpleBooleanProperty(false); private final BooleanProperty tabIsTable = new SimpleBooleanProperty(false);
private final Map<Tab, TableController> tabMap = new HashMap<>(); private final Map<Tab, TableController> tabMap = new HashMap<>();
private String updateURL, updateFileName;
@Override @Override
public void initialize(URL url, ResourceBundle resourceBundle) { public void initialize(URL url, ResourceBundle resourceBundle) {
@ -65,6 +75,75 @@ public class Controller implements Initializable {
} }
}) })
); );
new Thread(this::checkUpdate).start();
}
private void checkUpdate() {
// Check new version via gitlab's REST API
String newVersion;
File jarFile;
BufferedReader br;
try {
URL apiUrl = new URL("https://gitlab.com/api/v4/projects/9264549/releases");
HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
connection.setRequestMethod("GET");
connection.setRequestProperty("Accept", "application/json");
if (connection.getResponseCode() != 200) {
System.err.println("Error connecting to Gitlab API");
}
br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
} catch (IOException e) {
return;
}
String output = br.lines().collect(Collectors.joining());
JSONArray tags = new JSONArray(output);
JSONObject latest = tags.getJSONObject(0);
newVersion = latest.getString("tag_name").substring(1);
if (!isNewVersion(AppPrefs.getVersion(), newVersion))
return;
String desc = latest.getString("description");
Matcher matcher = Pattern.compile("\\[(.*\\.jar)]" +
"\\((/uploads/.*/.*\\.jar)\\)").matcher(desc);
if (!matcher.find())
return;
updateURL = matcher.group(2);
updateFileName = matcher.group(1);
// Ask user whether to update or not.
Platform.runLater(this::onUpdate);
}
private void onUpdate() {
Optional<ButtonType> res = new Alert(Alert.AlertType.INFORMATION,
"There is an update ready. Would you like to download it and open it?",
ButtonType.YES, ButtonType.NO).showAndWait();
if (!res.isPresent() || !res.get().equals(ButtonType.YES))
return;
try (InputStream inputStream = new URL(PROJECT_URL + updateURL).openStream();
ReadableByteChannel readableByteChannel = Channels.newChannel(inputStream);
FileOutputStream fileOutputStream = new FileOutputStream(updateFileName)) {
fileOutputStream.getChannel().transferFrom(readableByteChannel, 0, Long.MAX_VALUE);
} catch (IOException e) {
return;
}
// Launch new version
try {
new ProcessBuilder("java", "-jar", updateFileName).start();
} catch (IOException e) {
return;
}
onQuit(null);
}
private boolean isNewVersion(String version, String newVersion) {
String[] o = version.split("\\.");
String[] n = newVersion.split("\\.");
for (int i = 0; i < o.length; i++) {
int a = Integer.parseInt(n[i]);
int b = Integer.parseInt(o[i]);
if (a != b)
return a > b;
}
return false;
} }
@FXML @FXML
@ -248,7 +327,7 @@ public class Controller implements Initializable {
protected void onAboutAction(ActionEvent event) { protected void onAboutAction(ActionEvent event) {
if (Desktop.isDesktopSupported()) { if (Desktop.isDesktopSupported()) {
try { try {
Desktop.getDesktop().browse(URI.create("https://gitlab.com/kauron/jstudy")); Desktop.getDesktop().browse(URI.create(PROJECT_URL));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

View file

@ -4,6 +4,7 @@ import es.kauron.jstudy.Main;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
import java.io.File; import java.io.File;
import java.util.Scanner;
import java.util.prefs.BackingStoreException; import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences; import java.util.prefs.Preferences;
@ -33,6 +34,12 @@ public class AppPrefs {
flushPrefs(); flushPrefs();
} }
public static String getVersion() {
String v = new Scanner(AppPrefs.class.getResourceAsStream("/version.txt")).nextLine();
assert v.matches("\\d\\.\\d\\.\\d");
return v;
}
public static class BooleanPref extends SimpleBooleanProperty { public static class BooleanPref extends SimpleBooleanProperty {
private final String name; private final String name;

View file

@ -9,5 +9,6 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.jfoenix:jfoenix:8.0.9" level="project" /> <orderEntry type="library" name="Maven: com.jfoenix:jfoenix:8.0.9" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
</component> </component>
</module> </module>

View file

@ -0,0 +1 @@
${version}

View file

@ -1 +0,0 @@
0.4.5