mirror of
https://github.com/nsnail/dot.git
synced 2025-06-17 21:13:21 +08:00
<refactor>
This commit is contained in:
parent
8b1265b832
commit
85944f23b4
@ -81,7 +81,7 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
_procedCnt += procedCnt;
|
||||
_replaceCnt += replaceCnt;
|
||||
_breakCnt += breakCnt;
|
||||
_step2Bar.Message = $"已处理:{_procedCnt}/{_totalCnt},替换:{_replaceCnt},跳过:{_breakCnt}";
|
||||
_step2Bar.Message = string.Format(Strings.ShowMessageTemp, _procedCnt, _totalCnt, _replaceCnt, _breakCnt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -94,16 +94,17 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
[SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
|
||||
public override void Run()
|
||||
{
|
||||
if (!Directory.Exists(Opt.Path)) throw new ArgumentException(nameof(Opt.Path), $"指定的路径“{Opt.Path}”不存在");
|
||||
if (!Directory.Exists(Opt.Path))
|
||||
throw new ArgumentException(nameof(Opt.Path), string.Format(Strings.PathNotFound, Opt.Path));
|
||||
|
||||
|
||||
using var step1Bar = new IndeterminateProgressBar("查找文件...", DefaultProgressBarOptions);
|
||||
using var step1Bar = new IndeterminateProgressBar(Strings.SearchingFile, DefaultProgressBarOptions);
|
||||
|
||||
|
||||
var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
|
||||
_totalCnt = fileList.Count();
|
||||
|
||||
step1Bar.Message = "查找文件...OK";
|
||||
step1Bar.Message = Strings.SearchingFileOK;
|
||||
step1Bar.Finished();
|
||||
|
||||
_step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
|
||||
|
@ -1,11 +1,4 @@
|
||||
namespace Dot.Convert2Lf;
|
||||
|
||||
[Verb("convert-lf", HelpText = "换行符转换为lf")]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Option('f', "filter", Required = false, HelpText = "文件通配符", Default = "*.*")]
|
||||
public string Filter { get; set; } //normal options here
|
||||
|
||||
[Option('p', "path", Required = false, HelpText = "要处理的目录路径", Default = ".")]
|
||||
public string Path { get; set; }
|
||||
}
|
||||
[Verb("convert-lf", HelpText = nameof(Strings.ConvertEndOfLineToLF), ResourceType = typeof(Strings))]
|
||||
public class Option : DirOption { }
|
11
src/DirOption.cs
Normal file
11
src/DirOption.cs
Normal file
@ -0,0 +1,11 @@
|
||||
namespace Dot;
|
||||
|
||||
public class DirOption : IOption
|
||||
{
|
||||
[Option('f', "filter", Required = false, 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; }
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
global using ShellProgressBar;
|
||||
global using CommandLine;
|
||||
global using Dot.Lang;
|
@ -12,6 +12,6 @@ public sealed class Main : Tool<Option>
|
||||
var guid = System.Guid.NewGuid().ToString();
|
||||
if (Opt.Upper) guid = guid.ToUpper();
|
||||
ClipboardService.SetText(guid);
|
||||
Console.WriteLine($"已复制到剪贴板:{guid}");
|
||||
Console.WriteLine(Strings.Copied, guid);
|
||||
}
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
namespace Dot.Guid;
|
||||
|
||||
[Verb("guid", HelpText = "GUID工具")]
|
||||
[Verb("guid", HelpText = nameof(Strings.GuidTool), ResourceType = typeof(Strings))]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Option('u', "upper", HelpText = "大写", Default = false)]
|
||||
[Option('u', "upper", HelpText = nameof(Strings.UseUppercase), Default = false, ResourceType = typeof(Strings))]
|
||||
public bool Upper { get; set; } //normal options here
|
||||
}
|
224
src/Lang/Strings.Designer.cs
generated
Normal file
224
src/Lang/Strings.Designer.cs
generated
Normal file
@ -0,0 +1,224 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace Dot.Lang {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// A strongly-typed resource class, for looking up localized strings, etc.
|
||||
/// </summary>
|
||||
// This class was auto-generated by the StronglyTypedResourceBuilder
|
||||
// class via a tool like ResGen or Visual Studio.
|
||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||
// with the /str option, or rebuild your VS project.
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
public class Strings {
|
||||
|
||||
private static global::System.Resources.ResourceManager resourceMan;
|
||||
|
||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||
|
||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||
internal Strings() {
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns the cached ResourceManager instance used by this class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Dot.Lang.Strings", typeof(Strings).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Overrides the current thread's CurrentUICulture property for all
|
||||
/// resource lookups using this strongly typed resource class.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||
public static global::System.Globalization.CultureInfo Culture {
|
||||
get {
|
||||
return resourceCulture;
|
||||
}
|
||||
set {
|
||||
resourceCulture = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 转换换行符为LF.
|
||||
/// </summary>
|
||||
public static string ConvertEndOfLineToLF {
|
||||
get {
|
||||
return ResourceManager.GetString("ConvertEndOfLineToLF", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to {0}(已复制到剪贴板).
|
||||
/// </summary>
|
||||
public static string Copied {
|
||||
get {
|
||||
return ResourceManager.GetString("Copied", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 文件通配符.
|
||||
/// </summary>
|
||||
public static string FileSearchPattern {
|
||||
get {
|
||||
return ResourceManager.GetString("FileSearchPattern", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 要处理的目录路径.
|
||||
/// </summary>
|
||||
public static string FolderPath {
|
||||
get {
|
||||
return ResourceManager.GetString("FolderPath", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to GUID工具.
|
||||
/// </summary>
|
||||
public static string GuidTool {
|
||||
get {
|
||||
return ResourceManager.GetString("GuidTool", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 文本编码工具.
|
||||
/// </summary>
|
||||
public static string HelpForText {
|
||||
get {
|
||||
return ResourceManager.GetString("HelpForText", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <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>
|
||||
public static string InputTextIsEmpty {
|
||||
get {
|
||||
return ResourceManager.GetString("InputTextIsEmpty", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 指定的路径“{0}”不存在.
|
||||
/// </summary>
|
||||
public static string PathNotFound {
|
||||
get {
|
||||
return ResourceManager.GetString("PathNotFound", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to BitSet 1:[0-9],2:[a-z],4:[A-Z],8:[ascii.0x21-0x2F].
|
||||
/// </summary>
|
||||
public static string PwdGenerateTypes {
|
||||
get {
|
||||
return ResourceManager.GetString("PwdGenerateTypes", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 密码长度.
|
||||
/// </summary>
|
||||
public static string PwdLength {
|
||||
get {
|
||||
return ResourceManager.GetString("PwdLength", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 随机密码生成器.
|
||||
/// </summary>
|
||||
public static string RandomPasswordGenerator {
|
||||
get {
|
||||
return ResourceManager.GetString("RandomPasswordGenerator", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 移除文件尾部换行和空格.
|
||||
/// </summary>
|
||||
public static string RemoveTrailingWhiteSpaces {
|
||||
get {
|
||||
return ResourceManager.GetString("RemoveTrailingWhiteSpaces", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 查找文件....
|
||||
/// </summary>
|
||||
public static string SearchingFile {
|
||||
get {
|
||||
return ResourceManager.GetString("SearchingFile", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 查找文件...OK.
|
||||
/// </summary>
|
||||
public static string SearchingFileOK {
|
||||
get {
|
||||
return ResourceManager.GetString("SearchingFileOK", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 已读取:{0}/{1},处理:{2},跳过:{3}.
|
||||
/// </summary>
|
||||
public static string ShowMessageTemp {
|
||||
get {
|
||||
return ResourceManager.GetString("ShowMessageTemp", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 移除文件的uf8 bom.
|
||||
/// </summary>
|
||||
public static string TrimUtf8Bom {
|
||||
get {
|
||||
return ResourceManager.GetString("TrimUtf8Bom", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 使用大写输出.
|
||||
/// </summary>
|
||||
public static string UseUppercase {
|
||||
get {
|
||||
return ResourceManager.GetString("UseUppercase", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
85
src/Lang/Strings.resx
Normal file
85
src/Lang/Strings.resx
Normal file
@ -0,0 +1,85 @@
|
||||
<?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>输入文本为空</value>
|
||||
</data>
|
||||
<data name="SearchingFile" xml:space="preserve">
|
||||
<value>查找文件...</value>
|
||||
</data>
|
||||
<data name="PathNotFound" xml:space="preserve">
|
||||
<value>指定的路径“{0}”不存在</value>
|
||||
</data>
|
||||
<data name="SearchingFileOK" xml:space="preserve">
|
||||
<value>查找文件...OK</value>
|
||||
</data>
|
||||
<data name="ShowMessageTemp" xml:space="preserve">
|
||||
<value>已读取:{0}/{1},处理:{2},跳过:{3}</value>
|
||||
</data>
|
||||
<data name="HelpForText" xml:space="preserve">
|
||||
<value>文本编码工具</value>
|
||||
</data>
|
||||
<data name="HelpForTextArg0" xml:space="preserve">
|
||||
<value>要处理的文本(默认取取剪贴板值)</value>
|
||||
</data>
|
||||
<data name="Copied" xml:space="preserve">
|
||||
<value>{0}(已复制到剪贴板)</value>
|
||||
</data>
|
||||
<data name="FileSearchPattern" xml:space="preserve">
|
||||
<value>文件通配符</value>
|
||||
</data>
|
||||
<data name="FolderPath" xml:space="preserve">
|
||||
<value>要处理的目录路径</value>
|
||||
</data>
|
||||
<data name="ConvertEndOfLineToLF" xml:space="preserve">
|
||||
<value>转换换行符为LF</value>
|
||||
</data>
|
||||
<data name="GuidTool" xml:space="preserve">
|
||||
<value>GUID工具</value>
|
||||
</data>
|
||||
<data name="UseUppercase" xml:space="preserve">
|
||||
<value>使用大写输出</value>
|
||||
</data>
|
||||
<data name="RandomPasswordGenerator" xml:space="preserve">
|
||||
<value>随机密码生成器</value>
|
||||
</data>
|
||||
|
||||
<data name="PwdLength" xml:space="preserve">
|
||||
<value>密码长度</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>移除文件尾部换行和空格</value>
|
||||
</data>
|
||||
<data name="TrimUtf8Bom" xml:space="preserve">
|
||||
<value>移除文件的uf8 bom</value>
|
||||
</data>
|
||||
</root>
|
@ -1,10 +1,9 @@
|
||||
using System.Text.RegularExpressions;
|
||||
using NSExt.Extensions;
|
||||
using TextCopy;
|
||||
|
||||
namespace Dot.Random;
|
||||
namespace Dot.Pwd;
|
||||
|
||||
public sealed partial class Main : Tool<Option>
|
||||
public sealed class Main : Tool<Option>
|
||||
{
|
||||
private readonly char[][] _charTable = {
|
||||
"0123456789".ToCharArray() //
|
||||
@ -16,18 +15,6 @@ public sealed partial class Main : Tool<Option>
|
||||
|
||||
public Main(Option opt) : base(opt) { }
|
||||
|
||||
[GeneratedRegex("[a-z]")]
|
||||
private static partial Regex RegexLowerCaseLetter();
|
||||
|
||||
[GeneratedRegex("\\d")]
|
||||
private static partial Regex RegexNumber();
|
||||
|
||||
[GeneratedRegex("[^\\da-zA-Z]")]
|
||||
private static partial Regex RegexSpecialCharacter();
|
||||
|
||||
[GeneratedRegex("[A-Z]")]
|
||||
private static partial Regex RegexUpperCaseLetter();
|
||||
|
||||
public override void Run()
|
||||
{
|
||||
unsafe {
|
||||
@ -60,7 +47,7 @@ public sealed partial class Main : Tool<Option>
|
||||
|
||||
var result = new string(pDest, 0, Opt.Length);
|
||||
ClipboardService.SetText(result);
|
||||
Console.WriteLine($"已复制到剪贴板:{result}");
|
||||
Console.WriteLine(Strings.Copied, result);
|
||||
}
|
||||
}
|
||||
}
|
21
src/Pwd/Option.cs
Normal file
21
src/Pwd/Option.cs
Normal file
@ -0,0 +1,21 @@
|
||||
namespace Dot.Pwd;
|
||||
|
||||
[Verb("pwd", HelpText = nameof(Strings.RandomPasswordGenerator), ResourceType = typeof(Strings))]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Flags]
|
||||
public enum GenerateTypes
|
||||
{
|
||||
Number = 1
|
||||
, LowerCaseLetter = 2
|
||||
, UpperCaseLetter = 4
|
||||
, SpecialCharacter = 8
|
||||
}
|
||||
|
||||
[Value(1, Required = true, HelpText = nameof(Strings.PwdLength), ResourceType = typeof(Strings))]
|
||||
public int Length { get; set; }
|
||||
|
||||
|
||||
[Value(0, Required = true, HelpText = nameof(Strings.PwdGenerateTypes), ResourceType = typeof(Strings))]
|
||||
public GenerateTypes Type { get; set; }
|
||||
}
|
@ -1,21 +0,0 @@
|
||||
namespace Dot.Random;
|
||||
|
||||
[Verb("rand", HelpText = "随机数生成器")]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Flags]
|
||||
public enum GenerateTypes
|
||||
{
|
||||
Number = 1
|
||||
, LowerCaseLetter = 2
|
||||
, UpperCaseLetter = 4
|
||||
, SpecialCharacter = 8
|
||||
}
|
||||
|
||||
[Value(1, MetaName = "长度", Required = true, HelpText = "随机数字长度")]
|
||||
public int Length { get; set; }
|
||||
|
||||
|
||||
[Value(0, MetaName = "生成类型", Required = true, HelpText = "BitSet 1:[0-9],2:[a-z],4:[A-Z],8:[ascii.0x21-0x2F]")]
|
||||
public GenerateTypes Type { get; set; }
|
||||
}
|
@ -70,7 +70,7 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
_procedCnt += procedCnt;
|
||||
_replaceCnt += removeCnt;
|
||||
_breakCnt += breakCnt;
|
||||
_step2Bar.Message = $"已处理:{_procedCnt}/{_totalCnt},替换:{_replaceCnt},跳过:{_breakCnt}";
|
||||
_step2Bar.Message = string.Format(Strings.ShowMessageTemp, _procedCnt, _totalCnt, _replaceCnt, _breakCnt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,16 +84,17 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
[SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
|
||||
public override void Run()
|
||||
{
|
||||
if (!Directory.Exists(Opt.Path)) throw new ArgumentException(nameof(Opt.Path), $"指定的路径“{Opt.Path}”不存在");
|
||||
if (!Directory.Exists(Opt.Path))
|
||||
throw new ArgumentException(nameof(Opt.Path), string.Format(Strings.PathNotFound, Opt.Path));
|
||||
|
||||
|
||||
using var step1Bar = new IndeterminateProgressBar("查找文件...", DefaultProgressBarOptions);
|
||||
using var step1Bar = new IndeterminateProgressBar(Strings.SearchingFile, DefaultProgressBarOptions);
|
||||
|
||||
|
||||
var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
|
||||
_totalCnt = fileList.Count();
|
||||
|
||||
step1Bar.Message = "查找文件...OK";
|
||||
step1Bar.Message = Strings.SearchingFileOK;
|
||||
step1Bar.Finished();
|
||||
|
||||
_step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
|
||||
|
@ -1,11 +1,4 @@
|
||||
namespace Dot.RemoveTrailingWhiteSpace;
|
||||
|
||||
[Verb("remove-whitespace", HelpText = "移除文件尾部换行和空格")]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Option('f', "filter", Required = false, HelpText = "文件通配符", Default = "*.*")]
|
||||
public string Filter { get; set; } //normal options here
|
||||
|
||||
[Option('p', "path", Required = false, HelpText = "要处理的目录路径", Default = ".")]
|
||||
public string Path { get; set; }
|
||||
}
|
||||
[Verb("remove-whitespace", HelpText = nameof(Strings.RemoveTrailingWhiteSpaces), ResourceType = typeof(Strings))]
|
||||
public class Option : DirOption { }
|
@ -28,7 +28,7 @@ public sealed class Main : Tool<Option>
|
||||
public Main(Option opt) : base(opt)
|
||||
{
|
||||
if (Opt.Text.NullOrEmpty()) Opt.Text = ClipboardService.GetText();
|
||||
if (Opt.Text.NullOrEmpty()) throw new ArgumentException("输入文本为空");
|
||||
if (Opt.Text.NullOrEmpty()) throw new ArgumentException(Strings.InputTextIsEmpty);
|
||||
}
|
||||
|
||||
private static Output BuildOutput(string text, Encoding enc)
|
||||
|
@ -1,8 +1,8 @@
|
||||
namespace Dot.Text;
|
||||
|
||||
[Verb("text", HelpText = "文本编码工具")]
|
||||
[Verb("text", HelpText = nameof(Strings.HelpForText), ResourceType = typeof(Strings))]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Value(0, MetaName = "文本", HelpText = "要处理的文本,不指定此参数:取剪贴板值")]
|
||||
[Value(0, HelpText = nameof(Strings.HelpForTextArg0), ResourceType = typeof(Strings))]
|
||||
public string Text { get; set; }
|
||||
}
|
@ -12,7 +12,7 @@ public abstract class Tool<TOption> : ITool
|
||||
, BackgroundCharacter = '\u2593'
|
||||
};
|
||||
|
||||
protected virtual TOption Opt { get; set; }
|
||||
protected TOption Opt { get; set; }
|
||||
|
||||
protected Tool(TOption opt)
|
||||
{
|
||||
|
@ -10,7 +10,7 @@ public static class ToolsFactory
|
||||
Option o => new Main(o)
|
||||
, Convert2Lf.Option o => new Convert2Lf.Main(o)
|
||||
, RemoveTrailingWhiteSpace.Option o => new RemoveTrailingWhiteSpace.Main(o)
|
||||
, Random.Option o => new Random.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))
|
||||
|
@ -33,7 +33,7 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
_procedCnt += procedCnt;
|
||||
_trimCnt += replaceCnt;
|
||||
_breakCnt += breakCnt;
|
||||
_step2Bar.Message = $"已处理:{_procedCnt}/{_totalCnt},移除BOM:{_trimCnt},跳过:{_breakCnt}";
|
||||
_step2Bar.Message = string.Format(Strings.ShowMessageTemp, _procedCnt, _totalCnt, _trimCnt, _breakCnt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,17 +46,18 @@ public sealed class Main : Tool<Option>, IDisposable
|
||||
[SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
|
||||
public override void Run()
|
||||
{
|
||||
if (!Directory.Exists(Opt.Path)) throw new ArgumentException(nameof(Opt.Path), $"指定的路径“{Opt.Path}”不存在");
|
||||
if (!Directory.Exists(Opt.Path))
|
||||
throw new ArgumentException(nameof(Opt.Path), string.Format(Strings.PathNotFound, Opt.Path));
|
||||
|
||||
|
||||
var utf8Bom = new byte[] { 0xef, 0xbb, 0xbf };
|
||||
using var step1Bar = new IndeterminateProgressBar("查找文件...", DefaultProgressBarOptions);
|
||||
using var step1Bar = new IndeterminateProgressBar(Strings.SearchingFile, DefaultProgressBarOptions);
|
||||
|
||||
|
||||
var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
|
||||
_totalCnt = fileList.Count();
|
||||
|
||||
step1Bar.Message = "查找文件...OK";
|
||||
step1Bar.Message = Strings.SearchingFileOK;
|
||||
step1Bar.Finished();
|
||||
|
||||
_step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
|
||||
|
@ -1,11 +1,4 @@
|
||||
namespace Dot.TrimUtf8Bom;
|
||||
|
||||
[Verb("trim-utf8-bom", HelpText = "移除文件的uf8 bom")]
|
||||
public class Option : IOption
|
||||
{
|
||||
[Option('f', "filter", Required = false, HelpText = "文件通配符", Default = "*.*")]
|
||||
public string Filter { get; set; } //normal options here
|
||||
|
||||
[Option('p', "path", Required = false, HelpText = "要处理的目录路径", Default = ".")]
|
||||
public string Path { get; set; }
|
||||
}
|
||||
[Verb("trim-utf8-bom", HelpText = nameof(Strings.TrimUtf8Bom), ResourceType = typeof(Strings))]
|
||||
public class Option : DirOption { }
|
@ -11,7 +11,7 @@
|
||||
<Copyright>Copyright (c) 2022 nsnail</Copyright>
|
||||
<RepositoryUrl>https://github.com/nsnail/dot.git</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<AssemblyTitle>功能全面的实用工具-程序员的瑞士军刀</AssemblyTitle>
|
||||
<AssemblyTitle>功能全面的实用工具 - 程序员的瑞士军刀</AssemblyTitle>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
@ -29,4 +29,19 @@
|
||||
<PackageReference Include="TextCopy" Version="6.2.0"/>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="Lang\Strings.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Lang\Strings.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Strings.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
Loading…
x
Reference in New Issue
Block a user