GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor update

Browse Source 
- Cleared some stuff
This commit is contained in:
Gabriel Tofvesson 2016-11-13 21:27:22 +01:00
parent d8ef436e03
commit 8765c37821
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Launcher/net/Updater.java
View File

@ -2,15 +2,12 @@ package Launcher.net;
import com.tofvesson.async.Async; import com.tofvesson.async.Async;
import com.tofvesson.reflection.SafeReflection; import com.tofvesson.reflection.SafeReflection;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
import java.io.*; import java.io.*;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static Launcher.Main.semVerMajor; import static Launcher.Main.semVerMajor;
import static Launcher.Main.semVerMinor; import static Launcher.Main.semVerMinor;
import static Launcher.Main.semVerPatch; import static Launcher.Main.semVerPatch;
@ -25,7 +22,6 @@ public class Updater {
public static final Pattern version = Pattern.compile("(?s)<span class=\"css-truncate-target\">.*(\\d).(\\d).(\\d)</span>.*<a href=\"/GabrielTofvesson/TeamAvionLauncher/releases/download/(.*)\\.jar\" rel=\"nofollow\">"); // Pattern to match when finding refs public static final Pattern version = Pattern.compile("(?s)<span class=\"css-truncate-target\">.*(\\d).(\\d).(\\d)</span>.*<a href=\"/GabrielTofvesson/TeamAvionLauncher/releases/download/(.*)\\.jar\" rel=\"nofollow\">"); // Pattern to match when finding refs
private HttpsURLConnection conn; private HttpsURLConnection conn;
public static final URL updateURL; public static final URL updateURL;
private boolean isUpdateAvailable = false;
static { static {
URL u = null; URL u = null;
@ -47,7 +43,7 @@ public class Updater {
BufferedReader in = new BufferedReader(new InputStreamReader( BufferedReader in = new BufferedReader(new InputStreamReader(
conn.getInputStream())); conn.getInputStream()));
String inputLine; String inputLine;
StringBuffer response = new StringBuffer(); StringBuilder response = new StringBuilder();
while ((inputLine = in.readLine()) != null) { while ((inputLine = in.readLine()) != null) {
response.append(inputLine); response.append(inputLine);
@ -55,7 +51,6 @@ public class Updater {
in.close(); in.close();
Matcher m = version.matcher(response.toString()); Matcher m = version.matcher(response.toString());
int semMajor = 0, semMinor = 0, semPatch = 0;
String downloadLink = ""; String downloadLink = "";
while(m.find()){ while(m.find()){
int semMaj = Integer.parseInt(m.group(1)), int semMaj = Integer.parseInt(m.group(1)),
@ -63,9 +58,6 @@ public class Updater {
semPat = Integer.parseInt(m.group(3)); semPat = Integer.parseInt(m.group(3));
if(semMaj < semVerMajor || (semMaj==semVerMajor && semMin<semVerMinor) || if(semMaj < semVerMajor || (semMaj==semVerMajor && semMin<semVerMinor) ||
(semMaj==semVerMajor && semMin==semVerMinor && semPat<=semVerPatch)) continue; // Version found isn't new (semMaj==semVerMajor && semMin==semVerMinor && semPat<=semVerPatch)) continue; // Version found isn't new
semMajor = semMaj;
semMinor = semMin;
semPatch = semPat;
downloadLink = "https://github.com/GabrielTofvesson/TeamAvionLauncher/releases/download/"+m.group(4)+".jar"; downloadLink = "https://github.com/GabrielTofvesson/TeamAvionLauncher/releases/download/"+m.group(4)+".jar";
} }
if(downloadLink.equals("")) return; if(downloadLink.equals("")) return;
@ -86,6 +78,7 @@ public class Updater {
reader.close(); reader.close();
o.close(); o.close();
Runtime.getRuntime().exec("java -jar Tal1.jar"); Runtime.getRuntime().exec("java -jar Tal1.jar");
System.exit(0);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println("No internet connection available!"); System.out.println("No internet connection available!");