fix: escape 带引号的情况

Author: clansty

AquaMai

@@ -103,7 +103,7 @@ private static MemoryStream ConvertMp3ToWavViaFfmpeg(Stream src)
             }
 
             var conversion = FFmpeg.Conversions.New()
-                .AddParameter("-i " + inputPath.Escape())
+                .AddParameter("-i " + FFmpegHelper.Escape(inputPath))
                 .AddParameter("-c:a pcm_s16le") // 转为16-bit little-endian PCM
                 .SetOutput(outputPath)
                 .SetOverwriteOutput(true);

MaiChartManager/Utils/Audio.cs

@@ -82,7 +82,7 @@ public static void ConvertWavPathToMp3Stream(string wavPath, Stream mp3Stream, I
             Directory.CreateDirectory(StaticSettings.tempPath);
 
             var conversion = FFmpeg.Conversions.New()
-                .AddParameter($"-i " + wavPath.Escape());
+                .AddParameter($"-i " + FFmpegHelper.Escape(wavPath));
 
             if (tagData != null)
             {
@@ -91,15 +91,15 @@ public static void ConvertWavPathToMp3Stream(string wavPath, Stream mp3Stream, I
                     // 把专辑封面写到临时文件，然后让ffmpeg把它嵌入mp3
                     albumArtPath = Path.Combine(StaticSettings.tempPath, $"ConvertToMp3_{Guid.NewGuid():N}.png");
                     File.WriteAllBytes(albumArtPath, tagData.AlbumArt);
-                    conversion.AddParameter($"-i {albumArtPath.Escape()}");
+                    conversion.AddParameter($"-i {FFmpegHelper.Escape(albumArtPath)}");
                 } // 顺序不能换！这个必须在第一个，因为-i必须在任何其他参数之前。
-                if (!string.IsNullOrEmpty(tagData.Title)) conversion.AddParameter($"-metadata title=" + tagData.Title.Escape());
-                if (!string.IsNullOrEmpty(tagData.Artist)) conversion.AddParameter($"-metadata artist=" + tagData.Artist.Escape());
-                if (!string.IsNullOrEmpty(tagData.Album)) conversion.AddParameter($"-metadata album=" + tagData.Album.Escape());
-                if (!string.IsNullOrEmpty(tagData.Year)) conversion.AddParameter($"-metadata date=" + tagData.Year.Escape());
-                if (!string.IsNullOrEmpty(tagData.Comment)) conversion.AddParameter($"-metadata comment=" + tagData.Comment.Escape());
-                if (!string.IsNullOrEmpty(tagData.Genre)) conversion.AddParameter($"-metadata genre=" + tagData.Genre.Escape());
-                if (!string.IsNullOrEmpty(tagData.Track)) conversion.AddParameter($"-metadata track=" + tagData.Track.Escape());
+                if (!string.IsNullOrEmpty(tagData.Title)) conversion.AddParameter($"-metadata title=" + FFmpegHelper.Escape(tagData.Title));
+                if (!string.IsNullOrEmpty(tagData.Artist)) conversion.AddParameter($"-metadata artist=" + FFmpegHelper.Escape(tagData.Artist));
+                if (!string.IsNullOrEmpty(tagData.Album)) conversion.AddParameter($"-metadata album=" + FFmpegHelper.Escape(tagData.Album));
+                if (!string.IsNullOrEmpty(tagData.Year)) conversion.AddParameter($"-metadata date=" + FFmpegHelper.Escape(tagData.Year));
+                if (!string.IsNullOrEmpty(tagData.Comment)) conversion.AddParameter($"-metadata comment=" + FFmpegHelper.Escape(tagData.Comment));
+                if (!string.IsNullOrEmpty(tagData.Genre)) conversion.AddParameter($"-metadata genre=" + FFmpegHelper.Escape(tagData.Genre));
+                if (!string.IsNullOrEmpty(tagData.Track)) conversion.AddParameter($"-metadata track=" + FFmpegHelper.Escape(tagData.Track));
             }
 
             conversion.AddParameter("-c:a libmp3lame -b:a 256k"); // 把wav编码为256kbps的LAME mp3

MaiChartManager/Utils/AudioConvert.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace MaiChartManager.Utils;
+
+public static class FFmpegHelper
+{
+    /// <summary>
+    /// 将字符串转义后用双引号包裹，用于安全地拼接 ffmpeg 参数。
+    /// 与 Xabe.FFmpeg 自带的 Escape() 不同，这里会正确转义内容中的反斜杠和双引号。
+    /// </summary>
+    public static string? Escape(string? value)
+    {
+        if (value == null) return value;
+        return "\"" + value.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
+    }
+}
+

MaiChartManager/Utils/FFmpegHelper.cs

@@ -272,7 +272,7 @@ private static IConversion Concatenate(string vf, params IMediaInfo[] mediaInfos
         var conversion = FFmpeg.Conversions.New();
         foreach (var inputVideo in mediaInfos)
         {
-            conversion.AddParameter("-i " + inputVideo.Path.Escape() + " ");
+            conversion.AddParameter("-i " + FFmpegHelper.Escape(inputVideo.Path) + " ");
         }
 
         conversion.AddParameter("-filter_complex \"");
@@ -336,7 +336,7 @@ public static async Task ConvertUsmToMp4(string inputPath, string outputPath, Ac
 
                 // 转换为 MP4
                 var conversion = FFmpeg.Conversions.New()
-                    .AddParameter("-i " + outputIvfFile.Escape())
+                    .AddParameter("-i " + FFmpegHelper.Escape(outputIvfFile))
                     .AddParameter("-c:v copy")
                     .SetOutput(outputPath);