From 750545c2d05ec9084b2763a5731a9fa43655424d Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Tue, 13 Dec 2022 11:20:53 +0800
Subject: [PATCH] <clean>

---
 README.md                               | 18 +++++++++++------
 README.zh-CN.md                         | 26 ++++++++++++++-----------
 src/Color/Main.cs                       |  4 +++-
 src/Color/MouseHook.cs                  |  5 ++++-
 src/Color/Option.cs                     |  4 +++-
 src/Color/WinInfo.cs                    |  2 +-
 src/Color/WinMain.cs                    |  2 +-
 src/CsxEditor.cs                        |  2 +-
 src/DirOption.cs                        |  4 +++-
 src/FilesTool.cs                        | 13 ++++++++-----
 src/Get/Main.cs                         |  8 +++++---
 src/Get/Option.cs                       |  5 ++++-
 src/Git/Main.cs                         |  6 ++++--
 src/Git/Option.cs                       |  5 ++++-
 src/Git/ProgressTaskStateExtensions.cs  |  7 +------
 src/Git/TaskStatusColumn.cs             |  6 +++++-
 src/Guid/Main.cs                        |  5 ++++-
 src/Guid/Option.cs                      |  7 +++++--
 src/IP/Main.cs                          |  4 +++-
 src/IP/Option.cs                        |  4 +++-
 src/Json/Main.cs                        |  6 ++++--
 src/Json/Option.cs                      |  5 ++++-
 src/Lang/Str.tt                         | 10 +++++-----
 src/Option.cs                           |  6 ++++--
 src/Program.cs                          |  2 +-
 src/Pwd/Main.cs                         |  4 +++-
 src/Pwd/Option.cs                       |  5 ++++-
 src/Rbom/Main.cs                        |  5 ++++-
 src/Rbom/Option.cs                      |  5 ++++-
 src/Text/Main.cs                        |  5 ++++-
 src/Text/Option.cs                      |  5 ++++-
 src/Time/Main.cs                        |  5 ++++-
 src/Time/Option.cs                      |  5 ++++-
 src/Time/ProgressTaskStateExtensions.cs |  2 +-
 src/Time/TaskResultColumn.cs            |  5 ++++-
 src/Time/TaskStatusColumn.cs            |  7 ++++++-
 src/ToLf/Main.cs                        |  8 ++++++--
 src/ToLf/Option.cs                      |  5 ++++-
 src/ToolBase.cs                         | 16 +++++++--------
 src/ToolsFactory.cs                     | 24 -----------------------
 src/Trim/Main.cs                        |  6 ++++--
 src/Trim/Option.cs                      |  7 +++++--
 src/Win32.cs                            |  3 +++
 43 files changed, 179 insertions(+), 109 deletions(-)
 delete mode 100644 src/ToolsFactory.cs

diff --git a/README.md b/README.md
index d3f6552..81cddf6 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ Cross-platform, all-around utility set with a beautiful character interface-the
 
 ### Brief introduction
 
-The dot is the one based on the one. NET 7, a cross-platform command-line tool, integrates more than 10 utilities that program developers often use in their daily work, and is constantly increasing.
+The dot is the one based on the one. NET 7, a cross-platform command-line tool, integrates more than 10 utilities that
+program developers often use in their daily work, and is constantly increasing.
 
 ```
 USAGE:
@@ -33,8 +34,6 @@ COMMANDS:
 
 ```
 
-
-
 ### Some functional examples
 
 - ##### Git batch management
@@ -56,7 +55,10 @@ dot git -a "config --get http.proxy" d:\repos
 ![20221212213957](./assets/snapshots/20221212213957.png)
 
 - ##### High-precision time-clock synchronization
-Supports parallel requests from multiple NTP clock servers, while removing the network communication duration to set the precise synchronization of the native clocks with the NTP standard time:
+
+Supports parallel requests from multiple NTP clock servers, while removing the network communication duration to set the
+precise synchronization of the native clocks with the NTP standard time:
+
 ```
 dot time -k
 ```
@@ -64,25 +66,29 @@ dot time -k
 ![20221212214514](./assets/snapshots/20221212214514.png)
 
 - ##### Text codec
+
 Copy you need to view various codec text in the clipboard, and then enter the following command to view
+
 ```
 dot text
 ```
 
 ![20221212214904](./assets/snapshots/20221212214904.png)
 
-
 - ##### Multi-threading download tool
+
 Support setting the block size, number of threads to replace the single thread wget tool:
+
 ```
 dot get https://github.com/nsnail/dot/releases/download/v1.1.1/dot-v1.1.1-win-x64.7z
 ```
 
 ![20221212215259](./assets/snapshots/20221212215259.png)
 
-
 - ##### Remove the blank at the end of the file
+
 Remove excess spaces and line breaks in the tail of all files in the specified directory:
+
 ```
 dot trim d:\repos
 ```
diff --git a/README.zh-CN.md b/README.zh-CN.md
index f93e3bf..0fca072 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -13,27 +13,25 @@ USAGE:
     dot [OPTIONS] <COMMAND>
 
 OPTIONS:
-    -h, --help       Prints help information   
+    -h, --help       Prints help information
     -v, --version    Prints version information
 
 COMMANDS:
-    git                                      Git批量操作工具       
-    color                                    屏幕坐标颜色选取工具  
+    git                                      Git批量操作工具
+    color                                    屏幕坐标颜色选取工具
     guid                                     GUID工具
     ip                                       IP工具
     json                                     Json工具
-    pwd <password length> <generate type>    随机密码生成器        
-    rbom                                     移除文件的uf8 bom     
+    pwd <password length> <generate type>    随机密码生成器
+    rbom                                     移除文件的uf8 bom
     trim                                     移除文件尾部换行和空格
     text                                     文本编码工具
     time                                     时间同步工具
-    tolf                                     转换换行符为LF        
-    get <url>                                多线程下载工具        
+    tolf                                     转换换行符为LF
+    get <url>                                多线程下载工具
 
 ```
 
-
-
 ### 部分功能示例
 
 - ##### Git批量管理
@@ -55,7 +53,9 @@ dot git -a "config --get http.proxy" d:\repos
 ![20221212213957](./assets/snapshots/20221212213957.png)
 
 - ##### 高精度时钟同步
+
 支持多个NTP时钟服务器并行请求，同时除去网络通信时长以设置本机时钟与NTP标准时间精确同步：
+
 ```
 dot time -k
 ```
@@ -63,25 +63,29 @@ dot time -k
 ![20221212214514](./assets/snapshots/20221212214514.png)
 
 - ##### 文本编解码
+
 复制你需要查看各种编解码的文本在剪贴板中，然后输入如下命令，即可查看
+
 ```
 dot text
 ```
 
 ![20221212214904](./assets/snapshots/20221212214904.png)
 
-
 - ##### 多线程下载工具
+
 支持设置分块大小，线程数量，用以替代单线程的wget工具：
+
 ```
 dot get https://github.com/nsnail/dot/releases/download/v1.1.1/dot-v1.1.1-win-x64.7z
 ```
 
 ![20221212215259](./assets/snapshots/20221212215259.png)
 
-
 - ##### 移除文件末尾空白
+
 移除指定目录下所有文件尾部多余的空格和换行符：
+
 ```
 dot trim d:\repos
 ```
diff --git a/src/Color/Main.cs b/src/Color/Main.cs
index 5deab3d..889b509 100644
--- a/src/Color/Main.cs
+++ b/src/Color/Main.cs
@@ -1,9 +1,11 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 #if NET7_0_WINDOWS
 namespace Dot.Color;
 
 [Description(nameof(Str.ScreenPixelTool))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 
 {
     protected override Task Core()
diff --git a/src/Color/MouseHook.cs b/src/Color/MouseHook.cs
index 0bf6001..7101ecc 100644
--- a/src/Color/MouseHook.cs
+++ b/src/Color/MouseHook.cs
@@ -1,10 +1,12 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 #if NET7_0_WINDOWS
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace Dot.Color;
 
-public class MouseHook : IDisposable
+internal class MouseHook : IDisposable
 {
     [StructLayout(LayoutKind.Explicit)]
     private struct Msllhookstruct
@@ -18,6 +20,7 @@ public class MouseHook : IDisposable
     }
 
 
+    // ReSharper disable once EventNeverSubscribedTo.Global
     public event MouseEventHandler MouseEvent      = delegate { };
     private const    int           _WH_MOUSE_LL    = 14;
     private const    int           _WM_LBUTTONDOWN = 0x0201;
diff --git a/src/Color/Option.cs b/src/Color/Option.cs
index c8d9098..bf544d7 100644
--- a/src/Color/Option.cs
+++ b/src/Color/Option.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 namespace Dot.Color;
 
-public class Option : OptionBase { }
\ No newline at end of file
+internal class Option : OptionBase { }
\ No newline at end of file
diff --git a/src/Color/WinInfo.cs b/src/Color/WinInfo.cs
index db8ca93..aad2d08 100644
--- a/src/Color/WinInfo.cs
+++ b/src/Color/WinInfo.cs
@@ -4,7 +4,7 @@ using Size = System.Drawing.Size;
 
 namespace Dot.Color;
 
-public class WinInfo : Form
+internal class WinInfo : Form
 {
     private const    int        _WINDOW_SIZE = 480; //窗口大小
     private const    int        _ZOOM_RATE   = 16;  //缩放倍率
diff --git a/src/Color/WinMain.cs b/src/Color/WinMain.cs
index 946fce8..258f89e 100644
--- a/src/Color/WinMain.cs
+++ b/src/Color/WinMain.cs
@@ -3,7 +3,7 @@ using TextCopy;
 
 namespace Dot.Color;
 
-public class WinMain : Form
+internal class WinMain : Form
 {
     private readonly Bitmap  _bmp;
     private          bool    _disposed;
diff --git a/src/CsxEditor.cs b/src/CsxEditor.cs
index 140c863..6b5a523 100644
--- a/src/CsxEditor.cs
+++ b/src/CsxEditor.cs
@@ -1,7 +1,7 @@
 namespace Dot;
 
 // ReSharper disable once UnusedType.Global
-public class CsxEditor
+internal class CsxEditor
 {
     // ReSharper disable once UnusedMember.Local
     #pragma warning disable CA1822
diff --git a/src/DirOption.cs b/src/DirOption.cs
index cb23983..cbb4648 100644
--- a/src/DirOption.cs
+++ b/src/DirOption.cs
@@ -1,6 +1,8 @@
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot;
 
-public class DirOption : OptionBase
+internal class DirOption : OptionBase
 {
     [CommandOption("-e|--exclude")]
     [Description(nameof(Str.ExcludePathRegexes))]
diff --git a/src/FilesTool.cs b/src/FilesTool.cs
index c2bf8cf..415894f 100644
--- a/src/FilesTool.cs
+++ b/src/FilesTool.cs
@@ -4,11 +4,13 @@ using Panel = Spectre.Console.Panel;
 
 namespace Dot;
 
-public abstract class FilesTool<TOption> : ToolBase<TOption> where TOption : DirOption
+internal abstract class FilesTool<TOption> : ToolBase<TOption> where TOption : DirOption
 {
-    private                 int                               _breakCnt;           //跳过文件数
-    private                 ProgressTask                      _childTask;          //子任务进度
-    private                 int                               _excludeCnt;         //排除文件数
+    private int          _breakCnt;   //跳过文件数
+    private ProgressTask _childTask;  //子任务进度
+    private int          _excludeCnt; //排除文件数
+
+    // ReSharper disable once StaticMemberInGenericType
     private static readonly object                            _lock = new();       //线程锁
     private                 int                               _readCnt;            //读取文件数
     private                 int                               _totalCnt;           //总文件数
@@ -16,6 +18,7 @@ public abstract class FilesTool<TOption> : ToolBase<TOption> where TOption : Dir
     private readonly        ConcurrentDictionary<string, int> _writeStats = new(); //写入统计：后缀，数量
 
 
+    // ReSharper disable once ReturnTypeCanBeEnumerable.Local
     private string[] EnumerateFiles(string path, string searchPattern, out int excludeCnt)
     {
         var exCnt = 0;
@@ -76,7 +79,7 @@ public abstract class FilesTool<TOption> : ToolBase<TOption> where TOption : Dir
     }
 
 
-    protected FileStream CreateTempFile(out string file)
+    protected static FileStream CreateTempFile(out string file)
     {
         file = Path.Combine(Path.GetTempPath(), $"{System.Guid.NewGuid()}.tmp");
         return OpenFileStream(file, FileMode.OpenOrCreate, FileAccess.Write);
diff --git a/src/Get/Main.cs b/src/Get/Main.cs
index 5bcfb5f..8fbe3b0 100644
--- a/src/Get/Main.cs
+++ b/src/Get/Main.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 using System.Net.Http.Headers;
 using System.Text.RegularExpressions;
 using NSExt.Extensions;
@@ -6,7 +8,7 @@ namespace Dot.Get;
 
 [Description(nameof(Str.DownloadTool))]
 [Localization(typeof(Str))]
-public partial class Main : ToolBase<Option>
+internal partial class Main : ToolBase<Option>
 {
     private const string _PART = "part";
 
@@ -84,8 +86,8 @@ public partial class Main : ToolBase<Option>
     }
 
     private void WritePart(HttpResponseMessage rsp,      string mainFilePath //
-                          , long                startPos, long   endPos       //
-                          , Action<int>         rateHandle)
+                         , long                startPos, long   endPos       //
+                         , Action<int>         rateHandle)
     {
         Span<byte> buf    = stackalloc byte[Opt.BufferSize];
         using var  stream = rsp.Content.ReadAsStream();
diff --git a/src/Get/Option.cs b/src/Get/Option.cs
index 45a4dd2..e599b48 100644
--- a/src/Get/Option.cs
+++ b/src/Get/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot.Get;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandOption("-b|--buffer-size")]
     [Description(nameof(Str.BufferSize))]
diff --git a/src/Git/Main.cs b/src/Git/Main.cs
index 91ba69b..f42e5ba 100644
--- a/src/Git/Main.cs
+++ b/src/Git/Main.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Text;
@@ -7,7 +9,7 @@ namespace Dot.Git;
 
 [Description(nameof(Str.GitTool))]
 [Localization(typeof(Str))]
-public class Main : ToolBase<Option>
+internal class Main : ToolBase<Option>
 {
     private Encoding                                               _gitOutputEnc; //git command rsp 编码
     private ConcurrentDictionary<string, StringBuilder>            _repoRsp;      //仓库信息容器
@@ -43,7 +45,7 @@ public class Main : ToolBase<Option>
             p.ErrorDataReceived   += ExecRspReceived;
             p.BeginOutputReadLine();
             p.BeginErrorReadLine();
-            await p.WaitForExitAsync();
+            await p.WaitForExitAsync(CancellationToken.None);
 
             if (p.ExitCode == 0) {
                 payload.Value.State.Status(TaskStatusColumn.Statues.Succeed);
diff --git a/src/Git/Option.cs b/src/Git/Option.cs
index cb919b8..4a43a87 100644
--- a/src/Git/Option.cs
+++ b/src/Git/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable ClassNeverInstantiated.Global
+
 namespace Dot.Git;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandOption("-a|--args")]
     [Description(nameof(Str.GitArgs))]
diff --git a/src/Git/ProgressTaskStateExtensions.cs b/src/Git/ProgressTaskStateExtensions.cs
index 4042eed..57c4af8 100644
--- a/src/Git/ProgressTaskStateExtensions.cs
+++ b/src/Git/ProgressTaskStateExtensions.cs
@@ -1,12 +1,7 @@
 namespace Dot.Git;
 
-public static class ProgressTaskStateExtensions
+internal static class ProgressTaskStateExtensions
 {
-    public static TaskStatusColumn.Statues Status(this ProgressTaskState me)
-    {
-        return me.Get<TaskStatusColumn.Statues>(nameof(TaskStatusColumn));
-    }
-
     public static void Status(this ProgressTaskState me, TaskStatusColumn.Statues value)
     {
         me.Update<TaskStatusColumn.Statues>(nameof(TaskStatusColumn), _ => value);
diff --git a/src/Git/TaskStatusColumn.cs b/src/Git/TaskStatusColumn.cs
index 4b2cb35..baa5022 100644
--- a/src/Git/TaskStatusColumn.cs
+++ b/src/Git/TaskStatusColumn.cs
@@ -1,13 +1,17 @@
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
+
 using NSExt.Extensions;
 using Spectre.Console.Rendering;
 
 namespace Dot.Git;
 
-public class TaskStatusColumn : ProgressColumn
+internal class TaskStatusColumn : ProgressColumn
 {
     public enum Statues : byte
     {
         [Description($"[gray]{nameof(Ready)}[/]")]
+        // ReSharper disable once UnusedMember.Global
         Ready
 
       , [Description($"[yellow]{nameof(Executing)}[/]")]
diff --git a/src/Guid/Main.cs b/src/Guid/Main.cs
index 2a2df3d..06fc887 100644
--- a/src/Guid/Main.cs
+++ b/src/Guid/Main.cs
@@ -1,3 +1,6 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 #if NET7_0_WINDOWS
 using TextCopy;
 #endif
@@ -6,7 +9,7 @@ namespace Dot.Guid;
 
 [Description(nameof(Str.GuidTool))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 {
     protected override Task Core()
     {
diff --git a/src/Guid/Option.cs b/src/Guid/Option.cs
index b3becca..1a8b0cc 100644
--- a/src/Guid/Option.cs
+++ b/src/Guid/Option.cs
@@ -1,10 +1,13 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot.Guid;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandOption("-u|--upper")]
     [Description(nameof(Str.UseUppercase))]
     [Localization(typeof(Str))]
     [DefaultValue(false)]
-    public bool Upper { get; set; } //normal options here
+    public bool Upper { get; set; }
 }
\ No newline at end of file
diff --git a/src/IP/Main.cs b/src/IP/Main.cs
index 694f0e7..0c86df4 100644
--- a/src/IP/Main.cs
+++ b/src/IP/Main.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
 
@@ -5,7 +7,7 @@ namespace Dot.IP;
 
 [Description(nameof(Str.Ip))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 
 {
     protected override async Task Core()
diff --git a/src/IP/Option.cs b/src/IP/Option.cs
index 08d7a49..b97f7d4 100644
--- a/src/IP/Option.cs
+++ b/src/IP/Option.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 namespace Dot.IP;
 
-public class Option : OptionBase { }
\ No newline at end of file
+internal class Option : OptionBase { }
\ No newline at end of file
diff --git a/src/Json/Main.cs b/src/Json/Main.cs
index 04d0888..72e39b5 100644
--- a/src/Json/Main.cs
+++ b/src/Json/Main.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 using System.Text.Json;
 using NSExt.Extensions;
 #if NET7_0_WINDOWS
@@ -9,7 +11,7 @@ namespace Dot.Json;
 
 [Description(nameof(Str.Json))]
 [Localization(typeof(Str))]
-public class Main : ToolBase<Option>
+internal class Main : ToolBase<Option>
 {
     private object _inputObj;
 
@@ -43,7 +45,7 @@ public class Main : ToolBase<Option>
         var inputText = Opt.InputText;
 
         #if NET7_0_WINDOWS
-        if (inputText.NullOrWhiteSpace()) inputText = ClipboardService.GetText();
+        if (inputText.NullOrWhiteSpace()) inputText = await ClipboardService.GetTextAsync();
         #endif
         if (inputText.NullOrWhiteSpace()) throw new ArgumentException(Str.InputTextIsEmpty);
 
diff --git a/src/Json/Option.cs b/src/Json/Option.cs
index db518dd..c1c130b 100644
--- a/src/Json/Option.cs
+++ b/src/Json/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot.Json;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandOption("-c|--compress")]
     [Description(nameof(Str.CompressJson))]
diff --git a/src/Lang/Str.tt b/src/Lang/Str.tt
index 67af158..b3fa7e0 100644
--- a/src/Lang/Str.tt
+++ b/src/Lang/Str.tt
@@ -27,7 +27,7 @@ namespace Dot.Lang {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Str {
+    internal class Str {
 
         private static global::System.Resources.ResourceManager resourceMan;
 
@@ -68,14 +68,14 @@ namespace Dot.Lang {
       <#
     var xml = new XmlDocument();
     xml.Load("Str.resx");
-    foreach (XmlNode data in xml.SelectNodes("//root/data")) {
+    foreach (XmlNode data in xml.SelectNodes("//root/data")!) {
 #>
         /// <summary>
-        ///   <#= data.SelectSingleNode("value").InnerText #>
+        ///   <#= data.SelectSingleNode("value")?.InnerText #>
         /// </summary>
-        public static string <#= data.Attributes["name"].Value #> {
+        public static string <#= data.Attributes?["name"].Value #> {
             get {
-                return ResourceManager.GetString("<#= data.Attributes["name"].Value #>", resourceCulture);
+                return ResourceManager.GetString("<#= data.Attributes!["name"].Value #>", resourceCulture);
             }
         }
 <#
diff --git a/src/Option.cs b/src/Option.cs
index 675d658..0b6f2b7 100644
--- a/src/Option.cs
+++ b/src/Option.cs
@@ -1,10 +1,12 @@
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot;
 
-public abstract class OptionBase : CommandSettings, IOption
+internal abstract class OptionBase : CommandSettings, IOption
 {
     [CommandOption("-k|--keep--session")]
     [Description(nameof(Str.KeepSession))]
     [Localization(typeof(Str))]
     [DefaultValue(false)]
-    public virtual bool KeepSession { get; set; }
+    public bool KeepSession { get; set; }
 }
\ No newline at end of file
diff --git a/src/Program.cs b/src/Program.cs
index b30c867..3229226 100644
--- a/src/Program.cs
+++ b/src/Program.cs
@@ -29,6 +29,6 @@ app.Configure(config => {
 });
 
 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("en-US");
+CultureInfo.CurrentCulture   = CultureInfo.GetCultureInfo("en-US");
 CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("en-US");
 return app.Run(args);
\ No newline at end of file
diff --git a/src/Pwd/Main.cs b/src/Pwd/Main.cs
index e99a1f0..e0bc9f4 100644
--- a/src/Pwd/Main.cs
+++ b/src/Pwd/Main.cs
@@ -1,3 +1,5 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
 using NSExt.Extensions;
 #if NET7_0_WINDOWS
 using TextCopy;
@@ -8,7 +10,7 @@ namespace Dot.Pwd;
 
 [Description(nameof(Str.RandomPasswordGenerator))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 {
     private readonly char[][] _charTable = {
                                                "0123456789".ToCharArray() //
diff --git a/src/Pwd/Option.cs b/src/Pwd/Option.cs
index 364570b..89ba8a1 100644
--- a/src/Pwd/Option.cs
+++ b/src/Pwd/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot.Pwd;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [Flags]
     public enum GenerateTypes
diff --git a/src/Rbom/Main.cs b/src/Rbom/Main.cs
index f5c2e1e..b34d9ba 100644
--- a/src/Rbom/Main.cs
+++ b/src/Rbom/Main.cs
@@ -1,8 +1,11 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 namespace Dot.Rbom;
 
 [Description(nameof(Str.TrimUtf8Bom))]
 [Localization(typeof(Str))]
-public sealed class Main : FilesTool<Option>
+internal sealed class Main : FilesTool<Option>
 {
     private readonly byte[] _utf8Bom = { 0xef, 0xbb, 0xbf };
 
diff --git a/src/Rbom/Option.cs b/src/Rbom/Option.cs
index 8b2109e..6e9f69a 100644
--- a/src/Rbom/Option.cs
+++ b/src/Rbom/Option.cs
@@ -1,3 +1,6 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 namespace Dot.Rbom;
 
-public class Option : DirOption { }
\ No newline at end of file
+internal class Option : DirOption { }
\ No newline at end of file
diff --git a/src/Text/Main.cs b/src/Text/Main.cs
index acd9aaa..246203b 100644
--- a/src/Text/Main.cs
+++ b/src/Text/Main.cs
@@ -1,3 +1,6 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 using System.Security.Cryptography;
 using System.Text;
 using NSExt.Extensions;
@@ -10,7 +13,7 @@ namespace Dot.Text;
 
 [Description(nameof(Str.TextTool))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 {
     private ref struct Output
     {
diff --git a/src/Text/Option.cs b/src/Text/Option.cs
index ae826e3..bb101be 100644
--- a/src/Text/Option.cs
+++ b/src/Text/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 namespace Dot.Text;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandArgument(0, "[input text]")]
     [Description(nameof(Str.TextTobeProcessed))]
diff --git a/src/Time/Main.cs b/src/Time/Main.cs
index a0eac98..71c367f 100644
--- a/src/Time/Main.cs
+++ b/src/Time/Main.cs
@@ -1,10 +1,13 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 using System.Net.Sockets;
 
 namespace Dot.Time;
 
 [Description(nameof(Str.TimeTool))]
 [Localization(typeof(Str))]
-public sealed class Main : ToolBase<Option>
+internal sealed class Main : ToolBase<Option>
 {
     private const int _MAX_DEGREE_OF_PARALLELISM = 10;
     private const int _NTP_PORT                  = 123;
diff --git a/src/Time/Option.cs b/src/Time/Option.cs
index 790ea44..74804ee 100644
--- a/src/Time/Option.cs
+++ b/src/Time/Option.cs
@@ -1,6 +1,9 @@
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+
 namespace Dot.Time;
 
-public class Option : OptionBase
+internal class Option : OptionBase
 {
     [CommandOption("-s|--sync")]
     [Description(nameof(Str.SyncToLocalTime))]
diff --git a/src/Time/ProgressTaskStateExtensions.cs b/src/Time/ProgressTaskStateExtensions.cs
index 68862fe..ce3fdbf 100644
--- a/src/Time/ProgressTaskStateExtensions.cs
+++ b/src/Time/ProgressTaskStateExtensions.cs
@@ -1,6 +1,6 @@
 namespace Dot.Time;
 
-public static class ProgressTaskStateExtensions
+internal static class ProgressTaskStateExtensions
 {
     public static TimeSpan Result(this ProgressTaskState me)
     {
diff --git a/src/Time/TaskResultColumn.cs b/src/Time/TaskResultColumn.cs
index 16a4d47..28c3e2f 100644
--- a/src/Time/TaskResultColumn.cs
+++ b/src/Time/TaskResultColumn.cs
@@ -1,8 +1,11 @@
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
+
 using Spectre.Console.Rendering;
 
 namespace Dot.Time;
 
-public class TaskResultColumn : ProgressColumn
+internal class TaskResultColumn : ProgressColumn
 {
     /// <summary>
     ///     Gets or sets the alignment of the task description.
diff --git a/src/Time/TaskStatusColumn.cs b/src/Time/TaskStatusColumn.cs
index ccf4d17..481311c 100644
--- a/src/Time/TaskStatusColumn.cs
+++ b/src/Time/TaskStatusColumn.cs
@@ -1,13 +1,18 @@
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
+
+
 using NSExt.Extensions;
 using Spectre.Console.Rendering;
 
 namespace Dot.Time;
 
-public class TaskStatusColumn : ProgressColumn
+internal class TaskStatusColumn : ProgressColumn
 {
     public enum Statues : byte
     {
         [Description($"[gray]{nameof(Ready)}[/]")]
+        // ReSharper disable once UnusedMember.Global
         Ready
 
       , [Description($"[yellow]{nameof(Connecting)}[/]")]
diff --git a/src/ToLf/Main.cs b/src/ToLf/Main.cs
index 28e4586..706b571 100644
--- a/src/ToLf/Main.cs
+++ b/src/ToLf/Main.cs
@@ -1,8 +1,11 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 namespace Dot.ToLf;
 
 [Description(nameof(Str.ConvertEndOfLineToLF))]
 [Localization(typeof(Str))]
-public sealed class Main : FilesTool<Option>
+internal sealed class Main : FilesTool<Option>
 {
     protected override async ValueTask FileHandle(string file, CancellationToken _)
     {
@@ -11,7 +14,8 @@ public sealed class Main : FilesTool<Option>
         var    hasWrote = false;
         var    isBin    = false;
         string tmpFile;
-        int    data;
+        // ReSharper disable once TooWideLocalVariableScope
+        int data;
 
         await using (var fsr = OpenFileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
             if (fsr is null) {
diff --git a/src/ToLf/Option.cs b/src/ToLf/Option.cs
index baee82c..344dc92 100644
--- a/src/ToLf/Option.cs
+++ b/src/ToLf/Option.cs
@@ -1,3 +1,6 @@
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 namespace Dot.ToLf;
 
-public class Option : DirOption { }
\ No newline at end of file
+internal class Option : DirOption { }
\ No newline at end of file
diff --git a/src/ToolBase.cs b/src/ToolBase.cs
index 348bf9d..74d88ba 100644
--- a/src/ToolBase.cs
+++ b/src/ToolBase.cs
@@ -1,17 +1,10 @@
 namespace Dot;
 
-public abstract class ToolBase<TOption> : Command<TOption> where TOption : OptionBase
+internal abstract class ToolBase<TOption> : Command<TOption> where TOption : OptionBase
 {
     protected          TOption Opt { get; private set; }
     protected abstract Task    Core();
 
-    public override int Execute(CommandContext context, TOption option)
-    {
-        Opt = option;
-        Run().Wait();
-        return 0;
-    }
-
     protected virtual async Task Run()
     {
         await Core();
@@ -20,4 +13,11 @@ public abstract class ToolBase<TOption> : Command<TOption> where TOption : Optio
             AnsiConsole.Console.Input.ReadKey(true);
         }
     }
+
+    public override int Execute(CommandContext context, TOption option)
+    {
+        Opt = option;
+        Run().Wait();
+        return 0;
+    }
 }
\ No newline at end of file
diff --git a/src/ToolsFactory.cs b/src/ToolsFactory.cs
deleted file mode 100644
index dc9dc90..0000000
--- a/src/ToolsFactory.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Dot;
-
-public static class ToolsFactory
-{
-    // public static ITool Create(IOption option)
-    // {
-    //     return option switch {
-    //                Option o         => new Main(o)
-    //              , ToLf.Option o    => new ToLf.Main(o)
-    //              , RmBlank.Option o => new RmBlank.Main(o)
-    //              , Pwd.Option o     => new Pwd.Main(o)
-    //              , Text.Option o    => new Text.Main(o)
-    //              , Guid.Option o    => new Guid.Main(o)
-    //              , Time.Option o    => new Time.Main(o)
-    //                #if NET7_0_WINDOWS
-    //              , Color.Option o => new Color.Main(o)
-    //                #endif
-    //              , IP.Option o => new IP.Main(o)
-    //                // , Git.Option o  => new Git.Main(o)
-    //              , Json.Option o => new Json.Main(o)
-    //              , _             => throw new ArgumentOutOfRangeException(nameof(option))
-    //            };
-    // }
-}
\ No newline at end of file
diff --git a/src/Trim/Main.cs b/src/Trim/Main.cs
index 4853715..d4ca87f 100644
--- a/src/Trim/Main.cs
+++ b/src/Trim/Main.cs
@@ -1,11 +1,13 @@
-using Dot.RmBlank;
+// ReSharper disable ClassNeverInstantiated.Global
+
+
 using NSExt.Extensions;
 
 namespace Dot.Trim;
 
 [Description(nameof(Str.RemoveTrailingWhiteSpaces))]
 [Localization(typeof(Str))]
-public sealed class Main : FilesTool<Option>
+internal sealed class Main : FilesTool<Option>
 {
     private static int GetSpacesCnt(Stream fsr)
     {
diff --git a/src/Trim/Option.cs b/src/Trim/Option.cs
index 5411a84..a256594 100644
--- a/src/Trim/Option.cs
+++ b/src/Trim/Option.cs
@@ -1,3 +1,6 @@
-namespace Dot.RmBlank;
+// ReSharper disable ClassNeverInstantiated.Global
 
-public class Option : DirOption { }
\ No newline at end of file
+
+namespace Dot.Trim;
+
+internal class Option : DirOption { }
\ No newline at end of file
diff --git a/src/Win32.cs b/src/Win32.cs
index 0c5d2e0..7627d42 100644
--- a/src/Win32.cs
+++ b/src/Win32.cs
@@ -1,3 +1,6 @@
+// ReSharper disable UnusedMember.Global
+// ReSharper disable UnusedMethodReturnValue.Global
+
 using System.Runtime.InteropServices;
 
 namespace Dot;