From a35ebfcb2380bb534c3097ba883eefc483edbfcf Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Mon, 12 Dec 2022 19:51:19 +0800
Subject: [PATCH] <refactor>

---
 dotnet-tools.json               |  6 ++++++
 src/Program.cs                  | 24 ++++++++++++------------
 src/{RmBom => Rbom}/Main.cs     |  4 ++--
 src/Rbom/Option.cs              |  3 +++
 src/RmBom/Option.cs             |  3 ---
 src/Time/Main.cs                |  2 +-
 src/ToolBase.cs                 |  6 +++---
 src/{RmBlank => Trim}/Main.cs   |  5 +++--
 src/{RmBlank => Trim}/Option.cs |  0
 9 files changed, 30 insertions(+), 23 deletions(-)
 rename src/{RmBom => Rbom}/Main.cs (98%)
 create mode 100644 src/Rbom/Option.cs
 delete mode 100644 src/RmBom/Option.cs
 rename src/{RmBlank => Trim}/Main.cs (96%)
 rename src/{RmBlank => Trim}/Option.cs (100%)

diff --git a/dotnet-tools.json b/dotnet-tools.json
index 4f358a6..14cf33a 100644
--- a/dotnet-tools.json
+++ b/dotnet-tools.json
@@ -7,6 +7,12 @@
             "commands": [
                 "t4"
             ]
+        },
+        "dotnet-consolidate": {
+            "version": "2.0.0",
+            "commands": [
+                "dotnet-consolidate"
+            ]
         }
     }
 }
\ No newline at end of file
diff --git a/src/Program.cs b/src/Program.cs
index 5666597..d0956e1 100644
--- a/src/Program.cs
+++ b/src/Program.cs
@@ -8,23 +8,23 @@ app.Configure(config => {
     config.SetApplicationName(AssemblyInfo.ASSEMBLY_PRODUCT);
     config.SetApplicationVersion(AssemblyInfo.ASSEMBLY_VERSION);
 
-    config.AddCommand<Main>("git");
+    config.AddCommand<Main>(nameof(Dot.Git).ToLower());
     #if NET7_0_WINDOWS
-    config.AddCommand<Dot.Color.Main>("color");
+    config.AddCommand<Dot.Color.Main>(nameof(Dot.Color).ToLower());
     #endif
-    config.AddCommand<Dot.Guid.Main>("guid");
-    config.AddCommand<Dot.IP.Main>("ip");
-    config.AddCommand<Dot.Json.Main>("json");
-    config.AddCommand<Dot.Pwd.Main>("pwd");
-    config.AddCommand<Dot.RmBlank.Main>("rblank");
-    config.AddCommand<Dot.RmBom.Main>("rbom");
-    config.AddCommand<Dot.Text.Main>("text");
-    config.AddCommand<Dot.Time.Main>("time");
-    config.AddCommand<Dot.ToLf.Main>("tolf");
+    config.AddCommand<Dot.Guid.Main>(nameof(Dot.Guid).ToLower());
+    config.AddCommand<Dot.IP.Main>(nameof(Dot.IP).ToLower());
+    config.AddCommand<Dot.Json.Main>(nameof(Dot.Json).ToLower());
+    config.AddCommand<Dot.Pwd.Main>(nameof(Dot.Pwd).ToLower());
+    config.AddCommand<Dot.Rbom.Main>(nameof(Dot.Rbom).ToLower());
+    config.AddCommand<Dot.Trim.Main>(nameof(Dot.Trim).ToLower());
+    config.AddCommand<Dot.Text.Main>(nameof(Dot.Text).ToLower());
+    config.AddCommand<Dot.Time.Main>(nameof(Dot.Time).ToLower());
+    config.AddCommand<Dot.ToLf.Main>(nameof(Dot.ToLf).ToLower());
 
 
     config.ValidateExamples();
 });
 
 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-return app.Run(args);
\ No newline at end of file
+return app.Run(args);
diff --git a/src/RmBom/Main.cs b/src/Rbom/Main.cs
similarity index 98%
rename from src/RmBom/Main.cs
rename to src/Rbom/Main.cs
index 10ff2ed..9c6ee35 100644
--- a/src/RmBom/Main.cs
+++ b/src/Rbom/Main.cs
@@ -1,4 +1,4 @@
-namespace Dot.RmBom;
+namespace Dot.Rbom;
 
 [Description(nameof(Str.TrimUtf8Bom))]
 [Localization(typeof(Str))]
@@ -43,4 +43,4 @@ public sealed class Main : FilesTool<Option>
 
         if (tmpFile != default) File.Delete(tmpFile);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Rbom/Option.cs b/src/Rbom/Option.cs
new file mode 100644
index 0000000..f976e41
--- /dev/null
+++ b/src/Rbom/Option.cs
@@ -0,0 +1,3 @@
+namespace Dot.Rbom;
+
+public class Option : DirOption { }
diff --git a/src/RmBom/Option.cs b/src/RmBom/Option.cs
deleted file mode 100644
index 38e5afe..0000000
--- a/src/RmBom/Option.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Dot.RmBom;
-
-public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/Time/Main.cs b/src/Time/Main.cs
index e3a370b..a0eac98 100644
--- a/src/Time/Main.cs
+++ b/src/Time/Main.cs
@@ -137,7 +137,7 @@ public sealed class Main : ToolBase<Option>
         }
     }
 
-    public override async Task Run()
+    protected override async Task Run()
     {
         await Core();
         if (Opt.KeepSession) {
diff --git a/src/ToolBase.cs b/src/ToolBase.cs
index 8cba8c1..475fccf 100644
--- a/src/ToolBase.cs
+++ b/src/ToolBase.cs
@@ -2,7 +2,7 @@ namespace Dot;
 
 public abstract class ToolBase<TOption> : Command<TOption> where TOption : OptionBase
 {
-    protected          TOption Opt { get; set; }
+    protected          TOption Opt { get; private set; }
     protected abstract Task    Core();
 
     public override int Execute(CommandContext context, TOption option)
@@ -12,7 +12,7 @@ public abstract class ToolBase<TOption> : Command<TOption> where TOption : Optio
         return 0;
     }
 
-    public virtual async Task Run()
+    protected virtual async Task Run()
     {
         await Core();
         if (Opt.KeepSession) {
@@ -20,4 +20,4 @@ public abstract class ToolBase<TOption> : Command<TOption> where TOption : Optio
             AnsiConsole.Console.Input.ReadKey(true);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/RmBlank/Main.cs b/src/Trim/Main.cs
similarity index 96%
rename from src/RmBlank/Main.cs
rename to src/Trim/Main.cs
index 345c67a..433dc1f 100644
--- a/src/RmBlank/Main.cs
+++ b/src/Trim/Main.cs
@@ -1,6 +1,7 @@
+using Dot.RmBlank;
 using NSExt.Extensions;
 
-namespace Dot.RmBlank;
+namespace Dot.Trim;
 
 [Description(nameof(Str.RemoveTrailingWhiteSpaces))]
 [Localization(typeof(Str))]
@@ -49,4 +50,4 @@ public sealed class Main : FilesTool<Option>
         ShowMessage(0, 1, 0);
         UpdateStats(Path.GetExtension(file));
     }
-}
\ No newline at end of file
+}
diff --git a/src/RmBlank/Option.cs b/src/Trim/Option.cs
similarity index 100%
rename from src/RmBlank/Option.cs
rename to src/Trim/Option.cs