拆分出一个还不用使用 skia 的版本

lindexi · lindexi · commit 7606420234c6 · 2025-09-02T14:21:52.000+08:00
依然有 21MB 大小
diff --git a/src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimization.cs b/src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimization.cs
@@ -10,10 +10,6 @@
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-using SkiaSharp;
-
-using Svg.Skia;
-
 namespace DotNetCampus.MediaConverters.Imaging.Optimizations;
 
 public static class ImageFileOptimization
@@ -64,50 +60,12 @@ public static async Task<ImageFileOptimizationResult> OptimizeImageFileAsync(Ima
 
         if (IsExtension(".svg"))
         {
-            // 如果是 svg 那就直接转换了，因为后续叠加特效等逻辑都不能支持 SVG 格式
-            try
-            {
-                var outputFilePath = ConvertSvgToPngFile(context);
-                if (outputFilePath is null)
-                {
-                    return new ImageFileOptimizationResult()
-                    {
-                        OptimizedImageFile = null,
-                        FailureReason = ImageFileOptimizationFailureReason.NotSupported
-                    };
-                }
-                else
-                {
-                    context.LogMessage($"Success ConvertSvgToPngFile. Update current image file to '{outputFilePath.FullName}'");
-                    context = context with
-                    {
-                        ImageFile = outputFilePath
-                    };
-                }
-            }
-            catch (Exception e)
-            {
-                context.LogMessage($"Convert SVG to PNG failed: {e}");
-
-                return ImageFileOptimizationResult.FailException(e);
-            }
+            return ImageFileOptimizationResult.NotSupported();
         }
         else if (IsExtension(".wmf") ||
                  IsExtension(".emf"))
         {
-            var result = EnhancedGraphicsMetafileOptimization.ConvertWmfOrEmfToPngFile(context);
-            if (result.OptimizedImageFile is not null)
-            {
-                context.LogMessage($"Success ConvertWmfOrEmfToPngFile. Update current image file to '{result.OptimizedImageFile}'");
-                context = context with
-                {
-                    ImageFile = result.OptimizedImageFile
-                };
-            }
-            else
-            {
-                return result;
-            }
+            return ImageFileOptimizationResult.NotSupported();
         }
 
         context.LogMessage($"Start optimize image with ImageSharp. ImageFile: '{context.ImageFile.FullName}'");
@@ -303,96 +261,4 @@ public static void LimitImageSize(Image<Rgba32> image, int? maxImageWidth, int?
     /// 图片压缩的最大高度
     /// </summary>
     private const int MaxHeight = 2160;
-
-    /// <summary>
-    /// 转换 svg 文件为 png 文件
-    /// </summary>
-    /// <returns></returns>
-    public static FileInfo? ConvertSvgToPngFile(ImageFileOptimizationContext context)
-    {
-        var imageFile = context.ImageFile;
-        var workingFolder = context.WorkingFolder;
-
-        using var skSvg = new SKSvg();
-        using var skPicture = skSvg.Load(imageFile.FullName);
-        var outputFile = Path.Join(workingFolder.FullName,
-            $"SVG_{Path.GetRandomFileName()}.png");
-        var canSave = skSvg.Save(outputFile, SKColors.Transparent);
-        if (canSave && File.Exists(outputFile))
-        {
-            return new FileInfo(outputFile);
-        }
-
-        // 转换失败
-        return null;
-    }
-
-    public static async Task<FileInfo> FixSvgInvalidCharacterAsync(FileInfo svgFile,
-        DirectoryInfo workingFolder)
-    {
-        using var fileStream = svgFile.OpenRead();
-        using var streamReader = new StreamReader(fileStream);
-
-        var xDocument = await XDocument.LoadAsync(streamReader, LoadOptions.SetLineInfo, CancellationToken.None);
-        bool anyUpdate = false;
-
-        foreach (var xElement in xDocument.Descendants("text"))
-        {
-            var value = xElement.Value;
-            if (!string.IsNullOrEmpty(value) && value.Length > 0 && value[0] is var c && c == 0xFFFD)
-            {
-                // 0xFFFFD 是 utf8 特殊字符
-                // 画出来就是�符号，不如删掉
-                xElement.Value = string.Empty;
-
-                anyUpdate = true;
-            }
-        }
-
-        if (anyUpdate)
-        {
-            var convertedFile = Path.Join(workingFolder.FullName, $"FixSVG_{Path.GetRandomFileName()}.svg");
-            using var stream = File.Create(convertedFile);
-            await xDocument.SaveAsync(stream, SaveOptions.None, CancellationToken.None);
-            return new FileInfo(convertedFile);
-        }
-
-        // 啥都不用改，返回原图
-        return svgFile;
-    }
-
-    public static FileInfo FixSvgInvalidCharacter(ImageFileOptimizationContext context)
-    {
-        FileInfo svgFile = context.ImageFile;
-        DirectoryInfo workingFolder = context.WorkingFolder;
-
-        using var fileStream = svgFile.OpenRead();
-        using var streamReader = new StreamReader(fileStream);
-
-        var xDocument = XDocument.Load(streamReader, LoadOptions.SetLineInfo);
-        bool anyUpdate = false;
-
-        foreach (var xElement in xDocument.Descendants("text"))
-        {
-            var value = xElement.Value;
-            if (!string.IsNullOrEmpty(value) && value.Length > 0 && value[0] is var c && c == 0xFFFD)
-            {
-                // 0xFFFFD 是 utf8 特殊字符
-                // 画出来就是�符号，不如删掉
-                xElement.Value = string.Empty;
-
-                anyUpdate = true;
-            }
-        }
-
-        if (anyUpdate)
-        {
-            var convertedFile = Path.Join(workingFolder.FullName, $"FixSVG_{Path.GetRandomFileName()}.svg");
-            xDocument.Save(convertedFile);
-            return new FileInfo(convertedFile);
-        }
-
-        // 啥都不用改，返回原图
-        return svgFile;
-    }
 }
diff --git a/src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimizationResult.cs b/src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/ImageFileOptimizationResult.cs
@@ -39,4 +39,13 @@ public static ImageFileOptimizationResult FailException(Exception e)
             FailureReason = ImageFileOptimizationFailureReason.Exception
         };
     }
+
+    public static ImageFileOptimizationResult NotSupported()
+    {
+        return new ImageFileOptimizationResult()
+        {
+            OptimizedImageFile = null,
+            FailureReason = ImageFileOptimizationFailureReason.NotSupported
+        };
+    }
 }
diff --git a/src/MediaConverters/MediaConverters.Lib/MediaConverters.Lib.csproj b/src/MediaConverters/MediaConverters.Lib/MediaConverters.Lib.csproj
@@ -11,14 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
-    <PackageReference Include="SkiaSharp" Version="3.119.0" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.0" />
-    <PackageReference Include="Svg.Skia" Version="3.0.4" />
-    <PackageReference Include="System.Drawing.Common" Version="9.0.7" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SkiaWmfRenderer\src\SkiaWmfRenderer\SkiaWmfRenderer.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/Optimizations/EnhancedGraphicsMetafileOptimization.cs b/src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/Optimizations/EnhancedGraphicsMetafileOptimization.cs
@@ -1,13 +1,18 @@
-﻿using System;
+﻿using DotNetCampus.MediaConverter.SkiaWmfRenderer;
+
+using SkiaSharp;
+
+using Svg.Skia;
+
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-
-using DotNetCampus.MediaConverter.SkiaWmfRenderer;
+using System.Xml.Linq;
 
 namespace DotNetCampus.MediaConverters.Imaging.Optimizations;
 
@@ -349,4 +354,149 @@ private static ImageFileOptimizationResult ConvertInWindows(ImageFileOptimizatio
             };
         }
     }
+}
+
+public static class SvgFileOptimization
+{
+/*
+ if (IsExtension(".svg"))
+   {
+       // 如果是 svg 那就直接转换了，因为后续叠加特效等逻辑都不能支持 SVG 格式
+       try
+       {
+           var outputFilePath = ConvertSvgToPngFile(context);
+           if (outputFilePath is null)
+           {
+               return new ImageFileOptimizationResult()
+               {
+                   OptimizedImageFile = null,
+                   FailureReason = ImageFileOptimizationFailureReason.NotSupported
+               };
+           }
+           else
+           {
+               context.LogMessage($"Success ConvertSvgToPngFile. Update current image file to '{outputFilePath.FullName}'");
+               context = context with
+               {
+                   ImageFile = outputFilePath
+               };
+           }
+       }
+       catch (Exception e)
+       {
+           context.LogMessage($"Convert SVG to PNG failed: {e}");
+
+           return ImageFileOptimizationResult.FailException(e);
+       }
+   }
+   else if (IsExtension(".wmf") ||
+            IsExtension(".emf"))
+   {
+       var result = EnhancedGraphicsMetafileOptimization.ConvertWmfOrEmfToPngFile(context);
+       if (result.OptimizedImageFile is not null)
+       {
+           context.LogMessage($"Success ConvertWmfOrEmfToPngFile. Update current image file to '{result.OptimizedImageFile}'");
+           context = context with
+           {
+               ImageFile = result.OptimizedImageFile
+           };
+       }
+       else
+       {
+           return result;
+       }
+   }
+ */
+
+    /// <summary>
+    /// 转换 svg 文件为 png 文件
+    /// </summary>
+    /// <returns></returns>
+    public static FileInfo? ConvertSvgToPngFile(ImageFileOptimizationContext context)
+    {
+        var imageFile = context.ImageFile;
+        var workingFolder = context.WorkingFolder;
+
+        using var skSvg = new SKSvg();
+        using var skPicture = skSvg.Load(imageFile.FullName);
+        var outputFile = Path.Join(workingFolder.FullName,
+            $"SVG_{Path.GetRandomFileName()}.png");
+        var canSave = skSvg.Save(outputFile, SKColors.Transparent);
+        if (canSave && File.Exists(outputFile))
+        {
+            return new FileInfo(outputFile);
+        }
+
+        // 转换失败
+        return null;
+    }
+
+    public static async Task<FileInfo> FixSvgInvalidCharacterAsync(FileInfo svgFile,
+        DirectoryInfo workingFolder)
+    {
+        using var fileStream = svgFile.OpenRead();
+        using var streamReader = new StreamReader(fileStream);
+
+        var xDocument = await XDocument.LoadAsync(streamReader, LoadOptions.SetLineInfo, CancellationToken.None);
+        bool anyUpdate = false;
+
+        foreach (var xElement in xDocument.Descendants("text"))
+        {
+            var value = xElement.Value;
+            if (!string.IsNullOrEmpty(value) && value.Length > 0 && value[0] is var c && c == 0xFFFD)
+            {
+                // 0xFFFFD 是 utf8 特殊字符
+                // 画出来就是�符号，不如删掉
+                xElement.Value = string.Empty;
+
+                anyUpdate = true;
+            }
+        }
+
+        if (anyUpdate)
+        {
+            var convertedFile = Path.Join(workingFolder.FullName, $"FixSVG_{Path.GetRandomFileName()}.svg");
+            using var stream = File.Create(convertedFile);
+            await xDocument.SaveAsync(stream, SaveOptions.None, CancellationToken.None);
+            return new FileInfo(convertedFile);
+        }
+
+        // 啥都不用改，返回原图
+        return svgFile;
+    }
+
+    public static FileInfo FixSvgInvalidCharacter(ImageFileOptimizationContext context)
+    {
+        FileInfo svgFile = context.ImageFile;
+        DirectoryInfo workingFolder = context.WorkingFolder;
+
+        using var fileStream = svgFile.OpenRead();
+        using var streamReader = new StreamReader(fileStream);
+
+        var xDocument = XDocument.Load(streamReader, LoadOptions.SetLineInfo);
+        bool anyUpdate = false;
+
+        foreach (var xElement in xDocument.Descendants("text"))
+        {
+            var value = xElement.Value;
+            if (!string.IsNullOrEmpty(value) && value.Length > 0 && value[0] is var c && c == 0xFFFD)
+            {
+                // 0xFFFFD 是 utf8 特殊字符
+                // 画出来就是�符号，不如删掉
+                xElement.Value = string.Empty;
+
+                anyUpdate = true;
+            }
+        }
+
+        if (anyUpdate)
+        {
+            var convertedFile = Path.Join(workingFolder.FullName, $"FixSVG_{Path.GetRandomFileName()}.svg");
+            xDocument.Save(convertedFile);
+            return new FileInfo(convertedFile);
+        }
+
+        // 啥都不用改，返回原图
+        return svgFile;
+    }
 }
diff --git a/src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderer.csproj b/src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderer.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="README.md" Pack="True" PackagePath="\" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" Condition="'$(GITHUB_ACTIONS)' == 'true'"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" Condition="'$(GITHUB_ACTIONS)' == 'true'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,7 +38,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="SkiaSharp" Version="3.119.0" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.0" />
+
+    <PackageReference Include="Svg.Skia" Version="3.0.4" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.7" />
     
     <PackageReference Include="HarfBuzzSharp" Version="8.3.1.1" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.1" />

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,13 @@ public static ImageFileOptimizationResult FailException(Exception e)`
`39`	`39`	`FailureReason = ImageFileOptimizationFailureReason.Exception`
`40`	`40`	`};`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ public static ImageFileOptimizationResult NotSupported()`
	`44`	`+ {`
	`45`	`+ return new ImageFileOptimizationResult()`
	`46`	`+ {`
	`47`	`+ OptimizedImageFile = null,`
	`48`	`+ FailureReason = ImageFileOptimizationFailureReason.NotSupported`
	`49`	`+ };`
	`50`	`+ }`
`42`	`51`	`}`