Merge pull request #48 from Starrah/fix-some-bugs

修了一些小bug

Author: clansty

MaiChartManager/Controllers/Music/MusicTransferController.cs

@@ -636,7 +636,7 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
         var img = music.GetMusicJacketPngData();
         if (img is not null)
         {
-            var imgExt = (Path.GetExtension(music.JacketPath ?? music.PseudoAssetBundleJacket ?? music.AssetBundleJacket) ?? ".png").ToLowerInvariant();
+            var imgExt = (Path.GetExtension(music.RealJacketPath) ?? ".png").ToLowerInvariant();
             if (imgExt == ".ab") imgExt = ".png";
             var imageEntry = zipArchive.CreateEntry($"bg{imgExt}");
             await using var imageStream = imageEntry.Open();

MaiChartManager/Front/src/views/Charts/MusicSelectedTopRightToolbar/SaveButton/index.tsx

@@ -16,7 +16,7 @@ export default defineComponent({
       setTimeout(() => {
         isAnimationShow.value = false;
       }, 250);
-      await updateMusicList();
+      await updateMusicList(true);
     }
 
     const {ctrl_s} = useMagicKeys({

MaiChartManager/Models/MusicXmlWithABJacket.cs

@@ -11,6 +11,7 @@ public class MusicXmlWithABJacket(string filePath, string gamePath, string asset
 
     // 在 mod 里文件的 jacket 是优先的
     public new bool HasJacket => JacketPath is not null || AssetBundleJacket is not null || PseudoAssetBundleJacket is not null;
+    public string RealJacketPath => JacketPath ?? PseudoAssetBundleJacket ?? AssetBundleJacket;
 
     public new static MusicXmlWithABJacket CreateNew(int id, string gamePath, string assetDir)
     {
@@ -122,16 +123,18 @@ public List<string> Problems
 
     public void Delete()
     {
-        if (HasJacket && !JacketPath?.Contains(@"\A000\", StringComparison.InvariantCultureIgnoreCase) == true)
+        if (HasJacket && RealJacketPath?.Contains(@"\A000\", StringComparison.InvariantCultureIgnoreCase) == false)
         {
-            Console.WriteLine("删除 jacket: " + JacketPath);
+            Console.WriteLine("删除 jacket: " + RealJacketPath);
             try
             {
-                FileSystem.DeleteFile(JacketPath);
+                FileSystem.DeleteFile(RealJacketPath);
+                if (RealJacketPath.EndsWith(".ab")) // .ab的情况，要额外把manifest也干掉
+                    FileSystem.DeleteFile(RealJacketPath + ".manifest");
             }
             catch
             {
-                Console.WriteLine($"删除 jacket 失败: {JacketPath}");
+                Console.WriteLine($"删除 jacket 失败: {RealJacketPath}");
             }
         }
 

MaiChartManager/Utils/Audio.cs

@@ -84,8 +84,13 @@ public static Stream ConvertToWav(Stream src, string extension, float padding =
         }
 
         var stream = new MemoryStream();
-        WaveFileWriter.WriteWavFileToStream(stream, sample.ToWaveProvider16()); // 淦
-        stream.Position = 0;                                                    // 淦 x2
+        WaveFileWriter.WriteWavFileToStream(stream, sample.ToWaveProvider16());
+#if DEBUG
+        Console.WriteLine($"ConvertToWav: extension={extension}, padding={padding}, forceUseNAudio={forceUseNAudio}");
+        stream.Position = 0; // 把wav的内容写到本地文件以供调试
+        File.WriteAllBytes(Path.Combine(StaticSettings.tempPath, "ConvertToWav_debug.wav"), stream.ToArray());
+#endif
+        stream.Position = 0;
         return stream;
     }