添加更多失败理由

Author: lindexi

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

@@ -31,12 +31,7 @@ public static ImageFileOptimizationResult ConvertWmfOrEmfToPngFile(ImageFileOpti
             {
                 context.LogMessage($"Convert wmf or emf in linux Fail. Exception: {e}");
 
-                return new ImageFileOptimizationResult()
-                {
-                    OptimizedImageFile = null,
-                    Exception = e,
-                    FailureReason = ImageFileOptimizationFailureReason.NotSupported
-                };
+                return ImageFileOptimizationResult.FailException(e);
             }
         }
 
@@ -116,12 +111,7 @@ ImageFileOptimizationResult ConvertSvgToPngFile(FileInfo svgImageFile)
             {
                 context.LogMessage($"Convert svg to png file failed. File: '{svgImageFile.FullName}' Exception: {e}");
 
-                return new ImageFileOptimizationResult()
-                {
-                    OptimizedImageFile = null,
-                    Exception = e,
-                    FailureReason = ImageFileOptimizationFailureReason.NotSupported
-                };
+                return ImageFileOptimizationResult.FailException(e);
             }
         }
     }
@@ -156,6 +146,7 @@ private static ImageFileOptimizationResult ConvertWithInkscapeLibWmf(ImageFileOp
         if (process?.ExitCode == 0 && File.Exists(svgFile))
         {
             // 转换成功，再次执行 SVG 转 PNG 的转换
+            // 由于可能存在 SVG 文件中包含无效字符的问题，因此需要修复一下
             var convertedFile = ImageFileOptimization.FixSvgInvalidCharacter(context with
             {
                 ImageFile = new FileInfo(svgFile)
@@ -214,12 +205,7 @@ private static ImageFileOptimizationResult ConvertWithInkscape(ImageFileOptimiza
         {
             // 失败了，继续调用 libwmf 进行转换
             context.LogMessage($"Convert emf or wmf to svg by Inkscape failed. We will continue use libwmf to convert the image. File='{file}' Exception: {e}");
-            return new ImageFileOptimizationResult()
-            {
-                OptimizedImageFile = null,
-                Exception = e,
-                FailureReason = ImageFileOptimizationFailureReason.NotSupported,
-            };
+            return ImageFileOptimizationResult.FailException(e);
         }
 
         return new ImageFileOptimizationResult()

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

@@ -1,21 +1,19 @@
-using SixLabors.ImageSharp;
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.Metadata.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
 using SkiaSharp;
 
 using Svg.Skia;
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-
 namespace DotNetCampus.MediaConverters.Imaging.Optimizations;
 
 public static class ImageFileOptimization
@@ -91,12 +89,7 @@ public static async Task<ImageFileOptimizationResult> OptimizeImageFileAsync(Ima
             {
                 context.LogMessage($"Convert SVG to PNG failed: {e}");
 
-                return new ImageFileOptimizationResult()
-                {
-                    OptimizedImageFile = null,
-                    Exception = e,
-                    FailureReason = ImageFileOptimizationFailureReason.NotSupported
-                };
+                return ImageFileOptimizationResult.FailException(e);
             }
         }
         else if (IsExtension(".wmf") ||

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

@@ -6,7 +6,7 @@ namespace DotNetCampus.MediaConverters.Imaging.Optimizations;
 /// <summary>
 /// 图片优化的上下文信息
 /// </summary>
-/// <param name="ImageFile"></param>
+/// <param name="ImageFile">图片文件</param>
 /// <param name="WorkingFolder"></param>
 /// <param name="MaxImageWidth">限制图片的最大宽度。为空则表示不限制</param>
 /// <param name="MaxImageHeight">限制图片的最大高度。为空则表示不限制</param>

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

@@ -27,6 +27,11 @@ public enum ImageFileOptimizationFailureReason
     /// </summary>
     NotSupported,
 
+    /// <summary>
+    /// 异常
+    /// </summary>
+    Exception,
+
     /// <summary>
     /// GDI 发生异常
     /// </summary>

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

@@ -29,4 +29,14 @@ public void Dispose()
     {
         Image?.Dispose();
     }
+
+    public static ImageFileOptimizationResult FailException(Exception e)
+    {
+        return new ImageFileOptimizationResult()
+        {
+            OptimizedImageFile = null,
+            Exception = e,
+            FailureReason = ImageFileOptimizationFailureReason.Exception
+        };
+    }
 }