This commit is contained in:
2022-12-02 17:58:45 +08:00
parent 507b0aec5b
commit c09644c9c1
24 changed files with 384 additions and 443 deletions

View File

@ -27,13 +27,13 @@ public sealed class Main : Tool<Option>, IDisposable
_disposed = true;
}
private void FileHandle(string file)
private async ValueTask FileHandle(string file, CancellationToken _)
{
_step2Bar.Tick();
ShowMessage(1, 0, 0);
var spacesCnt = 0;
using var fsrw = OpenFileStream(file, FileMode.Open, FileAccess.ReadWrite);
await using var fsrw = OpenFileStream(file, FileMode.Open, FileAccess.ReadWrite);
if (Opt.ReadOnly) { //测试,只读模式
ShowMessage(0, 1, 0);
@ -77,7 +77,7 @@ public sealed class Main : Tool<Option>, IDisposable
_procedCnt += procedCnt;
_replaceCnt += removeCnt;
_breakCnt += breakCnt;
_step2Bar.Message = string.Format(Strings.ShowMessageTemp, _procedCnt, _totalCnt, _replaceCnt, _breakCnt);
_step2Bar.Message = string.Format(Str.ShowMessageTemp, _procedCnt, _totalCnt, _replaceCnt, _breakCnt);
}
}
@ -89,25 +89,25 @@ public sealed class Main : Tool<Option>, IDisposable
/// <inheritdoc />
[SuppressMessage("ReSharper", "PossibleMultipleEnumeration")]
public override void Run()
public override async Task Run()
{
if (!Directory.Exists(Opt.Path))
throw new ArgumentException(nameof(Opt.Path), string.Format(Strings.PathNotFound, Opt.Path));
throw new ArgumentException(nameof(Opt.Path), string.Format(Str.PathNotFound, Opt.Path));
using var step1Bar = new IndeterminateProgressBar(Strings.SearchingFile, DefaultProgressBarOptions);
using var step1Bar = new IndeterminateProgressBar(Str.SearchingFile, DefaultProgressBarOptions);
var fileList = EnumerateFiles(Opt.Path, Opt.Filter);
_totalCnt = fileList.Count();
step1Bar.Message = string.Format(Strings.SearchingFileOK, _totalCnt);
step1Bar.Message = string.Format(Str.SearchingFileOK, _totalCnt);
step1Bar.Finished();
if (_totalCnt == 0) return;
_step2Bar = step1Bar.Spawn(_totalCnt, string.Empty, DefaultProgressBarOptions);
Parallel.ForEach(fileList, FileHandle);
await Parallel.ForEachAsync(fileList, FileHandle);
}
}

View File

@ -1,4 +1,4 @@
namespace Dot.RmBlank;
[Verb("rm-blank", HelpText = nameof(Strings.RemoveTrailingWhiteSpaces), ResourceType = typeof(Strings))]
[Verb("rm-blank", HelpText = nameof(Str.RemoveTrailingWhiteSpaces), ResourceType = typeof(Str))]
public class Option : DirOption { }