Merge pull request #49 from Starrah/import-chart-targetlevel

refactor&fix: 重构将maidata中的lv映射为游戏中的难度的逻辑。

Author: clansty

MaiChartManager/Controllers/Charts/ImportChartController.cs

@@ -43,60 +43,52 @@ public ImportChartCheckResult ImportChartCheck(IFormFile file, [FromForm] bool i
                 fatal = true;
             }
 
-            var levels = new bool[5];
             var allChartText = new Dictionary<int, string>();
-
-            for (var i = 0; i < 5; i++)
+            for (var i = 0; i < 9; i++)
             {
-                // maidata 里 2 是绿谱，6 是白谱
-                if (!string.IsNullOrWhiteSpace(maiData.GetValueOrDefault($"inote_{i + 2}")))
+                if (i == 1) continue; // maidata 中 inote_1 无对应游戏难度，与 ImportMaidata 保持一致
+                if (!string.IsNullOrWhiteSpace(maiData.GetValueOrDefault($"inote_{i}")))
                 {
-                    levels[i] = true;
-                    allChartText.Add(i + 2, maiData.GetValueOrDefault($"inote_{i + 2}"));
+                    allChartText.Add(i, maiData.GetValueOrDefault($"inote_{i}"));
                 }
             }
+            var targetLevelMap = MaidataImportService.MapMaidataLevelToGame(allChartText.Keys.ToList());
 
-            if (levels.Any(it => it))
+            # region 向前端返回，关于导入谱面的inote_映射到游戏中的难度的提示信息
+            string[] levelNames = [Locale.DifficultyBasic, Locale.DifficultyAdvanced, Locale.DifficultyExpert, Locale.DifficultyMaster, Locale.DifficultyReMaster];
+            string[] importAsMessages = [Locale.DifficultyImportedAsBasic, null, null, Locale.DifficultyImportedAsMaster, Locale.DifficultyImportedAsReMaster];
+            
+            string generalImportMessage = ""; // “将导入以下难度：” 的默认信息
+            var extraImportMessages = new List<string>(); // “有一个难度为 {0} 的谱面，将导入为XX谱 ” 的信息
+            foreach (var (lv, _) in allChartText)
             {
-                string[] levelNames = [Locale.DifficultyBasic, Locale.DifficultyAdvanced, Locale.DifficultyExpert, Locale.DifficultyMaster, Locale.DifficultyReMaster];
-                var message = Locale.ImportingDifficulties;
-                for (var i = 0; i < 5; i++)
-                {
-                    if (levels[i])
-                    {
-                        message += levelNames[i] + " ";
-                    }
+                if (!targetLevelMap.TryGetValue(lv, out var targetLevel))
+                { // 根据targetLevelMap返回的结果，该谱面应被忽略
+                    extraImportMessages.Add(string.Format(Locale.DifficultyIgnored, lv));
+                    continue;
                 }
-
-                errors.Add(new ImportChartMessage(message, MessageLevel.Info));
-            }
-
-            foreach (var i in (int[])[7, 8, 0])
-            {
-                if (string.IsNullOrWhiteSpace(maiData.GetValueOrDefault($"inote_{i}"))) continue;
-                allChartText.Add(i, maiData.GetValueOrDefault($"inote_{i}"));
-                if (!levels[3])
+                if (2 <= lv && lv <= 6)
                 {
-                    levels[3] = true;
-                    errors.Add(new ImportChartMessage(string.Format(Locale.DifficultyImportedAsMaster, i), MessageLevel.Warning));
-                }
-                else if (!levels[4])
-                {
-                    levels[4] = true;
-                    errors.Add(new ImportChartMessage(string.Format(Locale.DifficultyImportedAsReMaster, i), MessageLevel.Warning));
-                }
-                else if (!levels[0])
-                {
-                    levels[0] = true;
-                    errors.Add(new ImportChartMessage(string.Format(Locale.DifficultyImportedAsBasic, i), MessageLevel.Warning));
+                    generalImportMessage += levelNames[targetLevel] + " ";
                 }
                 else
                 {
-                    errors.Add(new ImportChartMessage(string.Format(Locale.DifficultyIgnored, i), MessageLevel.Warning));
+                    extraImportMessages.Add(string.Format(importAsMessages[targetLevel], lv));
                 }
             }
+            
+            if (!string.IsNullOrEmpty(generalImportMessage))
+            {
+                errors.Add(new ImportChartMessage(Locale.ImportingDifficulties + generalImportMessage, MessageLevel.Info));
+            }
+
+            foreach (var message in extraImportMessages)
+            {
+                errors.Add(new ImportChartMessage(message, MessageLevel.Warning));
+            }
+            # endregion
 
-            if (!levels.Any(it => it))
+            if (targetLevelMap.Count == 0) // 没有能够被映射的谱面
             {
                 errors.Add(new ImportChartMessage(Locale.MusicNoCharts, MessageLevel.Fatal));
                 fatal = true;

MaiChartManager/Services/MaidataImportService.cs

@@ -270,6 +270,47 @@ private static string ApplyClockCountToFirstMetLine(string ma2Content, int clock
         return ma2Content;
     }
 
+    /** 根据maidata中定义的所有难度，将其映射到游戏中的难度。 **/
+    public static Dictionary<int, int> MapMaidataLevelToGame(List<int> maidataLevels)
+    {
+        var result = new Dictionary<int, int>();
+        var gameLevels = new bool[5];
+        
+        // 先映射标准难度谱面 绿红黄紫白
+        for (int lv = 2; lv <= 6; lv++)
+        {
+            if (!maidataLevels.Contains(lv)) continue;
+            var targetLevel = lv - 2;
+            result.Add(lv, targetLevel);
+            gameLevels[targetLevel] = true;
+        }
+
+        // 再映射非标准难度
+        var nonStandardMappings = new[]
+        {
+            new { Levels = new[] { 7, 8 }, Targets = new[] { 3, 4, 0 } }, // lv7和8的匹配顺序：紫，白，绿
+            new { Levels = new[] { 0 },    Targets = new[] { 0, 3, 4 } }  // lv0的匹配顺序：绿，紫，白
+        };
+        foreach (var mapping in nonStandardMappings)
+        {
+            foreach (var lv in mapping.Levels)
+            {
+                if (!maidataLevels.Contains(lv)) continue;
+                foreach (var targetLevel in mapping.Targets)
+                {
+                    if (!gameLevels[targetLevel])
+                    {
+                        result.Add(lv, targetLevel);
+                        gameLevels[targetLevel] = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+    
     public ImportChartResult ImportMaidata(
         MusicXml music,
         IFormFile file,
@@ -326,6 +367,7 @@ public ImportChartResult ImportMaidata(
         }
 
         float bpm = 0f;
+        var targetLevelMap = MapMaidataLevelToGame(allCharts.Keys.ToList());
         foreach (var (level, chart) in allCharts)
         {
             // 宴会场只导入第一个谱面
@@ -336,41 +378,19 @@ public ImportChartResult ImportMaidata(
             // 一个小节多少秒
             var bar = 60 / bpm * 4;
 
-            # region 设定 targetLevel
-
-            var targetLevel = level - 2;
-
-            // 处理非标准难度
-            if (level is > 6 or < 1)
-            {
-                // 分给 3 4 0
-                if (!music.Charts[3].Enable)
-                {
-                    targetLevel = 3;
-                }
-                else if (!music.Charts[4].Enable)
-                {
-                    targetLevel = 4;
-                }
-                else if (!music.Charts[0].Enable)
-                {
-                    targetLevel = 0;
-                }
-                else
-                {
-                    continue;
-                }
-            }
-
+            if (!targetLevelMap.TryGetValue(level, out var targetLevel)) continue; // 字典里没查到、说明这个难度是“被忽略的难度”
             if (isUtage) targetLevel = 0;
 
-            # endregion
-
             var targetChart = music.Charts[targetLevel];
             targetChart.Path = $"{id:000000}_0{targetLevel}.ma2";
             var levelNumStr = maiData.GetValueOrDefault($"lv_{level}");
             if (!string.IsNullOrWhiteSpace(levelNumStr))
             {
+                if (isUtage && !char.IsDigit(levelNumStr[0]))
+                {
+                    music.UtageKanji = levelNumStr.Substring(0, 1);
+                    levelNumStr = levelNumStr.Substring(1).Replace("?", ""); // 为了处理类似“奏13+?”这种情况，留下13+给后面的逻辑处理
+                }
                 levelNumStr = levelNumStr.Replace("+", ".7");
             }