From a152bfeec3447f6d88e3dda89958f98fc09a896f Mon Sep 17 00:00:00 2001 From: Emmastone Date: Fri, 21 Oct 2016 00:57:21 +0100 Subject: [PATCH 1/7] [FEATURE] Added nightly support for randoms Related to issue #134. --- .../org/parabot/core/parsers/randoms/PublicRandoms.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java index 9eb6315..a65b149 100644 --- a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java +++ b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java @@ -5,7 +5,6 @@ import org.parabot.core.Context; import org.parabot.core.Core; import org.parabot.core.Directories; import org.parabot.core.io.NoProgressListener; -import org.parabot.core.io.ProgressListener; import org.parabot.environment.api.utils.WebUtil; import java.io.File; @@ -46,12 +45,17 @@ public class PublicRandoms extends RandomParser { private void download() { try { - File random = new File(Directories.getCachePath() + "/randoms.jar"); + File random = new File(Directories.getCachePath() + File.separator + "randoms.jar"); if (random.exists()) { Core.verbose("Public random dependency already exists, no need to download it..."); return; } + String downloadLink = Configuration.GET_RANDOMS; + if (Configuration.BOT_VERSION.isNightly()) { + downloadLink = Configuration.GET_RANDOMS + "?stable=false"; + } + WebUtil.downloadFile(new URL(downloadLink), random, new NoProgressListener()); } catch (Exception e) { e.printStackTrace(); From a61c2513119aad7a3262775bbf4f58e57e5c8069 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Fri, 21 Oct 2016 01:09:03 +0100 Subject: [PATCH 2/7] [CLEANUP] Made if statement in one line --- .../org/parabot/core/parsers/randoms/PublicRandoms.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java index a65b149..986ff56 100644 --- a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java +++ b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java @@ -1,11 +1,11 @@ package org.parabot.core.parsers.randoms; +import org.parabot.api.io.WebUtil; import org.parabot.core.Configuration; import org.parabot.core.Context; import org.parabot.core.Core; import org.parabot.core.Directories; import org.parabot.core.io.NoProgressListener; -import org.parabot.environment.api.utils.WebUtil; import java.io.File; import java.lang.reflect.InvocationTargetException; @@ -51,10 +51,7 @@ public class PublicRandoms extends RandomParser { return; } - String downloadLink = Configuration.GET_RANDOMS; - if (Configuration.BOT_VERSION.isNightly()) { - downloadLink = Configuration.GET_RANDOMS + "?stable=false"; - } + String downloadLink = ((Configuration.BOT_VERSION.isNightly()) ? Configuration.GET_RANDOMS + "?stable=false" : Configuration.GET_RANDOMS); WebUtil.downloadFile(new URL(downloadLink), random, new NoProgressListener()); } catch (Exception e) { From 3e6438362fc4e2bf9e7b417ae91fe500b6fa37c8 Mon Sep 17 00:00:00 2001 From: Emmastone Date: Fri, 21 Oct 2016 17:02:34 +0100 Subject: [PATCH 3/7] =?UTF-8?q?[CLEANUP]=20Added=20=E2=80=9C-nightly?= =?UTF-8?q?=E2=80=9D=20if=20it=E2=80=99s=20nightly=20to=20jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- src/main/java/org/parabot/core/Configuration.java | 2 -- .../org/parabot/core/parsers/randoms/PublicRandoms.java | 8 +++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2b0e03a..ee19873 100755 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.parabot internal-api - 1.4.4 + 1.4.41 diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index dc84042..96a7972 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -24,6 +24,4 @@ public class Configuration extends org.parabot.api.Configuration { public static final String ITEM_API = DATA_API + "items/"; public static final Version BOT_VERSION = ProjectProperties.getProjectVersion(); - - public static final String NIGHTLY_APPEND = "?nightly=true"; } diff --git a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java index 986ff56..4a1d80f 100644 --- a/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java +++ b/src/main/java/org/parabot/core/parsers/randoms/PublicRandoms.java @@ -19,9 +19,11 @@ import java.net.URLClassLoader; */ public class PublicRandoms extends RandomParser { + private String fileName = ((Configuration.BOT_VERSION.isNightly()) ? "randoms-nightly.jar" : "randoms.jar"); + @Override public void parse() { - File myJar = new File(Directories.getCachePath() + "/randoms.jar"); + File myJar = new File(Directories.getCachePath() + File.separator + fileName); if (!myJar.exists() || !myJar.canRead()) { download(); } @@ -45,13 +47,13 @@ public class PublicRandoms extends RandomParser { private void download() { try { - File random = new File(Directories.getCachePath() + File.separator + "randoms.jar"); + File random = new File(Directories.getCachePath() + File.separator + fileName); if (random.exists()) { Core.verbose("Public random dependency already exists, no need to download it..."); return; } - String downloadLink = ((Configuration.BOT_VERSION.isNightly()) ? Configuration.GET_RANDOMS + "?stable=false" : Configuration.GET_RANDOMS); + String downloadLink = ((Configuration.BOT_VERSION.isNightly()) ? Configuration.GET_RANDOMS + Configuration.NIGHTLY_APPEND : Configuration.GET_RANDOMS); WebUtil.downloadFile(new URL(downloadLink), random, new NoProgressListener()); } catch (Exception e) { From 112d5ea59a2d44919fe19949cc965e38147a44c4 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 23 Oct 2016 01:49:52 +0200 Subject: [PATCH 4/7] [BUGFIX] Implemented server provider download from BDN V3 --- src/main/java/org/parabot/core/Configuration.java | 2 +- .../environment/servers/executers/PublicServerExecuter.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 96a7972..1d5f6b2 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -12,7 +12,7 @@ public class Configuration extends org.parabot.api.Configuration { public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server="; public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id="; public static final String GET_SERVER_PROVIDERS = "http://bdn.parabot.org/api/get.php?action=server_providers"; - public static final String GET_SERVER_PROVIDER = "http://bdn.parabot.org/api/get.php?action=server_provider&name="; + public static final String GET_SERVER_PROVIDER = "http://v3.bdn.parabot.org/api/bot/list/provider?nightly=%s"; public static final String GET_SERVER_PROVIDER_INFO = "http://bdn.parabot.org/api/get.php?action=server_information&name="; public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings"; public static final String GET_BOT_VERSION = "http://bdn.parabot.org/api/v2/bot/version"; diff --git a/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java b/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java index 7e32445..9658d42 100644 --- a/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java +++ b/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java @@ -54,8 +54,7 @@ public class PublicServerExecuter extends ServerExecuter { final File destination = new File(Directories.getCachePath(), serverProviderInfo.getCRC32() + ".jar"); - final String jarUrl = Configuration.GET_SERVER_PROVIDER - + this.serverName; + final String jarUrl = String.format(Configuration.GET_SERVER_PROVIDER, Configuration.BOT_VERSION.isNightly()); Core.verbose("Downloading: " + jarUrl + " ..."); From ff70498a53b66eb9ba3a7f2896599c1d4983276b Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 23 Oct 2016 01:54:17 +0200 Subject: [PATCH 5/7] [BUGFIX] Calling validate before translating --- src/main/java/org/parabot/Landing.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 78b7885..7c2b31a 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -33,6 +33,8 @@ public final class Landing { parseArgs(args); + Directories.validate(); + Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode()); try { @@ -48,9 +50,6 @@ public final class Landing { return; } - Core.verbose(TranslationHelper.translate("VALIDATING_DIRECTORIES")); - Directories.validate(); - Core.verbose(TranslationHelper.translate("VALIDATION_ACCOUNT_MANAGER")); AccountManager.validate(); From bb3456045adf062a56d32aba3ae0727b9f81acf1 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 23 Oct 2016 01:57:09 +0200 Subject: [PATCH 6/7] [BUGFIX] Downloading instead of listing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Duh… --- src/main/java/org/parabot/core/Configuration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 1d5f6b2..11fb0cf 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -12,7 +12,7 @@ public class Configuration extends org.parabot.api.Configuration { public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server="; public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id="; public static final String GET_SERVER_PROVIDERS = "http://bdn.parabot.org/api/get.php?action=server_providers"; - public static final String GET_SERVER_PROVIDER = "http://v3.bdn.parabot.org/api/bot/list/provider?nightly=%s"; + public static final String GET_SERVER_PROVIDER = "http://v3.bdn.parabot.org/api/bot/download/provider?nightly=%s"; public static final String GET_SERVER_PROVIDER_INFO = "http://bdn.parabot.org/api/get.php?action=server_information&name="; public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings"; public static final String GET_BOT_VERSION = "http://bdn.parabot.org/api/v2/bot/version"; From 2e5eb6ada205acffd3cfd04cc5e11744626d235b Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 23 Oct 2016 01:57:20 +0200 Subject: [PATCH 7/7] [BUGFIX] Removed username and password from downloading --- .../environment/servers/executers/PublicServerExecuter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java b/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java index 9658d42..73723a4 100644 --- a/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java +++ b/src/main/java/org/parabot/environment/servers/executers/PublicServerExecuter.java @@ -62,7 +62,7 @@ public class PublicServerExecuter extends ServerExecuter { Core.verbose("Found cached server provider [CRC32: " + serverProviderInfo.getCRC32() + "]"); } else { WebUtil.downloadFile(new URL(jarUrl), destination, - VerboseLoader.get(), manager.getAccount().getURLUsername(), manager.getAccount().getURLPassword()); + VerboseLoader.get()); Core.verbose("Server provider downloaded..."); }