try and remove console colors from all output

velopack · Oct 23, 2024 · d099cad · d099cad
1 parent 34b7879
commit d099cad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/generator/CSharpReference.cs b/generator/CSharpReference.cs
@@ -327,7 +327,6 @@ static string[] GetCommandsFromHelp(string stdout)
             .Where(l => !l.StartsWith("    "))
             .Select(l => l.Trim())
             .Select(l => l.Substring(0, l.IndexOf(" ")))
-            .Select(l => Regex.Replace(l, @"[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]", ""))
             .ToArray();
 
         //Console.WriteLine("Commands: ");
@@ -351,7 +350,8 @@ static async Task<string> RunCaptureStdOut(string exePath, string[] args)
 
         Console.WriteLine($"Running: {exePath} {string.Join(" ", args)}");
 
-        return await RunCaptureStdOut(psi);
+        string output = await RunCaptureStdOut(psi);
+        return Util.RemoveConsoleColors(output);
     }
 
     static async Task<string> RunCaptureStdOut(ProcessStartInfo psi)

diff --git a/generator/Util.cs b/generator/Util.cs
@@ -3,12 +3,18 @@
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
+using System.Text.RegularExpressions;
 using NuGet.Packaging;
 
 namespace DocGenerator;
 
 internal class Util
 {
+    public static string RemoveConsoleColors(string input)
+    {
+        return Regex.Replace(input, @"[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]", "");
+    }
+
     public static async Task StartShellProcess(string path, string[] arguments, string workDir)
     {
         var psi = new ProcessStartInfo() {