feat: 导入谱面时，支持maidata中的&demo_seek和&demo_len

Author: Starrah

MaiChartManager/Controllers/Charts/ImportChartController.cs

@@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using MaiChartManager.Controllers.Music;
 using MaiChartManager.Services;
 using Microsoft.AspNetCore.Mvc;
 using SimaiSharp;
@@ -11,7 +12,7 @@ namespace MaiChartManager.Controllers.Charts;
 public class ImportChartController(StaticSettings settings, ILogger<StaticSettings> logger, 
     MaidataImportService importService) : ControllerBase
 {
-    public record ImportChartCheckResult(bool Accept, IEnumerable<ImportChartMessage> Errors, Dictionary<ShiftMethod, float> chartPaddings, bool IsDx, string? Title, float first);
+    public record ImportChartCheckResult(bool Accept, IEnumerable<ImportChartMessage> Errors, Dictionary<ShiftMethod, float> chartPaddings, bool IsDx, string? Title, float first, CueConvertController.SetAudioPreviewRequest? previewTime);
 
     [HttpPost]
     public ImportChartCheckResult ImportChartCheck(IFormFile file, [FromForm] bool isReplacement = false)
@@ -99,7 +100,7 @@ public ImportChartCheckResult ImportChartCheck(IFormFile file, [FromForm] bool i
             {
                 errors.Add(new ImportChartMessage(Locale.MusicNoCharts, MessageLevel.Fatal));
                 fatal = true;
-                return new ImportChartCheckResult(!fatal, errors, new Dictionary<ShiftMethod, float>(), false, title, 0);
+                return new ImportChartCheckResult(!fatal, errors, new Dictionary<ShiftMethod, float>(), false, title, 0, null);
             }
 
             float.TryParse(maiData.GetValueOrDefault("first"), out var first);
@@ -142,14 +143,22 @@ public ImportChartCheckResult ImportChartCheck(IFormFile file, [FromForm] bool i
 
             var chartPaddings = MaidataImportService.CalcChartPadding(maiCharts, out _);
 
-            return new ImportChartCheckResult(!fatal, errors, chartPaddings, isDx, title, first);
+            CueConvertController.SetAudioPreviewRequest? previewTime = null;
+            if (float.TryParse(maiData.GetValueOrDefault("demo_seek"), out var demo_seek))
+            {
+                // 当只有demo_seek没有demo_len时，则把demo_len设为一个很大的数，表示preview直到音频结尾；SetAudioPreviewApi中会自动把实际的loopEnd限制到音频长度以内。
+                if (!float.TryParse(maiData.GetValueOrDefault("demo_len"), out var demo_len)) demo_len = 10000f;
+                previewTime = new CueConvertController.SetAudioPreviewRequest(demo_seek, demo_seek + demo_len);
+            }
+            
+            return new ImportChartCheckResult(!fatal, errors, chartPaddings, isDx, title, first, previewTime);
         }
         catch (Exception e)
         {
             logger.LogError(e, "解析谱面失败（大）");
             errors.Add(new ImportChartMessage(Locale.ChartParseFailedGlobal, MessageLevel.Fatal));
             fatal = true;
-            return new ImportChartCheckResult(!fatal, errors, new Dictionary<ShiftMethod, float>(), false, "", 0);
+            return new ImportChartCheckResult(!fatal, errors, new Dictionary<ShiftMethod, float>(), false, "", 0, null);
         }
     }
 

MaiChartManager/Controllers/Music/MusicTransferController.cs

@@ -574,8 +574,11 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
             if (AudioConvert.TryResolveAcbAwb(GetAudioCandidateIds(music), out _, out var previewAcb, out _) && previewAcb is not null)
             {
                 var previewTime = CriUtils.GetAudioPreviewTime(previewAcb);
-                if (previewTime.StartTime >= 0)
+                if (previewTime.StartTime >= 0 && previewTime.EndTime > previewTime.StartTime)
+                {
                     simaiFile.AppendLine($"&demo_seek={previewTime.StartTime}");
+                    simaiFile.AppendLine($"&demo_len={previewTime.EndTime - previewTime.StartTime}");
+                }
             }
         }
         catch

MaiChartManager/Front/src/client/apiGen.ts

@@ -276,6 +276,7 @@ export interface ImportChartCheckResult {
   title?: string | null;
   /** @format float */
   first?: number;
+  previewTime?: SetAudioPreviewRequest;
 }
 
 export interface ImportChartMessage {

MaiChartManager/Front/src/views/Charts/ImportCreateChartButton/ImportChartButton/index.tsx

@@ -68,7 +68,7 @@ export default defineComponent({
         errors.value.push({ level: MessageLevel.Warning, message: t('chart.import.error.convertPaidFeature'), name: dir.name, isPaid: true });
       }
 
-      let first = 0, chartPaddings, name = dir.name, isDx = false;
+      let first = 0, chartPaddings, name = dir.name, isDx = false, previewTime = undefined;
       if (maidata) {
         const checkRet = (await api.ImportChartCheck({ file: maidata })).data;
         reject = reject || !checkRet.accept;
@@ -80,11 +80,12 @@ export default defineComponent({
         name = checkRet.title!;
         if (checkRet.isDx) id += 1e4;
         isDx = checkRet.isDx!;
+        if (checkRet.previewTime) previewTime = checkRet.previewTime
       }
 
       if (!reject) {
         meta.value.push({
-          id, maidata, bg, track, chartPaddings, name, first, movie, isDx,
+          id, maidata, bg, track, chartPaddings, name, first, movie, isDx, previewTime,
           importStep: IMPORT_STEP.start,
         })
       }
@@ -169,6 +170,7 @@ export default defineComponent({
         let audioPadding = chartPadding - music.first;
 
         await api.SetAudio(music.id, selectedADir.value, { file: music.track, padding: audioPadding, ignoreGapless: !!tempOptions.value.ignoreGapless });
+        if (music.previewTime) await api.SetAudioPreview(music.id, selectedADir.value, music.previewTime);
 
         if (music.movie && !tempOptions.value.disableBga) {
           currentMovieProgress.value = 0;

MaiChartManager/Front/src/views/Charts/ImportCreateChartButton/ImportChartButton/types.ts

@@ -1,4 +1,4 @@
-import { ImportChartCheckResult, ImportChartMessage, ShiftMethod } from "@/client/apiGen";
+import { ImportChartCheckResult, ImportChartMessage, SetAudioPreviewRequest, ShiftMethod } from "@/client/apiGen";
 
 export enum STEP {
   none,
@@ -30,6 +30,7 @@ export type ImportMeta = {
   chartPaddings: ImportChartCheckResult['chartPaddings'],
   first: number,
   isDx: boolean,
+  previewTime?: SetAudioPreviewRequest
 }
 
 export type FirstPaddingMessage = { first: number, chartPaddings: ImportChartCheckResult['chartPaddings']}

MaiChartManager/Utils/CriUtils.cs

@@ -43,11 +43,14 @@ public static async Task<byte[]> CreateAcbWithPreview(string wavPath, byte[] awb
         criTable.Load(File.ReadAllBytes(Path.Combine(StaticSettings.exeDir, "templateV3.acb")));
 
         var cueTable = criTable.Rows[0].GetTable("CueTable");
-        cueTable.Rows[0]["Length"] = (int)((float)format.SampleCount / format.SampleRate * 1000);
+        float audioLength = (float)format.SampleCount / format.SampleRate;
+        cueTable.Rows[0]["Length"] = (int)(audioLength * 1000);
         criTable.WriterSettings = CriTableWriterSettings.Adx2Settings;
         criTable.Rows[0]["CueTable"] = cueTable.Save();
 
         var trackEventTable = criTable.Rows[0].GetTable("TrackEventTable");
+        // 对loopEnd予以截断，防止前端传来的loopEnd超过音频结尾的范围
+        if (loopEnd.TotalSeconds > audioLength) loopEnd = TimeSpan.FromSeconds(audioLength);
         trackEventTable.Rows[1]["Command"] = MakeCommandForPreview(loopStart, loopEnd);
         criTable.Rows[0]["TrackEventTable"] = trackEventTable.Save();