From 021682899aab6f9c4243067438f769164e636cae Mon Sep 17 00:00:00 2001
From: Tyrrrz <tyrrrrrr@gmail.com>
Date: Mon, 26 Apr 2021 19:47:25 +0300
Subject: [PATCH] [CLI] Move Markup.Escape(...) to ConsoleExtensions

---
 DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs  | 3 +--
 .../Utils/Extensions/ConsoleExtensions.cs                   | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
index eb283128..6cc6c4c5 100644
--- a/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
+++ b/DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs
@@ -14,7 +14,6 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils.Extensions;
-using Spectre.Console;
 using Tyrrrz.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands.Base
@@ -65,7 +64,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
                     // Export
                     try
                     {
-                        await progressContext.StartTaskAsync(Markup.Escape($"{channel.Category} / {channel.Name}"), async progress =>
+                        await progressContext.StartTaskAsync($"{channel.Category} / {channel.Name}", async progress =>
                         {
                             var guild = await Discord.GetGuildAsync(channel.GuildId);
 
diff --git a/DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs b/DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs
index c834650a..c19e45cf 100644
--- a/DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs
+++ b/DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs
@@ -33,7 +33,11 @@ namespace DiscordChatExporter.Cli.Utils.Extensions
             string description,
             Func<ProgressTask, ValueTask> performOperationAsync)
         {
-            var progressTask = progressContext.AddTask(description, new ProgressTaskSettings {MaxValue = 1});
+            var progressTask = progressContext.AddTask(
+                // Don't recognize random square brackets as style tags
+                Markup.Escape(description),
+                new ProgressTaskSettings {MaxValue = 1}
+            );
 
             try
             {