Fine tuned console output routines

source/Cute/Commands/GetDataCommand.cs

@@ -1,6 +1,7 @@
 using Contentful.Core.Errors;
 using Contentful.Core.Models;
 using Contentful.Core.Search;
+using Cute.Constants;
 using Cute.Lib.Contentful;
 using Cute.Lib.Exceptions;
 using Cute.Lib.GetDataAdapter;
@@ -102,7 +103,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, Settings se
 
         foreach (var getDataEntry in _cronTasks.Values)
         {
-            await ProcessGetDataEntry(getDataEntry, settings);
+            await ProcessGetDataEntry(getDataEntry);
         }
 
         return 0;
@@ -240,7 +241,7 @@ private async Task RefreshSchedule([FromForm] string command, HttpContext contex
 
     private async Task ProcessGetDataEntryAndDisplaySchedule(Entry<JObject> entry, Settings settings)
     {
-        await ProcessGetDataEntry(entry, settings);
+        await ProcessGetDataEntry(entry);
 
         DisplaySchedule();
     }
@@ -261,26 +262,28 @@ private void DisplaySchedule()
 
             var cronSchedule = frequency?.ToCronExpression().ToString();
 
-            _logger.LogInformation("Get data '{getDataId}' scheduled to run on schedule '{frequency} ({cronSchedule})'",
+            _console.WriteNormal("Get data '{getDataId}' scheduled to run on schedule '{frequency} ({cronSchedule})'",
                 getDataId, frequency, cronSchedule);
         }
     }
 
-    private async Task ProcessGetDataEntry(Entry<JObject> getDataEntry, Settings settings)
+    private async Task ProcessGetDataEntry(Entry<JObject> getDataEntry)
     {
+        if (_settings is null) return;
+
         var yamlDeserializer = new DeserializerBuilder()
             .WithNamingConvention(CamelCaseNamingConvention.Instance)
             .Build();
 
         var dataAdapter = new HttpDataAdapter(ContentfulManagementClient, _console.WriteNormal);
 
-        var getDataId = GetString(getDataEntry, settings.GetDataIdField);
+        var getDataId = GetString(getDataEntry, _settings.GetDataIdField);
 
         if (getDataId is null) return;
 
-        _logger.LogInformation("Started '{getDataId}'", getDataId);
+        _console.WriteNormal("Started '{getDataId}'", getDataId);
 
-        var yaml = GetString(getDataEntry, settings.GetDataYamlField);
+        var yaml = GetString(getDataEntry, _settings.GetDataYamlField);
 
         if (yaml is null) return;
 
@@ -298,7 +301,7 @@ private async Task ProcessGetDataEntry(Entry<JObject> getDataEntry, Settings set
 
         if (dataResults is null) return;
 
-        _console.WriteNormal($"{dataResults.Count} new {contentType.SystemProperties.Id} entries...");
+        _console.WriteNormal("{Count} new {Id} entries...", dataResults.Count, contentType.SystemProperties.Id);
 
         _ = await CompareAndUpdateResults(
             dataResults, serializer,
@@ -308,7 +311,7 @@ private async Task ProcessGetDataEntry(Entry<JObject> getDataEntry, Settings set
             ignoreFields: ignoreFields
         );
 
-        _logger.LogInformation("Completed '{getDataId}'", getDataId);
+        _console.WriteNormal("Completed '{getDataId}'", getDataId);
     }
 
     private static void ValidateDataAdapter(string fileName, HttpDataAdapterConfig adapter, ContentType contentType, EntrySerializer serializer)
@@ -347,7 +350,9 @@ private async Task<Dictionary<string, string>> CompareAndUpdateResults(List<Dict
 
             if (newRecord is null) continue;
 
-            _console.WriteNormal($"Contentful {contentTypeId} '{key}' matched with new entry '{newRecord[contentDisplayField]}'");
+            var entryName = newRecord[contentDisplayField];
+
+            _console.WriteNormal("Contentful {contentTypeId} '{key}' matched with new entry '{entryName}'", contentTypeId, key, entryName);
 
             var isChanged = false;
             Dictionary<string, (string?, string?)> changedFields = [];

source/Cute/Commands/WebCommand.cs

@@ -55,7 +55,7 @@ public async Task StartWebServer()
 
         webApp.MapHealthChecks("/healthz");
 
-        _console.WriteNormal("Waiting for Contentful webhook trigger...");
+        _console.WriteNormal("Ready...");
 
         try
         {

source/Cute/Program.cs

@@ -20,7 +20,7 @@
 
 var isGettingVersion = args.Contains("version");
 
-var isWebServer = (args.Contains("webserver") || args.Contains("--as-server")) && !args.Contains("--console");
+var isServer = args.Contains("--as-server") && !args.Contains("--console-output");
 
 // Get config from protected settings file and environment
 
@@ -45,7 +45,7 @@
     });
 }
 
-if (isWebServer)
+if (isServer)
 {
     loggerConfig.WriteTo.Console(
         outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}",
@@ -64,7 +64,7 @@
 
 // Surpress pretty console for webserver
 
-if (isWebServer)
+if (isServer)
 {
     ConsoleWriter.EnableConsole = false;
 }

source/Cute/Services/ConsoleWriter.cs

@@ -1,7 +1,6 @@
 using Cute.Constants;
 using Spectre.Console;
 using Spectre.Console.Rendering;
-using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -33,20 +32,23 @@ public void WriteHeading(string text)
 
     public void WriteHeading(string textTemplate, params object?[] args)
     {
-        Console?.WriteLine(Format(textTemplate, args), Globals.StyleHeading);
+        Console?.MarkupLine($"Thus is a [underline {Globals.StyleAlertAccent.Foreground}]test[/]");
+        Console?.WriteLine(Format(textTemplate, Globals.StyleHeading, args));
         Logger?.LogInformation(message: textTemplate, args: args);
     }
 
-    private static string Format(string textTemplate, params object?[] args)
+    private static string Format(string textTemplate, Style style, params object?[] args)
     {
         var matches = ParameterMatch().Matches(textTemplate);
         var sb = new StringBuilder(textTemplate);
         var i = 0;
         foreach (Match m in matches)
         {
             if (i > args.Length - 1) break;
-            sb.Replace(m.Value, args[i++]?.ToString());
+            sb.Replace(m.Value, $"[{Globals.StyleHeading.Foreground}]{args[i++]?.ToString()}[/]");
         }
+        sb.Insert(0, $"[{style.Foreground}]");
+        sb.Append("[/]");
         return sb.ToString();
     }
 
@@ -97,7 +99,7 @@ public void WriteNormal(string text)
 
     public void WriteNormal(string textTemplate, params object?[] args)
     {
-        Console?.WriteLine(Format(textTemplate, args), Globals.StyleNormal);
+        Console?.MarkupLine(Format(textTemplate, Globals.StyleNormal, args));
         Logger?.LogInformation(message: textTemplate, args: args);
     }