added option to disable map specific generation

Author: koliva8245

HeroesDataParser/Cli/Commands/RootCommand.cs

@@ -102,6 +102,7 @@ private void SetOptions(RootSettings settings)
             _options.GameStringText.ReplaceFontStylesVars = true;
 
         _options.LocalizedText = settings.LocalizedTextOption;
+        _options.DisableMapSpecificJson = settings.DisableMapSpecificJson;
         _options.MapSpecificWriterJsonOutputType = settings.MapSpecificWriterJsonOutputType;
         _options.AllowEmptyMapSpecificPatchFiles = settings.AllowEmptyMapSpecificPatchFiles;
         _options.AllowEmptyMapSpecificDirectories = settings.AllowEmptyMapSpecificDirectories;

HeroesDataParser/Cli/Settings/RootSettings.cs

@@ -52,6 +52,10 @@ public class RootSettings : CommandSettings
     [DefaultValue(LocalizedTextOption.None)]
     public LocalizedTextOption LocalizedTextOption { get; init; }
 
+    [CommandOption("--no-map-specific")]
+    [Description("Disable the map specific JSON file creation when 'map' extractor is specified")]
+    public bool DisableMapSpecificJson { get; init; }
+
     [CommandOption("--map-specific-json-output <TYPE>")]
     [Description("Specifies how to handle the map specific JSON file creation")]
     [DefaultValue(MapSpecificWriterJsonOutputType.Patch)]

HeroesDataParser/Infrastructure/Extractors/MapDataExtractorService.cs

@@ -28,7 +28,7 @@ public MapDataExtractorService(
         _resultSummaryService = resultSummaryService;
     }
 
-    public async Task<SortedDictionary<string, Map>> Extract(Func<Map, Task> elementParsersForMap)
+    public async Task<SortedDictionary<string, Map>> Extract(Func<Map, Task> dataParsers)
     {
         _stopwatch.Restart();
 
@@ -77,11 +77,17 @@ public async Task<SortedDictionary<string, Map>> Extract(Func<Map, Task> element
                 {
                     parsedMaps.Add(mapTitle, map);
 
-                    _logger.LogInformation("Running element processors for {MapId}", mapTitle);
+                    if (_options.DisableMapSpecificJson)
+                    {
+                        _logger.LogWarning("Map specific JSON generation is disabled, skipping data processors for {MapId}", mapTitle);
+                        continue;
+                    }
 
-                    await elementParsersForMap.Invoke(map);
+                    _logger.LogInformation("Running data processors for {MapId}", mapTitle);
 
-                    _logger.LogInformation("Completed element processors for {MapId}", mapTitle);
+                    await dataParsers.Invoke(map);
+
+                    _logger.LogInformation("Completed data processors for {MapId}", mapTitle);
                 }
                 else
                 {

HeroesDataParser/Options/RootOptions.cs

@@ -30,6 +30,8 @@ public class RootOptions
 
     public int Threads { get; set; }
 
+    public bool DisableMapSpecificJson { get; set; }
+
     public HiddenOptions Hidden { get; set; } = new();
 
     // properties below here a set/overridden during runtime

HeroesDataParser/appsettings.json

@@ -109,6 +109,7 @@
       //"zhCN",
       //"zhTW"
     ],
+    "DisableMapSpecificJson": false,
     "LocalizedText": "None", // 0 = None, 1 = Extract, 2 = Copy
     "GameStringText": {
       "Type": 0, // 0 = RawText, 1 = PlainText, 2 = PlainTextWithNewlines, 3 = PlainTextWithScaling, 4 = PlainTextWithScalingWithNewlines, 5 = ColoredText, 6 = ColoredTextWithScaling

Tests/HeroesDataParser.Tests/Cli/Commands/RootCommandTests.cs

@@ -394,11 +394,12 @@ public async Task RootCommand_WithDefaultValidArguments_ExecutesSuccessfully(str
         rootOptions.AllowEmptyMapSpecificPatchFiles.Should().BeFalse();
         rootOptions.AllowEmptyMapSpecificDirectories.Should().BeFalse();
         rootOptions.ShowLoadedCustomConfigFiles.Should().BeFalse();
+        rootOptions.DisableMapSpecificJson.Should().BeFalse();
         rootOptions.JsonIndent.Should().BeTrue();
     }
 
     [TestMethod]
-    public async Task RootCommand_WithOnlineArgument_ExecutesSuccessfully()
+    public async Task RootCommand_WithOnlineOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -429,7 +430,7 @@ public async Task RootCommand_WithOnlineArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithOutputArgument_ExecutesSuccessfully()
+    public async Task RootCommand_WithOutputOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -461,7 +462,7 @@ public async Task RootCommand_WithOutputArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithHeroesVersionArgument_ExecutesSuccessfully()
+    public async Task RootCommand_WithHeroesVersionOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -497,7 +498,7 @@ public async Task RootCommand_WithHeroesVersionArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithExtractorArguments_ExecutesSuccessfully()
+    public async Task RootCommand_WithExtractorOptions_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -528,7 +529,7 @@ public async Task RootCommand_WithExtractorArguments_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithExtractorArgumentAsAll_ExecutesSuccessfully()
+    public async Task RootCommand_WithExtractorOptionAsAll_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -561,7 +562,7 @@ public async Task RootCommand_WithExtractorArgumentAsAll_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithLocalizationArguments_ExecutesSuccessfully()
+    public async Task RootCommand_WithLocalizationOptions_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -589,7 +590,7 @@ public async Task RootCommand_WithLocalizationArguments_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithLocalizationAllArgument_ExecutesSuccessfully()
+    public async Task RootCommand_WithLocalizationAllOptions_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -619,7 +620,7 @@ public async Task RootCommand_WithLocalizationAllArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_WithGameStringTextArguments_ExecutesSuccessfully()
+    public async Task RootCommand_WithGameStringTextOptions_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -653,7 +654,7 @@ public async Task RootCommand_WithGameStringTextArguments_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_LocalizedTextArgument_ExecutesSuccessfully()
+    public async Task RootCommand_LocalizedTextOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -679,7 +680,7 @@ public async Task RootCommand_LocalizedTextArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_MapSpecificArguments_ExecutesSuccessfully()
+    public async Task RootCommand_MapSpecificOptions_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -709,7 +710,7 @@ public async Task RootCommand_MapSpecificArguments_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_CustomConfigArgument_ExecutesSuccessfully()
+    public async Task RootCommand_CustomConfigOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -735,7 +736,7 @@ public async Task RootCommand_CustomConfigArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_NoIndentArgument_ExecutesSuccessfully()
+    public async Task RootCommand_NoIndentOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -761,7 +762,7 @@ public async Task RootCommand_NoIndentArgument_ExecutesSuccessfully()
     }
 
     [TestMethod]
-    public async Task RootCommand_ThreadsArgument_ExecutesSuccessfully()
+    public async Task RootCommand_ThreadsOption_ExecutesSuccessfully()
     {
         // arrange
         RootOptions rootOptions = new();
@@ -786,6 +787,32 @@ public async Task RootCommand_ThreadsArgument_ExecutesSuccessfully()
         rootOptions.Threads.Should().Be(4);
     }
 
+    [TestMethod]
+    public async Task RootCommand_DisableMapSpecificOption_ExecutesSuccessfully()
+    {
+        // arrange
+        RootOptions rootOptions = new();
+        _options.Value.Returns(rootOptions);
+
+        TypeRegistrar registrar = new(GetServiceCollection());
+        CommandAppTester app = new(registrar);
+        app.SetDefaultCommand<RootCommand>();
+
+        // act
+        CommandAppResult result = await app.RunAsync(
+        [
+            "game",
+            "--storage-path", "TestXmlFiles",
+            "--no-map-specific",
+        ],
+        TestContext.CancellationToken);
+
+        // assert
+        await AssertCommandSuccessful(result);
+
+        rootOptions.DisableMapSpecificJson.Should().BeTrue();
+    }
+
     private ServiceCollection GetServiceCollection()
     {
         ServiceCollection services = new();