Improve cli map-update logging

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/plugin/MapUpdateService.java

@@ -40,6 +40,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 
 public class MapUpdateService extends Thread {
 
@@ -57,7 +58,9 @@ public class MapUpdateService extends Thread {
     private final Map<Vector2i, TimerTask> scheduledUpdates;
     private final Cache<Vector2i, Long> lastUpdateTimes;
 
-    public MapUpdateService(RenderManager renderManager, BmMap map, Duration regionUpdateCooldown) throws IOException {
+    private final Consumer<String> verboseLog;
+
+    public MapUpdateService(RenderManager renderManager, BmMap map, Duration regionUpdateCooldown, boolean verbose) throws IOException {
         super("BlueMap-MapUpdateService-" + NEXT_ID.getAndIncrement());
         this.renderManager = renderManager;
         this.map = map;
@@ -68,13 +71,14 @@ public MapUpdateService(RenderManager renderManager, BmMap map, Duration regionU
                 .expireAfterWrite(regionUpdateCooldown)
                 .build();
         this.watchService = map.getWorld().createRegionWatchService();
+        this.verboseLog = verbose ? Logger.global::logInfo : Logger.global::logDebug;
     }
 
     @Override
     public void run() {
         if (delayTimer == null) delayTimer = new Timer("BlueMap-RegionFileWatchService-DelayTimer", true);
 
-        Logger.global.logDebug("Started watching map '" + map.getId() + "' for updates...");
+        verboseLog.accept("Started watching map '" + map.getId() + "' for updates...");
 
         try {
             while (!closed)
@@ -85,7 +89,7 @@ public void run() {
         } catch (InterruptedException iex) {
             Thread.currentThread().interrupt();
         } finally {
-            Logger.global.logDebug("Stopped watching map '" + map.getId() + "' for updates.");
+            verboseLog.accept("Stopped watching map '" + map.getId() + "' for updates.");
             if (!closed) {
                 Logger.global.logWarning("Region-file watch-service for map '" + map.getId() +
                         "' stopped unexpectedly! (This map might not update automatically from now on)");
@@ -109,7 +113,7 @@ public void run() {
                     renderManager.scheduleRenderTask(task);
                     lastUpdateTimes.put(regionPos, System.currentTimeMillis());
 
-                    Logger.global.logDebug("Scheduled update for region-file: " + regionPos + " (Map: " + map.getId() + ")");
+                    verboseLog.accept("Scheduled update for region-file: " + regionPos + " (Map: " + map.getId() + ")");
                 }
             }
         };

common/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

@@ -571,7 +571,7 @@ public synchronized void startWatchingMap(BmMap map) {
         if (blueMap == null) return;
 
         try {
-            MapUpdateService watcher = new MapUpdateService(renderManager, map, blueMap.getConfig().getPluginConfig().getUpdateCooldown());
+            MapUpdateService watcher = new MapUpdateService(renderManager, map, blueMap.getConfig().getPluginConfig().getUpdateCooldown(), false);
             watcher.start();
             mapUpdateServices.put(map.getId(), watcher);
         } catch (IOException ex) {

implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java

@@ -103,7 +103,7 @@ public void renderMaps(BlueMapService blueMap, boolean watch, TileUpdateStrategy
         if (watch) {
             for (BmMap map : maps.values()) {
                 try {
-                    MapUpdateService watcher = new MapUpdateService(renderManager, map, blueMap.getConfig().getPluginConfig().getUpdateCooldown());
+                    MapUpdateService watcher = new MapUpdateService(renderManager, map, blueMap.getConfig().getPluginConfig().getUpdateCooldown(), true);
                     watcher.start();
                     mapUpdateServices.add(watcher);
                 } catch (IOException ex) {
@@ -139,10 +139,19 @@ public void renderMaps(BlueMapService blueMap, boolean watch, TileUpdateStrategy
 
         Timer timer = new Timer("BlueMap-CLI-Timer", true);
         TimerTask updateInfoTask = new TimerTask() {
+
+            boolean wasIdle = false;
+
             @Override
             public void run() {
                 RenderTask task = renderManager.getCurrentRenderTask();
-                if (task == null) return;
+
+                if (task == null){
+                    if (!wasIdle) Logger.global.logInfo("Waiting for changes on the world-files...");
+                    wasIdle = true;
+                    return;
+                }
+                wasIdle = false;
 
                 double progress = task.estimateProgress();
                 long etaMs = renderManager.estimateCurrentRenderTaskTimeRemaining();
@@ -215,10 +224,7 @@ public void run() {
 
         Logger.global.logInfo("Your maps are now all up-to-date!");
 
-        if (watch) {
-            updateInfoTask.cancel();
-            Logger.global.logInfo("Waiting for changes on the world-files...");
-        } else {
+        if (!watch) {
             Runtime.getRuntime().removeShutdownHook(shutdownHook);
             shutdown.run();
         }