Add --markers option to cli

Author: TBlueF

common/src/main/java/de/bluecolored/bluemap/common/BlueMapService.java

@@ -249,27 +249,9 @@ private synchronized void loadMap(String id, MapConfig mapConfig) throws Configu
             );
             maps.put(id, map);
 
-            // load marker-config by converting it first from hocon to json and then loading it with MarkerGson
-            ConfigurationNode markerSetNode = mapConfig.getMarkerSets();
-            if (markerSetNode != null && !markerSetNode.empty()) {
-                String markerJson = GsonConfigurationLoader.builder()
-                        .headerMode(HeaderMode.NONE)
-                        .lenient(false)
-                        .indent(0)
-                        .buildAndSaveString(markerSetNode);
-                Gson gson = MarkerGson.addAdapters(new GsonBuilder())
-                        .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
-                        .create();
-                Type markerSetType = new TypeToken<Map<String, MarkerSet>>() {}.getType();
-                Map<String, MarkerSet> markerSets = gson.fromJson(markerJson, markerSetType);
-                map.getMarkerSets().putAll(markerSets);
-            }
+            // load markers
+            map.getMarkerSets().putAll(mapConfig.parseMarkerSets());
 
-        } catch (ConfigurateException | JsonParseException ex) {
-            throw new ConfigurationException(
-                    "Failed to create the markers for map '" + id + "'!\n" +
-                    "Make sure your marker-configuration for this map is valid.",
-                    ex);
         } catch (IOException | ConfigurationException ex) {
             throw new ConfigurationException("Failed to load map '" + id + "'!", ex);
         }

common/src/main/java/de/bluecolored/bluemap/common/config/MapConfig.java

@@ -26,15 +26,27 @@
 
 import com.flowpowered.math.vector.Vector2i;
 import com.flowpowered.math.vector.Vector3i;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import de.bluecolored.bluemap.api.gson.MarkerGson;
+import de.bluecolored.bluemap.api.markers.MarkerSet;
 import de.bluecolored.bluemap.core.map.MapSettings;
 import de.bluecolored.bluemap.core.util.Key;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.gson.GsonConfigurationLoader;
+import org.spongepowered.configurate.loader.HeaderMode;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
 
+import java.lang.reflect.Type;
 import java.nio.file.Path;
+import java.util.Map;
 
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 @ConfigSerializable
@@ -104,4 +116,26 @@ public Vector3i getMaxPos() {
         return max;
     }
 
+    /**
+     * parse marker-config by converting it first from hocon to json and then loading it with MarkerGson
+     */
+    public Map<String, MarkerSet> parseMarkerSets() throws ConfigurationException {
+        if (markerSets == null || markerSets.empty()) return Map.of();
+        try {
+            String markerJson = GsonConfigurationLoader.builder()
+                    .headerMode(HeaderMode.NONE)
+                    .lenient(false)
+                    .indent(0)
+                    .buildAndSaveString(markerSets);
+            Gson gson = MarkerGson.addAdapters(new GsonBuilder())
+                    .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
+                    .create();
+            Type markerSetType = new TypeToken<Map<String, MarkerSet>>() {}.getType();
+            return gson.fromJson(markerJson, markerSetType);
+        } catch (ConfigurateException | JsonParseException ex) {
+            throw new ConfigurationException("Failed to parse marker-sets." +
+                    "Make sure your marker-configuration for this map is valid.", ex);
+        }
+    }
+
 }

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

@@ -24,19 +24,20 @@
  */
 package de.bluecolored.bluemap.cli;
 
+import de.bluecolored.bluemap.api.gson.MarkerGson;
 import de.bluecolored.bluemap.common.BlueMapConfiguration;
 import de.bluecolored.bluemap.common.BlueMapService;
 import de.bluecolored.bluemap.common.MissingResourcesException;
 import de.bluecolored.bluemap.common.addons.Addons;
 import de.bluecolored.bluemap.common.api.BlueMapAPIImpl;
 import de.bluecolored.bluemap.common.commands.TextFormat;
-import de.bluecolored.bluemap.common.config.BlueMapConfigManager;
-import de.bluecolored.bluemap.common.config.ConfigurationException;
-import de.bluecolored.bluemap.common.config.CoreConfig;
-import de.bluecolored.bluemap.common.config.WebserverConfig;
+import de.bluecolored.bluemap.common.config.*;
 import de.bluecolored.bluemap.common.metrics.Metrics;
 import de.bluecolored.bluemap.common.plugin.MapUpdateService;
-import de.bluecolored.bluemap.common.rendermanager.*;
+import de.bluecolored.bluemap.common.rendermanager.MapUpdatePreparationTask;
+import de.bluecolored.bluemap.common.rendermanager.RenderManager;
+import de.bluecolored.bluemap.common.rendermanager.RenderTask;
+import de.bluecolored.bluemap.common.rendermanager.TileUpdateStrategy;
 import de.bluecolored.bluemap.common.web.*;
 import de.bluecolored.bluemap.common.web.http.HttpRequestHandler;
 import de.bluecolored.bluemap.common.web.http.HttpServer;
@@ -49,9 +50,13 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
@@ -216,6 +221,34 @@ public void run() {
         }
     }
 
+    public void updateMarkers(BlueMapService blueMap, @Nullable String mapsToUpdate) {
+        Predicate<String> mapFilter = mapId -> true;
+        if (mapsToUpdate != null) {
+            Set<String> mapsToRenderSet = Set.of(mapsToUpdate.split(","));
+            mapFilter = mapsToRenderSet::contains;
+        }
+
+        for (Map.Entry<String, MapConfig> entry : blueMap.getConfig().getMapConfigs().entrySet()) {
+            String mapId = entry.getKey();
+            MapConfig mapConfig = entry.getValue();
+
+            if (!mapFilter.test(mapId)) return;
+
+            try {
+                MapStorage storage = blueMap.getOrLoadStorage(mapConfig.getStorage()).map(mapId);
+                try (
+                        OutputStream out = storage.markers().write();
+                        Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)
+                ) {
+                    MarkerGson.INSTANCE.toJson(mapConfig.parseMarkerSets(), writer);
+                }
+                Logger.global.logInfo("Updated markers for map '" + mapId + "'");
+            } catch (Exception ex) {
+                Logger.global.logError("Failed to save markers for map '" + mapId + "'!", ex);
+            }
+        }
+    }
+
     public void startWebserver(BlueMapService blueMap, boolean verbose) throws IOException, ConfigurationException, InterruptedException {
         Logger.global.logInfo("Starting webserver ...");
 
@@ -374,6 +407,11 @@ public static void main(String[] args) {
                 String mapsToRender = cmd.getOptionValue("m", null);
                 cli.renderMaps(blueMap, watch, force, generateWebappFiles, mapsToRender);
             } else {
+                if (cmd.hasOption("markers")) {
+                    noActions = false;
+                    String mapsToUpdate = cmd.getOptionValue("m", null);
+                    cli.updateMarkers(blueMap, mapsToUpdate);
+                }
                 if (cmd.hasOption("g")) {
                     noActions = false;
                     blueMap.createOrUpdateWebApp(true);
@@ -480,6 +518,8 @@ private static Options createOptions() {
         options.addOption("f", "force-render", false, "Forces rendering everything, instead of only rendering chunks that have been modified since the last render");
         options.addOption("m", "maps", true, "A comma-separated list of map-id's that should be rendered. Example: 'world,nether'");
 
+        options.addOption(null, "markers", false, "Updates the map-markers based on the map configs");
+
         options.addOption("u", "watch", false, "Watches for file-changes after rendering and updates the map");
 
         options.addOption("V", "version", false, "Print the current BlueMap version");