From 62fef5b30b9bf790967bdbc653a9ca428876fed7 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Wed, 7 Dec 2022 17:54:45 +0800
Subject: [PATCH] =?UTF-8?q?<refactor>=20=E4=BD=BF=E7=94=A8Spectre.Console?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Lang/Str.resx | 16 ++++++++-
 src/Program.cs    |  8 ++---
 src/ToLf/Main.cs  | 84 +++++++++++++++++++++--------------------------
 src/dot.csproj    |  1 +
 4 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/src/Lang/Str.resx b/src/Lang/Str.resx
index 5db689d..e7be8a6 100644
--- a/src/Lang/Str.resx
+++ b/src/Lang/Str.resx
@@ -28,7 +28,7 @@
         <value>输入文本为空</value>
     </data>
     <data name="SearchingFile" xml:space="preserve">
-        <value>查找文件...</value>
+        <value>查找文件</value>
     </data>
     <data name="PathNotFound" xml:space="preserve">
         <value>指定的路径“{0}”不存在</value>
@@ -182,4 +182,18 @@
     <data name="FindGitReps" xml:space="preserve">
         <value>查找 "{0}" 下所有git仓库目录... </value>
     </data>
+    <data name="ExerciseMode" xml:space="preserve">
+        <value>演习模式, 不会真实修改文件!</value>
+    </data>
+    <data name="Read" xml:space="preserve">
+        <value>读取</value>
+    </data>
+
+    <data name="Write" xml:space="preserve">
+        <value>写入</value>
+    </data>
+
+    <data name="Break" xml:space="preserve">
+        <value>跳过</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/src/Program.cs b/src/Program.cs
index 3e4e5fb..78b4cab 100644
--- a/src/Program.cs
+++ b/src/Program.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using System.Text;
 using Dot;
+using Spectre.Console;
 
 Type[] LoadVerbs()
 {
@@ -18,9 +19,8 @@ async Task Run(object args)
     var tool = ToolsFactory.Create(option);
     await tool.Run();
     if (option!.KeepSession) {
-        Console.WriteLine();
-        Console.WriteLine(Str.PressAnyKey);
-        Console.ReadKey();
+        AnsiConsole.MarkupLine(Str.PressAnyKey);
+        AnsiConsole.Console.Input.ReadKey(true);
     }
 }
 
@@ -33,7 +33,7 @@ try {
     await Parser.Default.ParseArguments(args, types).WithParsedAsync(Run);
 }
 catch (ArgumentException ex) {
-    Console.Error.WriteLine(ex.Message);
+    AnsiConsole.MarkupLine($"[red]{ex.Message}[/]");
     return -1;
 }
 
diff --git a/src/ToLf/Main.cs b/src/ToLf/Main.cs
index e05ef03..a061a77 100644
--- a/src/ToLf/Main.cs
+++ b/src/ToLf/Main.cs
@@ -1,34 +1,25 @@
 using System.Diagnostics.CodeAnalysis;
+using Spectre.Console;
 
 namespace Dot.ToLf;
 
-public sealed class Main : ToolBase<Option>, IDisposable
+public sealed class Main : ToolBase<Option>
 {
-    private                 int              _breakCnt;
-    private                 bool             _disposed;
-    private static readonly object           _lockObj = new();
-    private                 int              _procedCnt;
-    private                 int              _replaceCnt;
-    private                 ChildProgressBar _step2Bar;
-    private                 int              _totalCnt;
-    public Main(Option opt) : base(opt) { }
+    private                 int          _breakCnt;
+    private                 ProgressTask _fileTask;
+    private static readonly object       _lockObj = new();
+    private                 long         _procedCnt;
+    private                 int          _replaceCnt;
+    private                 int          _totalCnt;
 
-
-    ~Main()
+    public Main(Option opt) : base(opt)
     {
-        Dispose(false);
-    }
-
-    private void Dispose(bool disposing)
-    {
-        if (_disposed) return;
-        if (disposing) _step2Bar?.Dispose();
-        _disposed = true;
+        if (!Directory.Exists(Opt.Path))
+            throw new ArgumentException(nameof(Opt.Path), string.Format(Str.PathNotFound, Opt.Path));
     }
 
     private async ValueTask FileHandle(string file, CancellationToken _)
     {
-        _step2Bar.Tick();
         ShowMessage(1, 0, 0);
 
         var tmpFile    = $"{file}.tmp";
@@ -76,7 +67,6 @@ public sealed class Main : ToolBase<Option>, IDisposable
 
         if (isReplaced && !isBin) {
             MoveFile(tmpFile, file);
-
             ShowMessage(0, 1, 0);
         }
         else {
@@ -89,39 +79,39 @@ public sealed class Main : ToolBase<Option>, IDisposable
     private void ShowMessage(int procedCnt, int replaceCnt, int breakCnt)
     {
         lock (_lockObj) {
-            _procedCnt        += procedCnt;
-            _replaceCnt       += replaceCnt;
-            _breakCnt         += breakCnt;
-            _step2Bar.Message =  string.Format(Str.ShowMessageTemp, _procedCnt, _totalCnt, _replaceCnt, _breakCnt);
+            _procedCnt  += procedCnt;
+            _replaceCnt += replaceCnt;
+            _breakCnt   += breakCnt;
+            if (procedCnt > 0) _fileTask.Increment(1);
+            _fileTask.Description
+                = $"{Str.Read}: [green]{_procedCnt}[/]/{_totalCnt}, {Str.Write}: [red]{_replaceCnt}[/], {Str.Break}: [gray]{_breakCnt}[/]";
         }
     }
 
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
 
     [SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
     public override async Task Run()
     {
-        if (!Directory.Exists(Opt.Path))
-            throw new ArgumentException(nameof(Opt.Path), string.Format(Str.PathNotFound, Opt.Path));
+        if (Opt.ReadOnly) AnsiConsole.MarkupLine("[gray]{0}[/]", Str.ExerciseMode);
+        IEnumerable<string> fileList;
+        await AnsiConsole.Progress()
+                         .Columns(new ProgressBarColumn()                                //
+                                , new ElapsedTimeColumn()                                //
+                                , new PercentageColumn()                                 //
+                                , new SpinnerColumn()                                    //
+                                , new TaskDescriptionColumn { Alignment = Justify.Left } //
+                         )
+                         .StartAsync(async ctx => {
+                             var taskSearchfile = ctx.AddTask(Str.SearchingFile).IsIndeterminate();
+                             _fileTask = ctx.AddTask("-/-", false);
+                             fileList  = EnumerateFiles(Opt.Path, Opt.Filter);
+                             _totalCnt = fileList.Count();
+                             taskSearchfile.IsIndeterminate(false);
+                             taskSearchfile.Increment(100);
 
-
-        using var step1Bar = new IndeterminateProgressBar(Str.SearchingFile, DefaultProgressBarOptions);
-
-
-        var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
-        _totalCnt = fileList.Count();
-
-        step1Bar.Message = string.Format(Str.SearchingFileOK, _totalCnt);
-        step1Bar.Finished();
-        if (_totalCnt == 0) return;
-
-
-        _step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
-
-        await Parallel.ForEachAsync(fileList, FileHandle);
+                             _fileTask.MaxValue = _totalCnt;
+                             _fileTask.StartTask();
+                             await Parallel.ForEachAsync(fileList, FileHandle);
+                         });
     }
 }
\ No newline at end of file
diff --git a/src/dot.csproj b/src/dot.csproj
index eed0ce5..de06805 100644
--- a/src/dot.csproj
+++ b/src/dot.csproj
@@ -27,6 +27,7 @@
         <PackageReference Include="CommandLineParser" Version="2.9.1"/>
         <PackageReference Include="NSExt" Version="1.0.6"/>
         <PackageReference Include="ShellProgressBar" Version="5.2.0"/>
+        <PackageReference Include="Spectre.Console" Version="0.45.1-preview.0.46"/>
         <PackageReference Include="TextCopy" Version="6.2.0"/>
     </ItemGroup>