使用带 Verb 的方式做命令行

Author: lindexi

src/MediaConverters/MediaConverters.Tests/Tool/MediaConverterTests.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-
+using DotNetCampus.MediaConverters.CommandLineHandlers;
 using DotNetCampus.MediaConverters.Contexts;
 using DotNetCampus.MediaConverters.Imaging.Effects;
 using DotNetCampus.MediaConverters.Imaging.Effects.Colors;
@@ -253,9 +253,9 @@ public async Task ReplaceColorTask3()
         TestHelper.OpenFileInExplorer(new FileInfo(options.OutputFile));
     }
 
-    private void AssertReplaceColor(Options options)
+    private void AssertReplaceColor(ConvertHandler convertHandler)
     {
-        var inputFile = options.InputFile;
+        var inputFile = convertHandler.InputFile;
         using var image = Image.Load<Rgba32>(inputFile);
 
         var list = image.GetColorCountList();
@@ -270,14 +270,14 @@ private void AssertReplaceColor(Options options)
 
         image.ReplaceColor(replaceList);
 
-        var tempFile = Path.Join(options.WorkingFolder, $"Assert_{Path.GetRandomFileName()}.png");
+        var tempFile = Path.Join(convertHandler.WorkingFolder, $"Assert_{Path.GetRandomFileName()}.png");
         image.SaveAsPng(tempFile, new PngEncoder()
         {
             ColorType = PngColorType.RgbWithAlpha
         });
 
         var visionComparer = new VisionComparer();
-        var visionCompareResult = visionComparer.Compare(new FileInfo(tempFile), new FileInfo(options.OutputFile));
+        var visionCompareResult = visionComparer.Compare(new FileInfo(tempFile), new FileInfo(convertHandler.OutputFile));
         Assert.IsTrue(visionCompareResult.IsSimilar());
     }
 
@@ -336,7 +336,7 @@ public async Task OptimizeImageFile5()
         TestHelper.OpenFileInExplorer(new FileInfo(options.OutputFile));
     }
 
-    private Options ToOptions(string fileName, ImageConvertContext imageConvertContext)
+    private ConvertHandler ToOptions(string fileName, ImageConvertContext imageConvertContext)
     {
         var testFolder = Path.Join(TestHelper.WorkingDirectory.FullName, Path.GetRandomFileName());
         Directory.CreateDirectory(testFolder);
@@ -353,7 +353,7 @@ private Options ToOptions(string fileName, ImageConvertContext imageConvertConte
             });
         File.WriteAllText(configFile, jsonText);
 
-        return new Options()
+        return new ConvertHandler()
         {
             WorkingFolder = workingFolder,
             InputFile = inputFile.FullName,
@@ -380,7 +380,7 @@ public async Task CustomTest()
         var workingFolder = Path.Join(testFolder, "Working");
         var outputFile = Path.Join(testFolder, "Output.png");
 
-        var options = new Options()
+        var options = new ConvertHandler()
         {
             WorkingFolder = workingFolder,
             InputFile = imageFile,

…MediaConverters.Tool/Contexts/Options.cs …ol/CommandLineHandlers/ConvertHandler.cssrc/MediaConverters/MediaConverters.Tool/Contexts/Options.cs renamed to src/MediaConverters/MediaConverters.Tool/CommandLineHandlers/ConvertHandler.cs src/MediaConverters/MediaConverters.Tool/Contexts/Options.cs renamed to src/MediaConverters/MediaConverters.Tool/CommandLineHandlers/ConvertHandler.cs

@@ -1,8 +1,11 @@
-using DotNetCampus.Cli.Compiler;
+using System.Threading.Tasks;
+using DotNetCampus.Cli;
+using DotNetCampus.Cli.Compiler;
 
-namespace DotNetCampus.MediaConverters.Contexts;
+namespace DotNetCampus.MediaConverters.CommandLineHandlers;
 
-public class Options
+[Verb("convert")]
+public class ConvertHandler : ICommandHandler
 {
     [Option]
     public required string WorkingFolder { get; init; }
@@ -18,4 +21,8 @@ public class Options
 
     public bool? ShouldLogToConsole { get; init; }
     public bool? ShouldLogToFile { get; init; }
+    public async Task<int> RunAsync()
+    {
+        return await Program.RunAsync(this);
+    }
 }

src/MediaConverters/MediaConverters.Tool/Program.cs

@@ -11,6 +11,8 @@
 using System.IO;
 using System.Text.Json;
 using System.Threading.Tasks;
+using DotNetCampus.Cli;
+using DotNetCampus.MediaConverters.CommandLineHandlers;
 using SixLabors.ImageSharp.Formats.Png;
 using ErrorCode = DotNetCampus.MediaConverters.Contexts.MediaConverterErrorCode;
 
@@ -42,7 +44,7 @@ static async Task<int> Main(string[] args)
             await File.WriteAllTextAsync(configurationFile, jsonText);
             var outputFile = Path.Join(testFolder.FullName, "1.png");
 
-            return await RunAsync(new Options()
+            return await RunAsync(new ConvertHandler()
             {
                 InputFile = inputFile,
                 ConvertConfigurationFile = configurationFile,
@@ -54,16 +56,17 @@ static async Task<int> Main(string[] args)
             });
         }
 
-        var options = DotNetCampus.Cli.CommandLine.Parse(args).As<Options>();
-
-        return await RunAsync(options);
+        return await DotNetCampus.Cli.CommandLine.Parse(args)
+                .AddHandler<ConvertHandler>()
+                .RunAsync()
+            ;
     }
 
-    internal static async Task<ErrorCode> RunAsync(Options options)
+    internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
     {
         var stopwatch = Stopwatch.StartNew();
 
-        var jsonText = await File.ReadAllTextAsync(options.ConvertConfigurationFile);
+        var jsonText = await File.ReadAllTextAsync(convertHandler.ConvertConfigurationFile);
 
         var imageConvertContext = ImageConvertContext.FromJsonText(jsonText);
 
@@ -73,18 +76,18 @@ internal static async Task<ErrorCode> RunAsync(Options options)
             return ErrorCode.UnknownError;
         }
 
-        var inputFile = new FileInfo(options.InputFile);
+        var inputFile = new FileInfo(convertHandler.InputFile);
 
-        var workingFolder = Directory.CreateDirectory(options.WorkingFolder);
+        var workingFolder = Directory.CreateDirectory(convertHandler.WorkingFolder);
 
         var useAreaSizeLimit = imageConvertContext.UseAreaSizeLimit ?? true;
         var copyNewFile = imageConvertContext.ShouldCopyNewFile ?? true;
 
         var context = new ImageFileOptimizationContext(inputFile, workingFolder, imageConvertContext.MaxImageWidth,
             imageConvertContext.MaxImageHeight)
         {
-            ShouldLogToConsole = options.ShouldLogToConsole ?? false,
-            ShouldLogToFile = options.ShouldLogToFile ?? false,
+            ShouldLogToConsole = convertHandler.ShouldLogToConsole ?? false,
+            ShouldLogToFile = convertHandler.ShouldLogToFile ?? false,
         };
         using var imageFileOptimizationResult = await ImageFileOptimization.OptimizeImageFileAsync(context, useAreaSizeLimit, copyNewFile);
 
@@ -134,19 +137,19 @@ internal static async Task<ErrorCode> RunAsync(Options options)
                 workerProvider.Run(image, imageConvertTask);
             }
 
-            await image.SaveAsPngAsync(options.OutputFile, new PngEncoder()
+            await image.SaveAsPngAsync(convertHandler.OutputFile, new PngEncoder()
             {
                 ColorType = PngColorType.RgbWithAlpha,
                 BitDepth = PngBitDepth.Bit8,
             });
         }
         else
         {
-            optimizedImageFile.CopyTo(options.OutputFile, overwrite: true);
+            optimizedImageFile.CopyTo(convertHandler.OutputFile, overwrite: true);
         }
 
         stopwatch.Stop();
-        context.LogMessage($"Success converted image. Cost {stopwatch.ElapsedMilliseconds}ms. OutputFile:'{options.OutputFile}'");
+        context.LogMessage($"Success converted image. Cost {stopwatch.ElapsedMilliseconds}ms. OutputFile:'{convertHandler.OutputFile}'");
 
         return ErrorCode.Success;
     }