在导出的 mp3 中包含封面和元数据

Author: clansty

MaiChartManager/Controllers/Music/MusicTransferController.cs

@@ -4,6 +4,7 @@
 using MaiLib;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.VisualBasic.FileIO;
+using NAudio.Lame;
 using SimaiSharp;
 using Vanara.Windows.Forms;
 using Xabe.FFmpeg;
@@ -354,12 +355,6 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
         await maidataStream.WriteAsync(Encoding.UTF8.GetBytes(simaiFile.ToString()));
         maidataStream.Close();
 
-
-        var soundEntry = zipArchive.CreateEntry("track.mp3");
-        await using var soundStream = soundEntry.Open();
-        AudioConvert.ConvertWavPathToMp3Stream(await AudioConvert.GetCachedWavPath(id), soundStream);
-        soundStream.Close();
-
         // copy jacket
         var img = music.GetMusicJacketPngData();
         if (img is not null)
@@ -372,6 +367,20 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
             imageStream.Close();
         }
 
+        var soundEntry = zipArchive.CreateEntry("track.mp3");
+        await using var soundStream = soundEntry.Open();
+        var tag = new ID3TagData
+        {
+            Title = music.Name,
+            Artist = music.Artist,
+            Album = genre?.GenreName,
+            Track = music.Id.ToString(),
+            Comment = version?.GenreName,
+            AlbumArt = img,
+        };
+        AudioConvert.ConvertWavPathToMp3Stream(await AudioConvert.GetCachedWavPath(id), soundStream, tag);
+        soundStream.Close();
+
         if (!ignoreVideo && StaticSettings.MovieDataMap.TryGetValue(music.NonDxId, out var movieUsmPath))
         {
             string? pvMp4Path = null;

MaiChartManager/Front/src/components/MusicList/BatchActionButton/remoteExport.ts

@@ -80,5 +80,5 @@ export default async (setStep: (step: STEP) => void, musicList: MusicXmlWithABJa
 }
 
 const sanitizeFilename = (filename: string) => {
-  return filename.replace(/[\/:*?"<>|]/g, '_');
+  return filename.replace(/[\/:*?"<>|]/g, '_').replace(/[.\s]+$/, '');
 }

MaiChartManager/Utils/AudioConvert.cs

@@ -30,10 +30,10 @@ public static class AudioConvert
         return cachePath;
     }
 
-    public static void ConvertWavPathToMp3Stream(string wavPath, Stream mp3Stream)
+    public static void ConvertWavPathToMp3Stream(string wavPath, Stream mp3Stream, ID3TagData? tagData = null)
     {
         using var reader = new WaveFileReader(wavPath);
-        using var writer = new LameMP3FileWriter(mp3Stream, reader.WaveFormat, 256);
+        using var writer = new LameMP3FileWriter(mp3Stream, reader.WaveFormat, 256, tagData);
         reader.CopyTo(writer);
     }
 }