分开保存逻辑

Author: lindexi

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimization.cs

@@ -125,14 +125,17 @@ public static async Task<ImageFileOptimizationResult> OptimizeImageFileAsync(Ima
 
             OptimizeImage(image, maxImageWidth, maxImageHeight, useAreaSizeLimit);
 
-            // 重新保存即可
             var outputImageFilePath = Path.Join(workingFolder.FullName, $"{Path.GetRandomFileName()}.png");
-            await image.SaveAsPngAsync(outputImageFilePath, new PngEncoder()
+            if (context.ShouldSaveToPngFile)
             {
-                ColorType = PngColorType.RgbWithAlpha,
-                BitDepth = PngBitDepth.Bit8,
-                CompressionLevel = ((PngCompressionLevel?) context.PngCompressionLevel) ?? PngCompressionLevel.DefaultCompression
-            });
+                // 重新保存即可，保存就等于解决了各种格式问题，输出为标准的格式
+                await image.SaveAsPngAsync(outputImageFilePath, new PngEncoder()
+                {
+                    ColorType = PngColorType.RgbWithAlpha,
+                    BitDepth = PngBitDepth.Bit8,
+                    CompressionLevel = ((PngCompressionLevel?) context.PngCompressionLevel) ?? PngCompressionLevel.DefaultCompression
+                });
+            }
 
             return new ImageFileOptimizationResult()
             {

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimizationContext.cs

@@ -19,6 +19,11 @@ public readonly record struct ImageFileOptimizationContext(FileInfo ImageFile,
 
     public bool ShouldLogToFile { get; init; } = false;
 
+    /// <summary>
+    /// 是否应该保存为 PNG 文件。为 false 则只存放到内存，不存放到文件
+    /// </summary>
+    public bool ShouldSaveToPngFile { get; init; } = true;
+
     public string? LogFileName { get; init; }
     public int? PngCompressionLevel { get; init; }
 

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimizationResult.cs

@@ -20,8 +20,7 @@ public readonly record struct ImageFileOptimizationResult() : IDisposable
     public Exception? Exception { get; init; }
     public ImageFileOptimizationFailureReason FailureReason { get; init; } = ImageFileOptimizationFailureReason.Ok;
 
-    [MemberNotNullWhen(true, nameof(OptimizedImageFile))]
-    public bool IsSuccess => OptimizedImageFile is not null;
+    public bool IsSuccess => OptimizedImageFile is not null || Image is not null;
 
     public Image<Rgba32>? Image { get; init; }
 

src/MediaConverters/MediaConverters.Tool/Program.cs

@@ -87,9 +87,14 @@ internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
         var context = new ImageFileOptimizationContext(inputFile, workingFolder, imageConvertContext.MaxImageWidth,
             imageConvertContext.MaxImageHeight)
         {
-            PngCompressionLevel = imageConvertContext.PngCompressionLevel,
+            // 由于不准备在此步骤保存为文件，所以不需要设置保存等级
+            //PngCompressionLevel = imageConvertContext.PngCompressionLevel,
+
             ShouldLogToConsole = convertHandler.ShouldLogToConsole ?? false,
             ShouldLogToFile = convertHandler.ShouldLogToFile ?? false,
+
+            // 不要在优化图片步骤时保存为文件，因为后续可能还会进行转换任务。统一一个逻辑执行保存即可
+            ShouldSaveToPngFile = false,
         };
 
         context.LogMessage($"[Performance] FromJsonText cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
@@ -133,8 +138,7 @@ internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
 
             return ErrorCode.UnknownError;
         }
-
-        FileInfo optimizedImageFile = imageFileOptimizationResult.OptimizedImageFile;
+        
         var image = imageFileOptimizationResult.Image;
 
         if (image is not null && imageConvertContext.ImageConvertTaskList is { } list)
@@ -148,27 +152,25 @@ internal static async Task<ErrorCode> RunAsync(ConvertHandler convertHandler)
 
             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,
-                // 压缩等级 1-9，数值越大压缩率越高但速度越慢，默认值为 6。在 1-9 范围外的值会被视为默认值
-                CompressionLevel = imageConvertContext.PngCompressionLevel is >= 1 and <= 9
-                    ? (PngCompressionLevel)imageConvertContext.PngCompressionLevel
-                    // 范围外，使用默认值
-                    : PngCompressionLevel.DefaultCompression
-            });
-
-            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");
+            // 没有任何转换任务，啥都不干
         }
 
+        await image.SaveAsPngAsync(convertHandler.OutputFile, new PngEncoder()
+        {
+            ColorType = PngColorType.RgbWithAlpha,
+            BitDepth = PngBitDepth.Bit8,
+            // 压缩等级 1-9，数值越大压缩率越高但速度越慢，默认值为 6。在 1-9 范围外的值会被视为默认值
+            CompressionLevel = imageConvertContext.PngCompressionLevel is >= 1 and <= 9
+                ? (PngCompressionLevel) imageConvertContext.PngCompressionLevel
+                // 范围外，使用默认值
+                : PngCompressionLevel.DefaultCompression
+        });
+
+        context.LogMessage($"[Performance] SaveAsPngAsync cost {stepStopwatch.ElapsedMilliseconds}ms Total {totalStopwatch.ElapsedMilliseconds}ms");
+
         totalStopwatch.Stop();
         context.LogMessage($"Success converted image. Cost {totalStopwatch.ElapsedMilliseconds}ms. OutputFile:'{convertHandler.OutputFile}'");