From f430879e14a86e8a663ffca7fa6dd8eeed588f19 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 22 Jan 2019 15:46:59 +0300 Subject: [PATCH 1/6] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 38e11640..53106ee2 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 38e11640ce4a4ed3e9745718db02a888770a22bb +Subproject commit 53106ee20700cb73ad65fd7dddf69b0d0b766f4c From d62d039a6ad57435e99e283d73b3895001e419de Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 22 Jan 2019 16:49:58 +0300 Subject: [PATCH 2/6] =?UTF-8?q?[FIX]=20=D0=A1=D1=80=D0=B0=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=B3=D0=B8=D1=82=D1=85=D0=B0=D0=B1=D0=B5=20?= =?UTF-8?q?=D1=81=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B9,=20=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B2=D0=BE=D0=B4.=20+=20[FEATURE]=20=D0=92=D0=BE=D0=B7?= =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1?= =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/gravit/launchserver/LaunchServer.java | 2 + .../java/ru/gravit/launchserver/Updater.java | 50 ++++++++++++++++--- .../gravit/launchserver/defaults/config.cfg | 1 + 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java index 0f2b0b45..f1552b8d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java @@ -111,6 +111,8 @@ public static final class Config { public String startScript; + public boolean updatesNotify = true; // Defaultly to true + public String getAddress() { return address; } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java index 0befa8f1..b210c60c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java @@ -9,11 +9,16 @@ import java.util.Locale; import java.util.Timer; import java.util.TimerTask; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.kohsuke.github.GHRelease; import org.kohsuke.github.GHRepository; import org.kohsuke.github.GitHub; +import ru.gravit.launcher.Launcher; +import ru.gravit.utils.Version; +import ru.gravit.utils.Version.Type; import ru.gravit.utils.helper.LogHelper; public class Updater extends TimerTask { @@ -21,7 +26,6 @@ public class Updater extends TimerTask { private static final long period = 1000*3600; private final Timer taskPool; private final GHRepository gravitLauncher; - private GHRelease parenRel = null; public Updater(LaunchServer srv) { this.taskPool = new Timer("Updater thread", true); @@ -35,20 +39,54 @@ public Updater(LaunchServer srv) { this.gravitLauncher = gravitLauncherTmp; run(); - taskPool.schedule(this, new Date(System.currentTimeMillis()+period), period); + if (srv.config.updatesNotify) taskPool.schedule(this, new Date(System.currentTimeMillis()+period), period); } @Override public void run() { try { GHRelease rel = gravitLauncher.getLatestRelease(); - if (rel.equals(parenRel)) return; - LogHelper.warning("Latest release: %s", rel.getName()); - LogHelper.warning("It`s published at: " + DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(rel.getPublished_at().getTime()), ZoneId.systemDefault()))); - parenRel = rel; + Version relV = parseVer(rel.getTagName()); + if (Launcher.getVersion().major >= relV.major || Launcher.getVersion().minor >= relV.minor + || Launcher.getVersion().patch >= relV.patch || Launcher.getVersion().build >= relV.build) return; + if (relV.release.equals(Type.STABLE) || relV.release.equals(Type.LTS)) { + LogHelper.warning("New %s release: %s", relV.getReleaseStatus(), relV.getVersionString()); + LogHelper.warning("You can download it: " + rel.getHtmlUrl().toString()); + LogHelper.warning("It`s published at: " + DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(rel.getPublished_at().getTime()), ZoneId.systemDefault()))); + } else { + LogHelper.debug("New %s release: %s", relV.getReleaseStatus(), relV.getVersionString()); + LogHelper.debug("You can download it: " + rel.getHtmlUrl()); + LogHelper.debug("It`s published at: " + DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(rel.getPublished_at().getTime()), ZoneId.systemDefault()))); + } } catch (IOException e) { LogHelper.error(e); } } + private static final Pattern startingVerPattern = Pattern.compile("\\d+\\.\\d+\\.\\d+"); + private static final Pattern pointPatternStriper = Pattern.compile("\\."); + + private static Version parseVer(String tag) { + String relS = "4.3.4-stable"; + Matcher verMatcher = startingVerPattern.matcher(relS); + if (!verMatcher.find()) return null; + String[] ver = pointPatternStriper.split(relS.substring(verMatcher.start(), verMatcher.end())); + if (ver.length < 3) return null; + return new Version(Integer.parseInt(ver[0]), Integer.parseInt(ver[1]), + Integer.parseInt(ver[2]), ver.length > 3 ? Integer.parseInt(ver[3]) : 0, findRelType(relS.substring(verMatcher.end()+1))); + } + + private static Type findRelType(String substring) { + if (substring.length() < 3 || substring.isEmpty()) return Type.UNKNOWN; + String tS = substring; + while (tS.startsWith("-")) tS = tS.substring(1); + tS = tS.toLowerCase(Locale.ENGLISH); + if (tS.contains("lts")) return Type.LTS; + if (tS.contains("stable")) return Type.STABLE; + if (tS.contains("dev")) return Type.DEV; + if (tS.contains("alpha")) return Type.ALPHA; + if (tS.contains("beta")) return Type.BETA; + if (tS.contains("exp")) return Type.EXPERIMENTAL; + return Type.UNKNOWN; + } } diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg index 85f9a164..c0eaf34b 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg @@ -56,6 +56,7 @@ "isDownloadJava": false, "isWarningMissArchJava": true, "enabledProGuard": true, + "updatesNotify": true, "stripLineNumbers": true, "deleteTempFiles": true, "startScript": ".\\start.sh" From 9c34019446a9b502de63d6ddc2e8166ff8845ad8 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 22 Jan 2019 16:52:32 +0300 Subject: [PATCH 3/6] =?UTF-8?q?[FIX]=20=D0=98=D0=B3=D0=BD=D0=BE=D1=80?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF=D0=BE=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=D0=B4=D0=BD=D0=B5=D0=B3=D0=BE=20=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/gravit/launchserver/Updater.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java index b210c60c..4928a9f4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java @@ -1,6 +1,5 @@ package ru.gravit.launchserver; -import java.io.IOException; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -33,7 +32,7 @@ public Updater(LaunchServer srv) { GHRepository gravitLauncherTmp = null; try { gravitLauncherTmp = GitHub.connectAnonymously().getOrganization("GravitLauncher").getRepository("Launcher"); - } catch (IOException e) { + } catch (Throwable e) { LogHelper.error(e); } this.gravitLauncher = gravitLauncherTmp; @@ -58,7 +57,7 @@ public void run() { LogHelper.debug("You can download it: " + rel.getHtmlUrl()); LogHelper.debug("It`s published at: " + DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(rel.getPublished_at().getTime()), ZoneId.systemDefault()))); } - } catch (IOException e) { + } catch (Throwable e) { LogHelper.error(e); } } From 012870cf26d4a095038c97870c4fc5a8d974bb4a Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 22 Jan 2019 21:25:51 +0300 Subject: [PATCH 4/6] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=BE=D0=B2=20Updater=201=20=D1=87=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=8C=20-=20=D1=84=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D0=BF=D0=B0=D1=81=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launchserver/Updater.java | 29 ++++++++++--------- .../launcher/profiles/ClientProfile.java | 1 - 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java index 4928a9f4..7e7d0ee6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java @@ -23,6 +23,7 @@ public class Updater extends TimerTask { private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss", Locale.US); private static final long period = 1000*3600; + private static final Version VERSION = Launcher.getVersion(); private final Timer taskPool; private final GHRepository gravitLauncher; @@ -46,8 +47,8 @@ public void run() { try { GHRelease rel = gravitLauncher.getLatestRelease(); Version relV = parseVer(rel.getTagName()); - if (Launcher.getVersion().major >= relV.major || Launcher.getVersion().minor >= relV.minor - || Launcher.getVersion().patch >= relV.patch || Launcher.getVersion().build >= relV.build) return; + if (VERSION.major >= relV.major || VERSION.minor >= relV.minor + || VERSION.patch >= relV.patch || VERSION.build >= relV.build) return; if (relV.release.equals(Type.STABLE) || relV.release.equals(Type.LTS)) { LogHelper.warning("New %s release: %s", relV.getReleaseStatus(), relV.getVersionString()); LogHelper.warning("You can download it: " + rel.getHtmlUrl().toString()); @@ -65,8 +66,7 @@ public void run() { private static final Pattern startingVerPattern = Pattern.compile("\\d+\\.\\d+\\.\\d+"); private static final Pattern pointPatternStriper = Pattern.compile("\\."); - private static Version parseVer(String tag) { - String relS = "4.3.4-stable"; + private static Version parseVer(String relS) { Matcher verMatcher = startingVerPattern.matcher(relS); if (!verMatcher.find()) return null; String[] ver = pointPatternStriper.split(relS.substring(verMatcher.start(), verMatcher.end())); @@ -78,14 +78,17 @@ private static Version parseVer(String tag) { private static Type findRelType(String substring) { if (substring.length() < 3 || substring.isEmpty()) return Type.UNKNOWN; String tS = substring; - while (tS.startsWith("-")) tS = tS.substring(1); - tS = tS.toLowerCase(Locale.ENGLISH); - if (tS.contains("lts")) return Type.LTS; - if (tS.contains("stable")) return Type.STABLE; - if (tS.contains("dev")) return Type.DEV; - if (tS.contains("alpha")) return Type.ALPHA; - if (tS.contains("beta")) return Type.BETA; - if (tS.contains("exp")) return Type.EXPERIMENTAL; - return Type.UNKNOWN; + if (tS.startsWith("-")) tS = tS.substring(1); + tS = tS.toUpperCase(Locale.ENGLISH); + Type t = Type.UNKNOWN; + try { + t = Type.valueOf(tS); + } catch (Throwable ign) { // ignore it + } + return t; + } + + public static void main(String[] args) { + System.out.println(parseVer("v3.4.5.6-stable").release); } } diff --git a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java index 5d7858c6..8de9245a 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java @@ -10,7 +10,6 @@ import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.file.Path; import java.util.*; public final class ClientProfile implements Comparable { From 2a59e8fe0b262be0ea07eec276bc7f785a16356d Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Tue, 22 Jan 2019 22:12:56 +0300 Subject: [PATCH 5/6] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B2=D1=8B=D1=8F=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20-=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=202.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launchserver/Updater.java | 27 +++++------- .../main/java/ru/gravit/utils/Version.java | 44 +++++++------------ 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java index 7e7d0ee6..2fb267be 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java @@ -8,6 +8,7 @@ import java.util.Locale; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -26,7 +27,8 @@ public class Updater extends TimerTask { private static final Version VERSION = Launcher.getVersion(); private final Timer taskPool; private final GHRepository gravitLauncher; - + private Version parent = VERSION; + public Updater(LaunchServer srv) { this.taskPool = new Timer("Updater thread", true); @@ -37,7 +39,6 @@ public Updater(LaunchServer srv) { LogHelper.error(e); } this.gravitLauncher = gravitLauncherTmp; - run(); if (srv.config.updatesNotify) taskPool.schedule(this, new Date(System.currentTimeMillis()+period), period); } @@ -47,6 +48,7 @@ public void run() { try { GHRelease rel = gravitLauncher.getLatestRelease(); Version relV = parseVer(rel.getTagName()); + if (!relV.equals(parent)) parent = relV; if (VERSION.major >= relV.major || VERSION.minor >= relV.minor || VERSION.patch >= relV.patch || VERSION.build >= relV.build) return; if (relV.release.equals(Type.STABLE) || relV.release.equals(Type.LTS)) { @@ -68,9 +70,9 @@ public void run() { private static Version parseVer(String relS) { Matcher verMatcher = startingVerPattern.matcher(relS); - if (!verMatcher.find()) return null; + if (!verMatcher.find()) return VERSION; String[] ver = pointPatternStriper.split(relS.substring(verMatcher.start(), verMatcher.end())); - if (ver.length < 3) return null; + if (ver.length < 3) return VERSION; return new Version(Integer.parseInt(ver[0]), Integer.parseInt(ver[1]), Integer.parseInt(ver[2]), ver.length > 3 ? Integer.parseInt(ver[3]) : 0, findRelType(relS.substring(verMatcher.end()+1))); } @@ -79,16 +81,11 @@ private static Type findRelType(String substring) { if (substring.length() < 3 || substring.isEmpty()) return Type.UNKNOWN; String tS = substring; if (tS.startsWith("-")) tS = tS.substring(1); - tS = tS.toUpperCase(Locale.ENGLISH); - Type t = Type.UNKNOWN; - try { - t = Type.valueOf(tS); - } catch (Throwable ign) { // ignore it - } - return t; - } - - public static void main(String[] args) { - System.out.println(parseVer("v3.4.5.6-stable").release); + final String wrk = tS.toLowerCase(Locale.ENGLISH); + final AtomicReference t = new AtomicReference(Type.UNKNOWN); + Type.unModTypes.forEach((s, type) -> { + if (wrk.startsWith(s)) t.set(type); + }); + return t.get(); } } diff --git a/libLauncher/src/main/java/ru/gravit/utils/Version.java b/libLauncher/src/main/java/ru/gravit/utils/Version.java index 5795a7a8..1f0a0577 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/Version.java +++ b/libLauncher/src/main/java/ru/gravit/utils/Version.java @@ -2,6 +2,11 @@ import ru.gravit.launcher.LauncherAPI; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; import java.util.Objects; public final class Version { @@ -68,34 +73,8 @@ public int hashCode() { @LauncherAPI public String getReleaseStatus() { - String result; - switch (release) { - case LTS: - result = "lts"; - break; - case STABLE: - result = "stable"; - break; - case BETA: - result = "beta"; - break; - case ALPHA: - result = "alpha"; - break; - case DEV: - result = "dev"; - break; - case EXPERIMENTAL: - result = "experimental"; - break; - case UNKNOWN: - result = ""; - break; - default: - result = ""; - break; - } - return result; + if (release.equals(Type.UNKNOWN)) return ""; + return release.name().toLowerCase(Locale.ENGLISH); } @Override @@ -112,6 +91,13 @@ public enum Type { ALPHA, DEV, EXPERIMENTAL, - UNKNOWN + UNKNOWN; + + private static final Map types = new HashMap<>(); + public static final Map unModTypes = Collections.unmodifiableMap(types); + + static { + Arrays.asList(values()).stream().forEach(type -> types.put(type.name().substring(0, type.name().length() < 3 ? type.name().length() : 3), type)); + } } } From e7970bdbb3aa038f9c921eff77b5212912392e06 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Thu, 24 Jan 2019 15:43:39 +0300 Subject: [PATCH 6/6] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D0=B8=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launchserver/Updater.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java index 2fb267be..7136de39 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/Updater.java @@ -28,7 +28,7 @@ public class Updater extends TimerTask { private final Timer taskPool; private final GHRepository gravitLauncher; private Version parent = VERSION; - + public Updater(LaunchServer srv) { this.taskPool = new Timer("Updater thread", true); @@ -48,9 +48,13 @@ public void run() { try { GHRelease rel = gravitLauncher.getLatestRelease(); Version relV = parseVer(rel.getTagName()); - if (!relV.equals(parent)) parent = relV; - if (VERSION.major >= relV.major || VERSION.minor >= relV.minor - || VERSION.patch >= relV.patch || VERSION.build >= relV.build) return; + if (relV == null) { + LogHelper.debug("Updater: parsing version error."); + return; + } + if (!parent.equals(relV)) parent = relV; + if (VERSION.major >= relV.major && VERSION.minor >= relV.minor + && VERSION.patch >= relV.patch && VERSION.build >= relV.build) return; if (relV.release.equals(Type.STABLE) || relV.release.equals(Type.LTS)) { LogHelper.warning("New %s release: %s", relV.getReleaseStatus(), relV.getVersionString()); LogHelper.warning("You can download it: " + rel.getHtmlUrl().toString()); @@ -66,12 +70,12 @@ public void run() { } private static final Pattern startingVerPattern = Pattern.compile("\\d+\\.\\d+\\.\\d+"); - private static final Pattern pointPatternStriper = Pattern.compile("\\."); + private static final Pattern pointPatternSpltitter = Pattern.compile("\\."); private static Version parseVer(String relS) { Matcher verMatcher = startingVerPattern.matcher(relS); if (!verMatcher.find()) return VERSION; - String[] ver = pointPatternStriper.split(relS.substring(verMatcher.start(), verMatcher.end())); + String[] ver = pointPatternSpltitter.split(relS.substring(verMatcher.start(), verMatcher.end())); if (ver.length < 3) return VERSION; return new Version(Integer.parseInt(ver[0]), Integer.parseInt(ver[1]), Integer.parseInt(ver[2]), ver.length > 3 ? Integer.parseInt(ver[3]) : 0, findRelType(relS.substring(verMatcher.end()+1)));