diff --git a/code-format.cmd b/code-format.cmd index 2a4cd3e..dd2fd79 100644 --- a/code-format.cmd +++ b/code-format.cmd @@ -1,3 +1,3 @@ -dot rm-bom -w -dot rm-blank -w +dot rbom -w +dot trim -w dot tolf -w \ No newline at end of file diff --git a/src/FilesTool.cs b/src/FilesTool.cs index 1433dfb..2e10e1d 100644 --- a/src/FilesTool.cs +++ b/src/FilesTool.cs @@ -1,4 +1,4 @@ -using System.Collections.Concurrent; +using System.Collections.Concurrent; using Panel = Spectre.Console.Panel; namespace Dot; @@ -121,7 +121,8 @@ public abstract class FilesTool : ToolBase where TOption : Dir var grid = new Grid().AddColumn(new GridColumn().NoWrap().PadRight(16)) .AddColumn(new GridColumn().Alignment(Justify.Right)); - foreach (var kv in _writeStats) grid.AddRow(kv.Key, kv.Value.ToString()); + foreach (var kv in _writeStats.OrderByDescending(x => x.Value).ThenBy(x => x.Key)) + grid.AddRow(kv.Key, kv.Value.ToString()); AnsiConsole.Write(new Panel(grid).Header(Str.WriteFileStats)); } diff --git a/src/Lang/Str.en-US.resx b/src/Lang/Str.en-US.resx index f03a9fc..69b4561 100644 --- a/src/Lang/Str.en-US.resx +++ b/src/Lang/Str.en-US.resx @@ -1,4 +1,4 @@ - + @@ -188,4 +188,4 @@ Write statistics - + \ No newline at end of file diff --git a/src/RmBlank/Option.cs b/src/RmBlank/Option.cs index 4eda764..66ea180 100644 --- a/src/RmBlank/Option.cs +++ b/src/RmBlank/Option.cs @@ -1,4 +1,4 @@ namespace Dot.RmBlank; -[Verb("rm-blank", HelpText = nameof(Str.RemoveTrailingWhiteSpaces), ResourceType = typeof(Str))] +[Verb("trim", HelpText = nameof(Str.RemoveTrailingWhiteSpaces), ResourceType = typeof(Str))] public class Option : DirOption { } \ No newline at end of file diff --git a/src/RmBom/Option.cs b/src/RmBom/Option.cs index 0a813fc..0fc6bc2 100644 --- a/src/RmBom/Option.cs +++ b/src/RmBom/Option.cs @@ -1,4 +1,4 @@ namespace Dot.RmBom; -[Verb("rm-bom", HelpText = nameof(Str.TrimUtf8Bom), ResourceType = typeof(Str))] +[Verb("rbom", HelpText = nameof(Str.TrimUtf8Bom), ResourceType = typeof(Str))] public class Option : DirOption { } \ No newline at end of file diff --git a/src/Time/Main.cs b/src/Time/Main.cs index d199e08..d8665b9 100644 --- a/src/Time/Main.cs +++ b/src/Time/Main.cs @@ -1,7 +1,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Net.Sockets; -using Dot.Color; namespace Dot.Time; diff --git a/src/Color/Win32.cs b/src/Win32.cs similarity index 99% rename from src/Color/Win32.cs rename to src/Win32.cs index a94e4eb..0c5d2e0 100644 --- a/src/Color/Win32.cs +++ b/src/Win32.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Dot.Color; +namespace Dot; public static partial class Win32 {