Update enchancement and more stats

Updates are now faster as it doesn't wait until all are finished
Added last 5, 10, 15 and 30 minutes tournament position to stats

Author: itsfolf

build.gradle

@@ -20,7 +20,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.2'
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'com.google.guava:guava:24.0-jre'
-    compile 'net.olympiccode:vHackOSAPI-Java:master-SNAPSHOT'
+    compile 'net.olympiccode:vHackOSAPI-Java:437c7fc33f'
     compile 'io.sentry:sentry:1.7.1'
 }
 mainClassName = "net.olympiccode.vhackos.bot.core.vHackOSBot"

src/main/java/net/olympiccode/vhackos/bot/core/misc/MiscService.java

@@ -2,7 +2,6 @@
 
 import io.sentry.Sentry;
 import net.olympiccode.vhackos.api.entities.AppType;
-import net.olympiccode.vhackos.api.network.ExploitedTarget;
 import net.olympiccode.vhackos.bot.core.BotService;
 import net.olympiccode.vhackos.bot.core.vHackOSBot;
 import org.slf4j.Logger;
@@ -14,6 +13,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class MiscService implements BotService {
+
     ScheduledExecutorService miscService;
     Logger LOG = LoggerFactory.getLogger("MiscService");
 
@@ -29,10 +29,11 @@ public ScheduledExecutorService getService() {
 
     public void setup() {
         LOG.info("Setting up MiscSerice...");
-        miscService.scheduleAtFixedRate(() -> runService(), 0, 60000 * 60, TimeUnit.MILLISECONDS);
+        miscService.scheduleAtFixedRate(() -> runLongService(), 0, 60000 * 60, TimeUnit.MILLISECONDS);
+        miscService.scheduleAtFixedRate(() -> runService(), 0, 60000 * 5, TimeUnit.MILLISECONDS);
     }
-
-    public void runService() {
+    public static int[] history = {0, 0, 0, 0, 0, 0};
+    public void runLongService() {
         try {
             if (MiscConfigValues.enableMiner) {
                 if (vHackOSBot.api.getAppManager().getApp(AppType.NCMiner).isInstalled()) {
@@ -53,6 +54,22 @@ public void runService() {
         }
     }
 
+    public void runService() {
+        try {
+            history[5] = history[4];
+            history[4] = history[3];
+            history[3] = history[2];
+            history[2] = history[1];
+            history[1] = history[0];
+            history[0] = vHackOSBot.api.getLeaderboards().getTournamentRank();
+        } catch (Exception e) {
+            Sentry.capture(e);
+            e.printStackTrace();
+            miscService.shutdownNow();
+            LOG.warn("The misc service has been shutdown due to an error.");
+        }
+    }
+
     public class MiscServiceFactory implements ThreadFactory {
         public Thread newThread(Runnable r) {
             return new Thread(r, "vHackOSBot-MiscService");

src/main/java/net/olympiccode/vhackos/bot/core/updating/UpdateService.java

@@ -105,15 +105,25 @@ public void runService() {
             List<Task> activetasks = vHackOSBot.api.getTaskManager().getActiveTasks();
             if (activetasks.size() < 1) {
                 App app = getNextApp();
-                LOG.info("Starting update of " + app.getType() + " for " + app.getPrice() + ".");
+                if (app.getPrice() > vHackOSBot.api.getStats().getMoney()) LOG.warn("Could not start update: Out of money");
+                LOG.info("Starting 10 updates of " + app.getType() + " for " + app.getPrice() + ".");
                 if (app.getAsUpdateable().fillTasks()) {
                     proccessBoosts();
                 } else {
                     LOG.warn("Failed to start update of " + app.getType() + " could be out of money or there are already tasks running.");
                 }
-            } else {
+            } else if (activetasks.size() >= 10) {
                 LOG.info("There are already updates running, trying to boost them..");
                 proccessBoosts();
+            } else {
+               int missing = 10 - activetasks.size();
+                App app = getNextApp();
+                if (app.getPrice() > vHackOSBot.api.getStats().getMoney()) LOG.warn("Could not start update: Out of money");
+                LOG.info("Starting " + missing + " updates of " + app.getType() + " for " + app.getPrice() + ".");
+                if (!app.getAsUpdateable().fillTasks()) {
+                    LOG.warn("Failed to start update of " + app.getType() + " could be out of money or there are already tasks running.");
+                }
+                proccessBoosts();
             }
         } catch (Exception e) {
             Sentry.capture(e);

src/main/java/net/olympiccode/vhackos/bot/core/vHackOSBot.java

@@ -38,7 +38,7 @@ public class vHackOSBot {
     ConfigFile config = new ConfigFile();
     AdvancedConfigFile advConfig = new AdvancedConfigFile();
     BotService updateService = new UpdateService();
-    BotService miscService = new MiscService();
+    MiscService miscService = new MiscService();
     BotService networkingService = new NetworkingService();
 
     public static void main(String[] args) {
@@ -141,7 +141,7 @@ public void run() throws LoginException, InterruptedException {
                                 "Level: " + api.getStats().getLevel() + getProgressBar());
                         break;
                     case "tasks":
-                        System.out.println("-------------------\n" + "Boosters: " + api.getTaskManager().getBoosters() + "\n-------------------\n" + api.getTaskManager().getActiveTasks().stream().map(task -> task.getType() + ": " + task.getLevel() + " " + ((task.getEndTimestamp() - System.currentTimeMillis()) / 1000) + "sec left.").collect(Collectors.joining("\n")) + "\n-------------------");
+                        System.out.println("-------------------\n" + "Boosters: " + api.getTaskManager().getBoosters() + "\n-------------------\n" + api.getTaskManager().getActiveTasks().stream().map(task -> task.getType() + ": " + task.getLevel() + " " + getTimeLeft((task.getEndTimestamp() - System.currentTimeMillis()) ) + " left.").collect(Collectors.joining("\n")) + "\n-------------------");
                         break;
                     case "brutes":
                         System.out.println("-------------------\n" + api.getTaskManager().getActiveBrutes().stream().map(bruteForce -> bruteForce.getUsername() + ": " + bruteForce.getState()).collect(Collectors.joining("\n")) + "\n-------------------");
@@ -157,7 +157,9 @@ public void run() throws LoginException, InterruptedException {
                     case "leader":
                     case "leaders":
                     case "leaderboards":
-                        System.out.println("-------------------\n" + "Current tournament pos: " + api.getLeaderboards().getTournamentRank() + "\nTournament ends in: "  + getTimeLeft() + "\nCurrent global pos: " + api.getLeaderboards().getRank() + "\n-------------------");
+                        System.out.println("-------------------\n" + "Current tournament pos: " + api.getLeaderboards().getTournamentRank() +
+                                "\nTournament history (5, 10, 15, 30 min): " + miscService.history[0] + ", " + miscService.history[1] + ", " + miscService.history[2] + ", " + miscService.history[5] +
+                                "\nTournament ends in: "  + getTimeLeft(api.getLeaderboards().getTournamentEndTimestamp() - System.currentTimeMillis()) + "\nCurrent global pos: " + api.getLeaderboards().getRank() + "\n-------------------");
                         break;
                     case "quit":
                         System.exit(0);
@@ -176,9 +178,7 @@ private String getStatus(ScheduledExecutorService service) {
         return "Running.";
     }
 
-    private String getTimeLeft() {
-        long time = api.getLeaderboards().getTournamentEndTimestamp();
-        long millis = time - System.currentTimeMillis();
+    private String getTimeLeft(long millis) {
         return String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(millis),
                 TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)),
                 TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(millis)));