完成对接实现逻辑

Author: lindexi

src/MediaConverters/MediaConverters.Tests/Tool/MediaConverterIpcTests.cs

@@ -0,0 +1,114 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using dotnetCampus.Ipc.IpcRouteds.DirectRouteds;
+using DotNetCampus.MediaConverters.CommandLineHandlers;
+using DotNetCampus.MediaConverters.Contexts;
+using DotNetCampus.MediaConverters.Contexts.IpcContexts;
+
+namespace DotNetCampus.MediaConverters.Tests.Tool;
+
+[TestClass]
+public class MediaConverterIpcTests
+{
+    [TestMethod]
+    public async Task TestBatchImage()
+    {
+        var testFolder = Path.Join(TestHelper.WorkingDirectory.FullName, Path.GetRandomFileName());
+        Directory.CreateDirectory(testFolder);
+
+        var ipcHandler = new IpcHandler()
+        {
+            IpcName = Guid.NewGuid().ToString(),
+            WorkingFolder = testFolder,
+            ShouldLogToConsole = true,
+            ShouldLogToFile = true,
+        };
+
+        var task = Task.Run(async () =>
+        {
+            var provider = new JsonIpcDirectRoutedProvider();
+            var clientProxy = await provider.GetAndConnectClientAsync(ipcHandler.IpcName);
+
+            var response = await clientProxy.GetResponseAsync<IpcConvertImageResponse>(IpcPaths.RequestConvertImage, new IpcConvertImageRequest()
+            {
+                TraceId = "TraceId-1",
+                InputFile = TestFileProvider.GetTestFile(TestFileProvider.DefaultTestImageName).FullName,
+                OutputFile = Path.Join(testFolder, "Output1.png"),
+                ConvertConfigurationFile = ToConfigurationFile(new ImageConvertContext()
+                {
+                    ImageConvertTaskList =
+                    [
+                        new SetSoftEdgeEffectTask()
+                        {
+                            Radius = 20
+                        }
+                    ]
+                },testFolder)
+            });
+
+            Assert.IsNotNull(response);
+            Assert.AreEqual(MediaConverterErrorCode.Success.Code, response.Code);
+
+            response = await clientProxy.GetResponseAsync<IpcConvertImageResponse>(IpcPaths.RequestConvertImage, new IpcConvertImageRequest()
+            {
+                TraceId = "TraceId-2",
+                InputFile = TestFileProvider.GetTestFile(TestFileProvider.DefaultTestImageName).FullName,
+                OutputFile = Path.Join(testFolder, "Output2.png"),
+                ConvertConfigurationFile = ToConfigurationFile(new ImageConvertContext()
+                {
+                    ImageConvertTaskList =
+                    [
+                        new SetLuminanceEffectTask()
+                    ],
+                    ShouldCopyNewFile = false,
+                }, testFolder)
+            });
+
+            Assert.IsNotNull(response);
+            Assert.AreEqual(MediaConverterErrorCode.Success.Code, response.Code);
+
+            response = await clientProxy.GetResponseAsync<IpcConvertImageResponse>(IpcPaths.RequestConvertImage, new IpcConvertImageRequest()
+            {
+                TraceId = "TraceId-3",
+                InputFile = TestFileProvider.GetTestFile(TestFileProvider.DefaultTestImageName).FullName,
+                OutputFile = Path.Join(testFolder, "Output3.png"),
+                ConvertConfigurationFile = ToConfigurationFile(new ImageConvertContext()
+                {
+                    ImageConvertTaskList =
+                    [
+                        new SetContrastTask()
+                        {
+                            Percentage = 0.7f
+                        }
+                    ]
+                }, testFolder)
+            });
+
+            Assert.IsNotNull(response);
+            Assert.AreEqual(MediaConverterErrorCode.Success.Code, response.Code);
+
+            var ipcExitResponse = await clientProxy.GetResponseAsync<IpcExitResponse>(IpcPaths.Exit, new IpcExitRequest()
+            {
+                Reason = "正常退出"
+            });
+            Assert.IsNotNull(ipcExitResponse);
+            Assert.AreEqual(MediaConverterErrorCode.Success.Code, response.Code);
+        });
+
+        await ipcHandler.RunAsync();
+
+        await task;
+    }
+
+    private static string ToConfigurationFile(ImageConvertContext imageConvertContext,string testFolder)
+    {
+        var jsonText = JsonSerializer.Serialize(imageConvertContext,
+            new JsonSerializerOptions(MediaConverterJsonSerializerSourceGenerationContext.Default.Options)
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+            });
+        var configFile = Path.Join(testFolder, "Config.json");
+        File.WriteAllText(configFile, jsonText);
+        return configFile;
+    }
+}

src/MediaConverters/MediaConverters.Tool/Program.cs

@@ -64,7 +64,8 @@ static async Task<int> Main(string[] args)
 
     internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
     {
-        var stopwatch = Stopwatch.StartNew();
+        var stepStopwatch = Stopwatch.StartNew();
+        var totalStopwatch = Stopwatch.StartNew();
 
         var jsonText = await File.ReadAllTextAsync(convertHandler.ConvertConfigurationFile);
 
@@ -89,8 +90,15 @@ internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
             ShouldLogToConsole = convertHandler.ShouldLogToConsole ?? false,
             ShouldLogToFile = convertHandler.ShouldLogToFile ?? false,
         };
+
+        context.LogMessage($"[Performance] FromJsonText cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
+        stepStopwatch.Restart();
+
         using var imageFileOptimizationResult = await ImageFileOptimization.OptimizeImageFileAsync(context, useAreaSizeLimit, copyNewFile);
 
+        context.LogMessage($"[Performance] OptimizeImageFileAsync cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
+        stepStopwatch.Restart();
+
         if (!imageFileOptimizationResult.IsSuccess)
         {
             var errorMessage = $"Failed to convert image file '{inputFile.FullName}'. Reason: {imageFileOptimizationResult.FailureReason}";
@@ -137,19 +145,26 @@ internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
                 workerProvider.Run(image, imageConvertTask);
             }
 
+            context.LogMessage($"[Performance] RunWorkerProvider cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
+            stepStopwatch.Restart();
+
             await image.SaveAsPngAsync(convertHandler.OutputFile, new PngEncoder()
             {
                 ColorType = PngColorType.RgbWithAlpha,
                 BitDepth = PngBitDepth.Bit8,
             });
+
+            context.LogMessage($"[Performance] SaveAsPngAsync cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
         }
         else
         {
             optimizedImageFile.CopyTo(convertHandler.OutputFile, overwrite: true);
+
+            context.LogMessage($"[Performance] CopyTo cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
         }
 
-        stopwatch.Stop();
-        context.LogMessage($"Success converted image. Cost {stopwatch.ElapsedMilliseconds}ms. OutputFile:'{convertHandler.OutputFile}'");
+        totalStopwatch.Stop();
+        context.LogMessage($"Success converted image. Cost {totalStopwatch.ElapsedMilliseconds}ms. OutputFile:'{convertHandler.OutputFile}'");
 
         return ErrorCode.Success;
     }