MuConvert 更新到v0.3.0 (#60)

Author: Starrah

MaiChartManager/Controllers/Charts/ChartPreviewController.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using MuConvert.generator;
-using MuConvert.parser;
+using MuConvert.mai;
 
 namespace MaiChartManager.Controllers.Charts;
 

MaiChartManager/Controllers/Charts/ImportChartController.cs

@@ -1,10 +1,7 @@
 using MaiChartManager.Controllers.Charts.Services;
 using MaiChartManager.Controllers.Music;
 using Microsoft.AspNetCore.Mvc;
-using MuConvert.chart;
-using MuConvert.generator;
-using MuConvert.maidata;
-using MuConvert.parser;
+using MuConvert.mai;
 using MuConvert.utils;
 
 namespace MaiChartManager.Controllers.Charts;
@@ -88,7 +85,7 @@ public ImportChartCheckResult ImportChartCheck(IFormFile file, [FromForm] bool i
 
             var first = maiData.First;
             var isDx = false;
-            List<Chart> resultCharts = [];
+            List<MaiChart> resultCharts = [];
             List<SimaiSharp.Structures.MaiChart> legacyCharts = [];
             foreach (var (lv, data) in maiData.Levels)
             {

MaiChartManager/Controllers/Charts/Services/MaidataImportService.cs

@@ -1,9 +1,6 @@
 using MaiChartManager.Models;
 using MaiChartManager.Utils;
-using MuConvert.chart;
-using MuConvert.generator;
-using MuConvert.maidata;
-using MuConvert.parser;
+using MuConvert.mai;
 using MuConvert.utils;
 using Rationals;
 
@@ -65,7 +62,7 @@ public MaidataImportService(ILogger<MaidataImportService> logger)
         this.logger = logger;
     }
 
-    public static Dictionary<ShiftMethod, (double sec, decimal bpm, Rational bar)> CalcChartPadding(List<Chart> charts)
+    public static Dictionary<ShiftMethod, (double sec, decimal bpm, Rational bar)> CalcChartPadding(List<MaiChart> charts)
     {
         // 谱面导入时，会有两个地方涉及到时间的调整：
         // 1. 对谱面的调整。在下方的ImportMaidata函数中应用，对谱面进行相应的调整（chart.Shift）。
@@ -85,7 +82,7 @@ public MaidataImportService(ILogger<MaidataImportService> logger)
         var notePaddingOfEachChart = charts.Select(chart =>
         {
             var bpm = chart.StartBpm;
-            var notePadding = (1 - chart.FirstNoteTime.InvariantBar).CanonicalForm;
+            var notePadding = (1 - chart.StartTime.InvariantBar).CanonicalForm;
             var sec = (double)(notePadding * (240 / (Rational)bpm));
             return (sec, bpm, notePadding);
         }).ToList();
@@ -195,7 +192,7 @@ public ImportChartResult ImportMaidata(
         }
 
         // 先执行第一步：Parser，因为可能涉及对Chart做出调整
-        List<(int lv, int targetLevel, MaidataChart data, Chart chart, List<Alert> alerts)> parserOutput = [];
+        List<(int lv, int targetLevel, MaidataLevel data, MaiChart chart, List<Alert> alerts)> parserOutput = [];
         foreach (var (lv, data) in maiData.Levels)
         {
             if (!targetLevelMap.ContainsKey(lv)) continue;

MaiChartManager/Controllers/Music/MusicTransferController.cs

@@ -7,9 +7,7 @@
 using MaiChartManager.Utils;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.VisualBasic.FileIO;
-using MuConvert.generator;
-using MuConvert.maidata;
-using MuConvert.parser;
+using MuConvert.mai;
 using NAudio.Lame;
 using Vanara.Windows.Forms;
 using FolderBrowserDialog = System.Windows.Forms.FolderBrowserDialog;
@@ -679,7 +677,7 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
                     var simai = ma2.Compose(MaiLib.ChartEnum.ChartVersion.SimaiFes);
 
                     var lvStr = $"{chart.Level}.{chart.LevelDecimal}";
-                    simaiFile.AddLevel(i + 2, new MaidataChart(simai, lvStr, chart.Designer), false);
+                    simaiFile.AddLevel(i + 2, new MaidataLevel(simai, lvStr, chart.Designer), false);
                 }
                 else
                 {
@@ -688,7 +686,7 @@ public async Task ExportAsMaidata(int id, string assetDir, bool ignoreVideo = fa
                     var (simai, _) = new SimaiGenerator().Generate(cvtChart);
 
                     var lvStr = $"{chart.Level}.{chart.LevelDecimal}";
-                    simaiFile.AddLevel(i + 2, new MaidataChart(simai, lvStr, chart.Designer));
+                    simaiFile.AddLevel(i + 2, new MaidataLevel(simai, lvStr, chart.Designer));
                     simaiFile.ClockCount = cvtChart.ClockCount; // 通过多次写入，自然实现取最后一个有效难度的clockCount，作为写入maidata中的
                 }
             }