From 7168901befe11ba0d600253e497e0bf2b8b80667 Mon Sep 17 00:00:00 2001
From: nsnail <taokeu@gmail.com>
Date: Thu, 1 Dec 2022 15:55:14 +0800
Subject: [PATCH] =?UTF-8?q?<feat>=20=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code-format.cmd                               |  6 +-
 src/Convert2Lf/Option.cs                      |  4 -
 src/DirOption.cs                              |  6 +-
 src/Lang/Strings.Designer.cs                  | 47 +++++++---
 src/Lang/Strings.en-US.resx                   | 86 +++++++++++++++++++
 src/Lang/Strings.resx                         | 13 ++-
 src/RemoveTrailingWhiteSpace/Option.cs        |  4 -
 .../Main.cs                                   | 23 +++--
 src/RmBlank/Option.cs                         |  4 +
 src/{TrimUtf8Bom => RmBom}/Main.cs            | 20 ++++-
 src/RmBom/Option.cs                           |  4 +
 src/Text/Main.cs                              |  4 +
 src/Text/Option.cs                            |  2 +-
 src/{Convert2Lf => ToLf}/Main.cs              | 21 ++++-
 src/ToLf/Option.cs                            |  4 +
 src/Tool.cs                                   | 20 +++--
 src/ToolsFactory.cs                           | 16 ++--
 src/TrimUtf8Bom/Option.cs                     |  4 -
 src/dot.csproj                                |  2 +-
 19 files changed, 231 insertions(+), 59 deletions(-)
 delete mode 100644 src/Convert2Lf/Option.cs
 create mode 100644 src/Lang/Strings.en-US.resx
 delete mode 100644 src/RemoveTrailingWhiteSpace/Option.cs
 rename src/{RemoveTrailingWhiteSpace => RmBlank}/Main.cs (82%)
 create mode 100644 src/RmBlank/Option.cs
 rename src/{TrimUtf8Bom => RmBom}/Main.cs (83%)
 create mode 100644 src/RmBom/Option.cs
 rename src/{Convert2Lf => ToLf}/Main.cs (86%)
 create mode 100644 src/ToLf/Option.cs
 delete mode 100644 src/TrimUtf8Bom/Option.cs

diff --git a/code-format.cmd b/code-format.cmd
index 82c9512..253fbb5 100644
--- a/code-format.cmd
+++ b/code-format.cmd
@@ -1,3 +1,3 @@
-dot trim-utf8-bom
-dot remove-whitespace
-dot convert-lf
\ No newline at end of file
+dot rm-bom
+dot rm-blank
+dot tolf
\ No newline at end of file
diff --git a/src/Convert2Lf/Option.cs b/src/Convert2Lf/Option.cs
deleted file mode 100644
index 7f3384d..0000000
--- a/src/Convert2Lf/Option.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Dot.Convert2Lf;
-
-[Verb("convert-lf", HelpText = nameof(Strings.ConvertEndOfLineToLF), ResourceType = typeof(Strings))]
-public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/DirOption.cs b/src/DirOption.cs
index 62c3017..a86564a 100644
--- a/src/DirOption.cs
+++ b/src/DirOption.cs
@@ -2,10 +2,14 @@ namespace Dot;
 
 public class DirOption : IOption
 {
-    [Option('f', "filter", Required = false, HelpText = nameof(Strings.FileSearchPattern), Default = "*.*"
+    [Option('f', "filter", HelpText = nameof(Strings.FileSearchPattern), Default = "*.*"
           , ResourceType = typeof(Strings))]
     public string Filter { get; set; }
 
     [Value(0, HelpText = nameof(Strings.FolderPath), Default = ".", ResourceType = typeof(Strings))]
     public string Path { get; set; }
+
+
+    [Option('r', "readonly", HelpText = nameof(Strings.ReadOnly), Default = false, ResourceType = typeof(Strings))]
+    public bool ReadOnly { get; set; }
 }
\ No newline at end of file
diff --git a/src/Lang/Strings.Designer.cs b/src/Lang/Strings.Designer.cs
index 2a141ff..b053a6d 100644
--- a/src/Lang/Strings.Designer.cs
+++ b/src/Lang/Strings.Designer.cs
@@ -113,15 +113,6 @@ namespace Dot.Lang {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to 要处理的文本（默认取取剪贴板值）.
-        /// </summary>
-        public static string HelpForTextArg0 {
-            get {
-                return ResourceManager.GetString("HelpForTextArg0", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to 输入文本为空.
         /// </summary>
@@ -131,6 +122,15 @@ namespace Dot.Lang {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 没有需要处理的文件.
+        /// </summary>
+        public static string NoFileToBeProcessed {
+            get {
+                return ResourceManager.GetString("NoFileToBeProcessed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 指定的路径“{0}”不存在.
         /// </summary>
@@ -140,6 +140,15 @@ namespace Dot.Lang {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 按下任意键继续....
+        /// </summary>
+        public static string PressAnyKey {
+            get {
+                return ResourceManager.GetString("PressAnyKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to BitSet 1：[0-9]，2：[a-z]，4：[A-Z]，8：[ascii.0x21-0x2F].
         /// </summary>
@@ -167,6 +176,15 @@ namespace Dot.Lang {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 只读模式（仅做测试，不实际修改）.
+        /// </summary>
+        public static string ReadOnly {
+            get {
+                return ResourceManager.GetString("ReadOnly", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 移除文件尾部换行和空格.
         /// </summary>
@@ -186,7 +204,7 @@ namespace Dot.Lang {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 查找文件...OK.
+        ///   Looks up a localized string similar to {0} 个文件.
         /// </summary>
         public static string SearchingFileOK {
             get {
@@ -203,6 +221,15 @@ namespace Dot.Lang {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 要处理的文本（默认取取剪贴板值）.
+        /// </summary>
+        public static string TextTobeProcessed {
+            get {
+                return ResourceManager.GetString("TextTobeProcessed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 移除文件的uf8 bom.
         /// </summary>
diff --git a/src/Lang/Strings.en-US.resx b/src/Lang/Strings.en-US.resx
new file mode 100644
index 0000000..d9d42b0
--- /dev/null
+++ b/src/Lang/Strings.en-US.resx
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"
+                id="root" xmlns="">
+        <xsd:element name="root" msdata:IsDataSet="true"></xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
+    </resheader>
+    <data name="InputTextIsEmpty" xml:space="preserve">
+        <value>The input text is empty</value>
+    </data>
+    <data name="SearchingFile" xml:space="preserve">
+        <value>Find files...</value>
+    </data>
+    <data name="PathNotFound" xml:space="preserve">
+        <value>The specified path "{0}" does not exist</value>
+    </data>
+    <data name="SearchingFileOK" xml:space="preserve">
+        <value>Find files...OK</value>
+    </data>
+    <data name="ShowMessageTemp" xml:space="preserve">
+        <value>Read: {0}/{1}, processed: {2}, skipped: {3}</value>
+    </data>
+    <data name="HelpForText" xml:space="preserve">
+        <value>Text encoding tool</value>
+    </data>
+    <data name="Copied" xml:space="preserve">
+        <value>{0}(copied to clipboard)</value>
+    </data>
+    <data name="FileSearchPattern" xml:space="preserve">
+        <value>File wildcards</value>
+    </data>
+    <data name="FolderPath" xml:space="preserve">
+        <value>Directory path to be processed</value>
+    </data>
+    <data name="ConvertEndOfLineToLF" xml:space="preserve">
+        <value>Convert newline characters to LF</value>
+    </data>
+    <data name="GuidTool" xml:space="preserve">
+        <value>GUID tool</value>
+    </data>
+    <data name="UseUppercase" xml:space="preserve">
+        <value>Use uppercase output</value>
+    </data>
+    <data name="RandomPasswordGenerator" xml:space="preserve">
+        <value>Random password generator</value>
+    </data>
+    <data name="PwdLength" xml:space="preserve">
+        <value>Password length</value>
+    </data>
+    <data name="PwdGenerateTypes" xml:space="preserve">
+        <value>BitSet 1：[0-9]，2：[a-z]，4：[A-Z]，8：[ascii.0x21-0x2F]</value>
+    </data>
+    <data name="RemoveTrailingWhiteSpaces" xml:space="preserve">
+        <value>Remove line breaks and spaces at the end of the file</value>
+    </data>
+    <data name="TrimUtf8Bom" xml:space="preserve">
+        <value>Remove the uf8 bom of the file</value>
+    </data>
+    <data name="TextTobeProcessed" xml:space="preserve">
+        <value>Text to be processed (clipboard value is taken by default)</value>
+    </data>
+    <data name="PressAnyKey" xml:space="preserve">
+        <value>Press any key to continue...</value>
+    </data>
+    <data name="ReadOnly" xml:space="preserve">
+        <value>Read-only mode (only for testing, no actual modification)</value>
+    </data>
+    <data name="NoFileToBeProcessed" xml:space="preserve">
+        <value>No documents to be processed</value>
+    </data>
+</root>
\ No newline at end of file
diff --git a/src/Lang/Strings.resx b/src/Lang/Strings.resx
index 7dc2879..49467fb 100644
--- a/src/Lang/Strings.resx
+++ b/src/Lang/Strings.resx
@@ -34,7 +34,7 @@
         <value>指定的路径“{0}”不存在</value>
     </data>
     <data name="SearchingFileOK" xml:space="preserve">
-        <value>查找文件...OK</value>
+        <value>{0} 个文件</value>
     </data>
     <data name="ShowMessageTemp" xml:space="preserve">
         <value>已读取：{0}/{1}，处理：{2}，跳过：{3}</value>
@@ -42,7 +42,7 @@
     <data name="HelpForText" xml:space="preserve">
         <value>文本编码工具</value>
     </data>
-    <data name="HelpForTextArg0" xml:space="preserve">
+    <data name="TextTobeProcessed" xml:space="preserve">
         <value>要处理的文本（默认取取剪贴板值）</value>
     </data>
     <data name="Copied" xml:space="preserve">
@@ -82,4 +82,13 @@
     <data name="TrimUtf8Bom" xml:space="preserve">
         <value>移除文件的uf8 bom</value>
     </data>
+    <data name="PressAnyKey" xml:space="preserve">
+        <value>按下任意键继续...</value>
+    </data>
+    <data name="ReadOnly" xml:space="preserve">
+        <value>只读模式（仅做测试，不实际修改）</value>
+    </data>
+    <data name="NoFileToBeProcessed" xml:space="preserve">
+        <value>没有需要处理的文件</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/src/RemoveTrailingWhiteSpace/Option.cs b/src/RemoveTrailingWhiteSpace/Option.cs
deleted file mode 100644
index 4a4ee03..0000000
--- a/src/RemoveTrailingWhiteSpace/Option.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Dot.RemoveTrailingWhiteSpace;
-
-[Verb("remove-whitespace", HelpText = nameof(Strings.RemoveTrailingWhiteSpaces), ResourceType = typeof(Strings))]
-public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/RemoveTrailingWhiteSpace/Main.cs b/src/RmBlank/Main.cs
similarity index 82%
rename from src/RemoveTrailingWhiteSpace/Main.cs
rename to src/RmBlank/Main.cs
index becca13..d1af5bc 100644
--- a/src/RemoveTrailingWhiteSpace/Main.cs
+++ b/src/RmBlank/Main.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using NSExt.Extensions;
 
-namespace Dot.RemoveTrailingWhiteSpace;
+namespace Dot.RmBlank;
 
 public sealed class Main : Tool<Option>, IDisposable
 {
@@ -33,16 +33,23 @@ public sealed class Main : Tool<Option>, IDisposable
         ShowMessage(1, 0, 0);
         var spacesCnt = 0;
 
-        using var fsr = OpenFileToWrite(file);
-        if (fsr.Length == 0 || (spacesCnt = GetSpacesCnt(fsr)) == 0) {
+        using var fsrw = OpenFileStream(file, FileMode.Open, FileAccess.ReadWrite);
+
+        if (Opt.ReadOnly) { //测试，只读模式
+            ShowMessage(0, 1, 0);
+            return;
+        }
+
+
+        if (fsrw is null || fsrw.Length == 0 || (spacesCnt = GetSpacesCnt(fsrw)) == 0) {
             ShowMessage(0, 0, 1);
             return;
         }
 
-        fsr.Seek(0, SeekOrigin.Begin);
-        if (!fsr.IsTextStream()) return;
+        fsrw.Seek(0, SeekOrigin.Begin);
+        if (!fsrw.IsTextStream()) return;
         ShowMessage(0, 1, 0);
-        fsr.SetLength(fsr.Length - spacesCnt);
+        fsrw.SetLength(fsrw.Length - spacesCnt);
     }
 
     private static int GetSpacesCnt(Stream fsr)
@@ -94,8 +101,10 @@ public sealed class Main : Tool<Option>, IDisposable
         var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
         _totalCnt = fileList.Count();
 
-        step1Bar.Message = Strings.SearchingFileOK;
+        step1Bar.Message = string.Format(Strings.SearchingFileOK, _totalCnt);
         step1Bar.Finished();
+        if (_totalCnt == 0) return;
+
 
         _step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
 
diff --git a/src/RmBlank/Option.cs b/src/RmBlank/Option.cs
new file mode 100644
index 0000000..e9523d9
--- /dev/null
+++ b/src/RmBlank/Option.cs
@@ -0,0 +1,4 @@
+namespace Dot.RmBlank;
+
+[Verb("rm-blank", HelpText = nameof(Strings.RemoveTrailingWhiteSpaces), ResourceType = typeof(Strings))]
+public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/TrimUtf8Bom/Main.cs b/src/RmBom/Main.cs
similarity index 83%
rename from src/TrimUtf8Bom/Main.cs
rename to src/RmBom/Main.cs
index 774380a..c38a003 100644
--- a/src/TrimUtf8Bom/Main.cs
+++ b/src/RmBom/Main.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Dot.TrimUtf8Bom;
+namespace Dot.RmBom;
 
 public sealed class Main : Tool<Option>, IDisposable
 {
@@ -57,8 +57,9 @@ public sealed class Main : Tool<Option>, IDisposable
         var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
         _totalCnt = fileList.Count();
 
-        step1Bar.Message = Strings.SearchingFileOK;
+        step1Bar.Message = string.Format(Strings.SearchingFileOK, _totalCnt);
         step1Bar.Finished();
+        if (_totalCnt == 0) return;
 
         _step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
 
@@ -68,11 +69,22 @@ public sealed class Main : Tool<Option>, IDisposable
 
             var tmpFile    = $"{file}.tmp";
             var isReplaced = false;
-            using (var fsr = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
+            using (var fsr = OpenFileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
+                if (Opt.ReadOnly) { //测试，只读模式
+                    ShowMessage(0, 1, 0);
+                    return;
+                }
+
+                if (fsr is null) {
+                    ShowMessage(0, 0, 1);
+                    return;
+                }
+
+
                 Span<byte> buffer  = stackalloc byte[utf8Bom.Length];
                 var        readLen = fsr.Read(buffer);
                 if (readLen == utf8Bom.Length && buffer.SequenceEqual(utf8Bom)) {
-                    using var fsw = new FileStream(tmpFile, FileMode.OpenOrCreate, FileAccess.Write);
+                    using var fsw = OpenFileStream(tmpFile, FileMode.OpenOrCreate, FileAccess.Write);
                     int       data;
                     while ((data = fsr.ReadByte()) != -1) fsw.WriteByte((byte)data);
                     isReplaced = true;
diff --git a/src/RmBom/Option.cs b/src/RmBom/Option.cs
new file mode 100644
index 0000000..579a772
--- /dev/null
+++ b/src/RmBom/Option.cs
@@ -0,0 +1,4 @@
+namespace Dot.RmBom;
+
+[Verb("rm-bom", HelpText = nameof(Strings.TrimUtf8Bom), ResourceType = typeof(Strings))]
+public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/Text/Main.cs b/src/Text/Main.cs
index 8d9d3ed..f7f6794 100644
--- a/src/Text/Main.cs
+++ b/src/Text/Main.cs
@@ -102,5 +102,9 @@ html-decode:       {o.HtmlDecode}
         PrintOutput(utf8);
         PrintOutput(unicodeLittleEndian);
         PrintOutput(unicodeBigEndian);
+
+        Console.Write(Strings.PressAnyKey);
+
+        Console.ReadKey();
     }
 }
\ No newline at end of file
diff --git a/src/Text/Option.cs b/src/Text/Option.cs
index caa3109..17af8ac 100644
--- a/src/Text/Option.cs
+++ b/src/Text/Option.cs
@@ -3,6 +3,6 @@ namespace Dot.Text;
 [Verb("text", HelpText = nameof(Strings.HelpForText), ResourceType = typeof(Strings))]
 public class Option : IOption
 {
-    [Value(0, HelpText = nameof(Strings.HelpForTextArg0), ResourceType = typeof(Strings))]
+    [Value(0, HelpText = nameof(Strings.TextTobeProcessed), ResourceType = typeof(Strings))]
     public string Text { get; set; }
 }
\ No newline at end of file
diff --git a/src/Convert2Lf/Main.cs b/src/ToLf/Main.cs
similarity index 86%
rename from src/Convert2Lf/Main.cs
rename to src/ToLf/Main.cs
index 233020a..e53741b 100644
--- a/src/Convert2Lf/Main.cs
+++ b/src/ToLf/Main.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace Dot.Convert2Lf;
+namespace Dot.ToLf;
 
 public sealed class Main : Tool<Option>, IDisposable
 {
@@ -36,8 +36,19 @@ public sealed class Main : Tool<Option>, IDisposable
         var isBin      = false;
         int data;
 
-        using (var fsr = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
-            using var fsw = new FileStream(tmpFile, FileMode.OpenOrCreate, FileAccess.Write);
+        using (var fsr = OpenFileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
+            if (Opt.ReadOnly) { //测试，只读模式
+                ShowMessage(0, 1, 0);
+                return;
+            }
+
+            if (fsr is null) {
+                ShowMessage(0, 0, 1);
+                return;
+            }
+
+
+            using var fsw = OpenFileStream(tmpFile, FileMode.OpenOrCreate, FileAccess.Write);
 
             while ((data = fsr.ReadByte()) != -1) {
                 switch (data) {
@@ -104,8 +115,10 @@ public sealed class Main : Tool<Option>, IDisposable
         var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
         _totalCnt = fileList.Count();
 
-        step1Bar.Message = Strings.SearchingFileOK;
+        step1Bar.Message = string.Format(Strings.SearchingFileOK, _totalCnt);
         step1Bar.Finished();
+        if (_totalCnt == 0) return;
+
 
         _step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
 
diff --git a/src/ToLf/Option.cs b/src/ToLf/Option.cs
new file mode 100644
index 0000000..e5637f2
--- /dev/null
+++ b/src/ToLf/Option.cs
@@ -0,0 +1,4 @@
+namespace Dot.ToLf;
+
+[Verb("tolf", HelpText = nameof(Strings.ConvertEndOfLineToLF), ResourceType = typeof(Strings))]
+public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/Tool.cs b/src/Tool.cs
index e9ff1c7..3671fc2 100644
--- a/src/Tool.cs
+++ b/src/Tool.cs
@@ -9,7 +9,8 @@ public abstract class Tool<TOption> : ITool
                                             , ForegroundColor     = ConsoleColor.Yellow
                                             , ForegroundColorDone = ConsoleColor.DarkGreen
                                             , BackgroundColor     = ConsoleColor.DarkGray
-                                            , BackgroundCharacter = '\u2593'
+                                            , BackgroundCharacter = '\u2500'
+                                            , ProgressCharacter   = '\u2500'
                                           };
 
     protected TOption Opt { get; set; }
@@ -43,16 +44,23 @@ public abstract class Tool<TOption> : ITool
         }
     }
 
-    protected static FileStream OpenFileToWrite(string file)
+    protected static FileStream OpenFileStream(string    file, FileMode mode, FileAccess access
+                                             , FileShare share = FileShare.Read)
     {
-        FileStream fsr;
+        FileStream fsr = null;
         try {
-            fsr = new FileStream(file, FileMode.Open, FileAccess.ReadWrite, FileShare.Read);
+            fsr = new FileStream(file, mode, access, share);
         }
         catch (UnauthorizedAccessException) {
-            File.SetAttributes(file, new FileInfo(file).Attributes & ~FileAttributes.ReadOnly);
-            fsr = new FileStream(file, FileMode.Open, FileAccess.ReadWrite, FileShare.Read);
+            try {
+                File.SetAttributes(file, new FileInfo(file).Attributes & ~FileAttributes.ReadOnly);
+                fsr = new FileStream(file, mode, access, share);
+            }
+            catch (Exception) {
+                // ignored
+            }
         }
+        catch (IOException) { }
 
         return fsr;
     }
diff --git a/src/ToolsFactory.cs b/src/ToolsFactory.cs
index 2993e51..67d2f1f 100644
--- a/src/ToolsFactory.cs
+++ b/src/ToolsFactory.cs
@@ -1,4 +1,4 @@
-using Dot.TrimUtf8Bom;
+using Dot.RmBom;
 
 namespace Dot;
 
@@ -7,13 +7,13 @@ public static class ToolsFactory
     public static ITool Create(IOption option)
     {
         return option switch {
-                   Option o                          => new Main(o)
-                 , Convert2Lf.Option o               => new Convert2Lf.Main(o)
-                 , RemoveTrailingWhiteSpace.Option o => new RemoveTrailingWhiteSpace.Main(o)
-                 , Pwd.Option o                      => new Pwd.Main(o)
-                 , Text.Option o                     => new Text.Main(o)
-                 , Guid.Option o                     => new Guid.Main(o)
-                 , _                                 => throw new ArgumentOutOfRangeException(nameof(option))
+                   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)
+                 , _                => throw new ArgumentOutOfRangeException(nameof(option))
                };
     }
 }
\ No newline at end of file
diff --git a/src/TrimUtf8Bom/Option.cs b/src/TrimUtf8Bom/Option.cs
deleted file mode 100644
index 2119fce..0000000
--- a/src/TrimUtf8Bom/Option.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Dot.TrimUtf8Bom;
-
-[Verb("trim-utf8-bom", HelpText = nameof(Strings.TrimUtf8Bom), ResourceType = typeof(Strings))]
-public class Option : DirOption { }
\ No newline at end of file
diff --git a/src/dot.csproj b/src/dot.csproj
index 4a362a0..ec1a403 100644
--- a/src/dot.csproj
+++ b/src/dot.csproj
@@ -6,7 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <RootNamespace>Dot</RootNamespace>
         <AssemblyName>dot</AssemblyName>
-        <Version>1.0.1</Version>
+        <Version>1.1.0</Version>
         <Authors>nsnail</Authors>
         <Copyright>Copyright (c) 2022 nsnail</Copyright>
         <RepositoryUrl>https://github.com/nsnail/dot.git</RepositoryUrl>