终端进度条

Author: clansty

MaiChartManager.CLI/Commands/MakeAcbCommand.cs

@@ -2,6 +2,7 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 using System.ComponentModel;
+using MaiChartManager.CLI.Utils;
 
 namespace MaiChartManager.CLI.Commands;
 
@@ -74,6 +75,7 @@ public override async Task<int> ExecuteAsync(CommandContext context, Settings se
     private async Task ConvertSingleFile(string source, string output, Settings settings)
     {
         AnsiConsole.MarkupLine($"[yellow]正在转换:[/] {Path.GetFileName(source)} → {Path.GetFileName(output)}.acb");
+        TerminalProgress.Set(TerminalProgress.Status.Indeterminate);
 
         await AnsiConsole.Status()
             .Spinner(Spinner.Known.Dots)
@@ -89,6 +91,7 @@ await Task.Run(() =>
                 });
             });
 
+        TerminalProgress.Clear();
         AnsiConsole.MarkupLine($"[green]✓ 已保存到: {output}[/]");
     }
 
@@ -103,12 +106,22 @@ await AnsiConsole.Progress()
                 new SpinnerColumn())
             .StartAsync(async ctx =>
             {
+                int doneCount = 0, errorCount = 0;
                 foreach (var source in settings.Sources)
                 {
                     var output = Path.ChangeExtension(source, null);
                     var task = ctx.AddTask($"[green]{Path.GetFileName(source)}[/]");
                     task.MaxValue = 100;
 
+                    if (errorCount > 0)
+                    {
+                        TerminalProgress.Set(TerminalProgress.Status.Warning, (errorCount + doneCount) * 100 / settings.Sources.Length);
+                    }
+                    else
+                    {
+                        TerminalProgress.Set(doneCount * 100 / settings.Sources.Length);
+                    }
+
                     try
                     {
                         task.StartTask();
@@ -120,15 +133,18 @@ await Task.Run(() =>
                                 padding: settings.Padding
                             );
                         });
+                        doneCount++;
 
                         task.StopTask();
                     }
                     catch (Exception ex)
                     {
+                        errorCount++;
                         task.Description = $"[red]{Path.GetFileName(source)} - 失败[/]";
                         task.StopTask();
                     }
                 }
+                TerminalProgress.Clear();
             });
     }
 }

MaiChartManager.CLI/Commands/MakeUsmCommand.cs

@@ -2,6 +2,7 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 using System.ComponentModel;
+using MaiChartManager.CLI.Utils;
 
 namespace MaiChartManager.CLI.Commands;
 
@@ -59,7 +60,9 @@ await AnsiConsole.Status()
                 .Spinner(Spinner.Known.Dots)
                 .StartAsync("正在检测硬件加速...", async ctx =>
                 {
+                    TerminalProgress.Set(TerminalProgress.Status.Indeterminate);
                     await VideoConvert.CheckHardwareAcceleration();
+                    TerminalProgress.Clear();
                 });
 
             AnsiConsole.MarkupLine($"[green]硬件加速: {VideoConvert.HardwareAcceleration}[/]");
@@ -101,15 +104,20 @@ await AnsiConsole.Progress()
             {
                 var task = ctx.AddTask($"[green]转换 {Path.GetFileName(source)}[/]");
                 task.MaxValue = 100;
+                TerminalProgress.Set(TerminalProgress.Status.Indeterminate);
 
                 await VideoConvert.ConvertVideoToUsm(
                     source,
                     output,
                     noScale: settings.NoScale,
                     yuv420p: settings.UseYuv420p,
-                    onProgress: percent => task.Value = percent
-                );
+                    onProgress: percent =>
+                    {
+                        TerminalProgress.Set(percent);
+                        task.Value = percent;
+                    });
 
+                TerminalProgress.Clear();
                 task.Value = 100;
             });
 
@@ -129,12 +137,22 @@ await AnsiConsole.Progress()
                 new SpinnerColumn())
             .StartAsync(async ctx =>
             {
+                int doneCount = 0, errorCount = 0;
                 foreach (var source in settings.Sources)
                 {
                     var output = Path.ChangeExtension(source, ".dat");
                     var task = ctx.AddTask($"[green]{Path.GetFileName(source)}[/]");
                     task.MaxValue = 100;
 
+                    if (errorCount > 0)
+                    {
+                        TerminalProgress.Set(TerminalProgress.Status.Warning, (errorCount + doneCount) * 100 / settings.Sources.Length);
+                    }
+                    else
+                    {
+                        TerminalProgress.Set(doneCount * 100 / settings.Sources.Length);
+                    }
+
                     try
                     {
                         await VideoConvert.ConvertVideoToUsm(
@@ -145,17 +163,18 @@ await VideoConvert.ConvertVideoToUsm(
                             onProgress: percent => task.Value = percent
                         );
 
+                        doneCount++;
                         task.Value = 100;
-                        AnsiConsole.MarkupLine($"[green]✓ {Path.GetFileName(source)} → {Path.GetFileName(output)}[/]");
                     }
                     catch (Exception ex)
                     {
+                        errorCount++;
                         task.Description = $"[red]{Path.GetFileName(source)} - 失败[/]";
                         task.Value = 100;
                         task.StopTask();
-                        AnsiConsole.MarkupLine($"[red]✗ 转换失败 {Path.GetFileName(source)}: {ex.Message}[/]");
                     }
                 }
+                TerminalProgress.Clear();
             });
     }
 }

MaiChartManager.CLI/MaiChartManager.CLI.csproj

@@ -8,21 +8,19 @@
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <SelfContained>true</SelfContained>
         <ValidateExecutableReferencesMatchSelfContained>False</ValidateExecutableReferencesMatchSelfContained>
+        <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+        <CETCompat>false</CETCompat>
+        <PublishTrimmed>False</PublishTrimmed>
+        <PublishAot>False</PublishAot>
+        <PublishReadyToRun>true</PublishReadyToRun>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\MaiChartManager\MaiChartManager.csproj"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <Reference Include="System.Console">
-            <HintPath>..\MaiChartManager\bin\x64\Debug\net9.0-windows10.0.17763.0\win-x64\System.Console.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-
     <ItemGroup>
         <PackageReference Include="Spectre.Console.Cli" Version="0.53.0"/>
-        <PackageReference Include="Unknown6656.Terminal" Version="1.5.434.8968"/>
     </ItemGroup>
 
 </Project>

MaiChartManager.CLI/Program.cs

@@ -1,8 +1,10 @@
 using System.Text;
 using MaiChartManager.CLI.Commands;
+using MaiChartManager.CLI.Utils;
 using Spectre.Console.Cli;
 
 Console.OutputEncoding = Encoding.UTF8;
+Console.CancelKeyPress += (_, _) => TerminalProgress.Clear();
 
 var app = new CommandApp();
 

MaiChartManager.CLI/Utils/TerminalProgress.cs

@@ -0,0 +1,31 @@
+namespace MaiChartManager.CLI.Utils;
+
+/// <summary>
+/// https://learn.microsoft.com/zh-cn/windows/terminal/tutorials/progress-bar-sequences
+/// </summary>
+public static class TerminalProgress
+{
+    public enum Status
+    {
+        Hidden,
+        Default,
+        Error,
+        Indeterminate,
+        Warning,
+    }
+
+    public static void Set(Status status = Status.Default, int progress = 0)
+    {
+        Console.Write($"\e]9;4;{status:D};{progress}\a");
+    }
+
+    public static void Set(int progress)
+    {
+        Set(Status.Default, progress);
+    }
+
+    public static void Clear()
+    {
+        Set(Status.Hidden);
+    }
+}