[+&R] Program.cs CLI 支持MA2->Simai

Starrah · Starrah · commit f651ce06992f · 2026-04-13T16:24:45.000+08:00
diff --git a/Program.cs b/Program.cs
@@ -1,8 +1,9 @@
 using System.CommandLine;
 using System.Text;
+using System.Text.RegularExpressions;
 using MuConvert.generator;
 using MuConvert.maidata;
-using MuConvert.parser.simai;
+using MuConvert.parser;
 using MuConvert.utils;
 
 namespace MuConvert;
@@ -33,19 +34,22 @@ private static Command BuildRootCommand()
     {
         var root = new RootCommand
         {
-            Description = $"MuConvert {Utils.AppVersion} — simai / maidata → MA2\n" + 
-                          "将 .txt 格式的 simai 单谱或 maidata 转为 MA2，输出与输入同目录的 lv_N.ma2。"
+            Description = $"MuConvert {Utils.AppVersion} — 新一代Simai ↔ MA2互转转谱器\n"
         };
 
         var levelsOption = new Option<string?>("--levels", "-l")
         {
-            Description = "仅转换指定难度（maidata 的 inote 编号），逗号分隔；省略则全部。纯 simai 单谱不可使用本选项。",
+            Description = "仅转换指定难度（以maidata中的&inote_编号为准），多个难度用逗号分隔；省略则转换全部难度。",
             HelpName = "N[,N...]"
         };
 
-        var inputArgument = new Argument<string>("inputfile")
+        var inputArgument = new Argument<string>("path")
         {
-            Description = "输入 .txt（单谱 simai 或 maidata）",
+            Description = "可以输入以下几种情况：\n" +
+                          "1.单个.txt文件（标准maidata.txt，或是不含maidata的头信息、直接是Simai的Notes的文件，都可以）。请通过-l指定要转换的谱面难度，不指定则默认转换全部难度。\n" +
+                          "2.单个.ma2文件。会把它转为Simai，输出maidata.txt。如果想要转换多个难度，请传入目录，详见第4条。\n" +
+                          "3.一个包含有maidata.txt的目录。行为同第一条。\n" +
+                          "4.一个包含有一个或多个.ma2文件的目录。会把它们转为一个maidata.txt。请通过-l指定要转换的谱面难度，不指定则默认转换全部难度。",
             Arity = ArgumentArity.ExactlyOne
         };
 
@@ -55,7 +59,7 @@ private static Command BuildRootCommand()
         root.SetAction(parseResult =>
         {
             var inputPath = parseResult.GetValue(inputArgument)
-                ?? throw new InvalidOperationException("缺少参数 inputfile。");
+                ?? throw new InvalidOperationException("缺少参数 path。");
             var levelsRaw = parseResult.GetValue(levelsOption);
             RunConvert(inputPath, levelsRaw);
         });
@@ -65,27 +69,162 @@ private static Command BuildRootCommand()
 
     private static void RunConvert(string inputPath, string? levelsRaw)
     {
-        var levelFilter = string.IsNullOrWhiteSpace(levelsRaw)
-            ? null
-            : ParseLevelList(levelsRaw);
+        var fullPath = Path.GetFullPath(inputPath.Trim());
 
-        var ext = Path.GetExtension(inputPath);
+        if (Directory.Exists(fullPath))
+            RunConvertDirectory(fullPath, levelsRaw);
+        else if (File.Exists(fullPath))
+            RunConvertFile(fullPath, levelsRaw);
+        else
+            throw new ArgumentException($"找不到路径: {inputPath}");
+    }
+
+    private static void RunConvertDirectory(string dir, string? levelsRaw)
+    {
+        var enumOpts = new EnumerationOptions
+        {
+            IgnoreInaccessible = true,
+            MatchCasing = MatchCasing.CaseInsensitive,
+            RecurseSubdirectories = false
+        };
+
+        var maidataPaths = Directory.GetFiles(dir, "maidata.txt", enumOpts);
+        var ma2Paths = Directory.GetFiles(dir, "*.ma2", enumOpts);
+
+        var hasMaidata = maidataPaths.Length > 0;
+        var hasMa2 = ma2Paths.Length > 0;
+
+        if (hasMaidata && hasMa2)
+            throw new ArgumentException("目录中同时存在 maidata.txt 与 .ma2，请只保留其中一种输入。");
+        if (!hasMaidata && !hasMa2)
+            throw new ArgumentException("目录中未找到 maidata.txt 或 .ma2 文件。");
+
+        if (hasMaidata)
+        {
+            if (maidataPaths.Length > 1)
+                throw new ArgumentException("目录中存在多个 maidata.txt，请只保留一个。");
+            RunConvertTxtFile(maidataPaths[0], levelsRaw);
+            return;
+        }
+
+        var title = new DirectoryInfo(dir).Name;
+        ConvertMa2PathsToMaidata(dir, title, ma2Paths, levelsRaw);
+    }
+
+    private static void RunConvertFile(string filePath, string? levelsRaw)
+    {
+        var ext = Path.GetExtension(filePath);
         if (string.Equals(ext, ".ma2", StringComparison.OrdinalIgnoreCase))
-            throw new NotImplementedException("从 .ma2 输入的转换尚未实现。");
+        {
+            var parent = Path.GetDirectoryName(Path.GetFullPath(filePath))!;
+            var title = new DirectoryInfo(parent).Name;
+            ConvertMa2PathsToMaidata(parent, title, [filePath], levelsRaw);
+            return;
+        }
+
+        if (string.Equals(ext, ".txt", StringComparison.OrdinalIgnoreCase))
+        {
+            RunConvertTxtFile(filePath, levelsRaw);
+            return;
+        }
 
-        if (!string.Equals(ext, ".txt", StringComparison.OrdinalIgnoreCase))
-            throw new ArgumentException($"不支持的输入扩展名「{ext}」。目前仅支持 .txt（simai / maidata）。");
+        throw new ArgumentException($"不支持的输入扩展名「{ext}」。支持 .txt、.ma2，或目录。");
+    }
 
-        if (!File.Exists(inputPath))
-            throw new ArgumentException($"找不到文件: {inputPath}");
+    private static void RunConvertTxtFile(string inputPath, string? levelsRaw)
+    {
+        var levelFilter = string.IsNullOrWhiteSpace(levelsRaw) ? null : ParseLevelList(levelsRaw);
 
         var inputDir = Path.GetDirectoryName(Path.GetFullPath(inputPath))!;
         var text = File.ReadAllText(inputPath, Encoding.UTF8);
 
         if (LooksLikeMaidata(text))
-            ConvertMaidata(text, inputDir, levelFilter);
+            ConvertMaidata(text, inputDir, levelFilter, inputPath);
         else
-            ConvertPlainSimai(text, inputDir, levelFilter);
+            ConvertPlainSimai(text, inputDir, levelFilter, inputPath);
+    }
+
+    /// <summary>
+    /// 与测试集约定一致：<c>*XX.ma2</c> 中 XX 为游戏难度后缀时，maidata inote = XX + 2；<c>lv_N.ma2</c> 为本工具导出，inote = N。
+    /// </summary>
+    private static bool TryParseMaidataLevelFromMa2FileName(string filePath, out int levelId)
+    {
+        var stem = Path.GetFileNameWithoutExtension(filePath);
+
+        if (stem.StartsWith("lv_", StringComparison.OrdinalIgnoreCase) && stem.Length > 3 &&
+            int.TryParse(stem.AsSpan(3), out var lv) && lv > 0)
+        {
+            levelId = lv;
+            return true;
+        }
+
+        var m = Regex.Match(stem, @"(\d{2})$");
+        if (m.Success && int.TryParse(m.Groups[1].Value, out var suffix))
+        {
+            levelId = suffix + 2;
+            return true;
+        }
+
+        levelId = 5;
+        return false;
+    }
+
+    private static List<(string FullPath, int LevelId)> AssignMaidataLevelsForMa2Files(string[] ma2Paths)
+    {
+        Array.Sort(ma2Paths, StringComparer.OrdinalIgnoreCase);
+        var used = new HashSet<int>();
+        var list = new List<(string, int)>(ma2Paths.Length);
+
+        foreach (var path in ma2Paths)
+        {
+            var suggested = TryParseMaidataLevelFromMa2FileName(path, out var parsed) ? parsed : 5;
+
+            var id = suggested;
+            while (used.Contains(id))
+                id++;
+
+            used.Add(id);
+            list.Add((path, id));
+        }
+
+        return list;
+    }
+
+    private static void ConvertMa2PathsToMaidata(string outputDir, string title, IReadOnlyList<string> ma2FullPaths, string? levelsRaw)
+    {
+        if (ma2FullPaths.Count == 0)
+            throw new ArgumentException("未提供任何 .ma2 文件。");
+
+        var paths = ma2FullPaths.Select(Path.GetFullPath).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+        var levelFilter = string.IsNullOrWhiteSpace(levelsRaw) ? null : ParseLevelList(levelsRaw);
+        var assignments = AssignMaidataLevelsForMa2Files(paths)
+            .OrderBy(t => t.LevelId)
+            .Where((_, lv)=> levelFilter == null || levelFilter.Contains(lv))
+            .ToList();
+        var outPath = Path.Combine(outputDir, "maidata.txt");
+
+        int clockCount = 4;
+        var inoteBlocks = new List<(int LevelId, string Inote)>();
+
+        foreach (var (fullPath, levelId) in assignments)
+        {
+            Console.WriteLine($"Simai → MA2: {fullPath}(lv{levelId}) → {outPath}");
+            var ma2Text = File.ReadAllText(fullPath, Encoding.UTF8);
+            var (chart, parseAlerts) = new MA2Parser().Parse(ma2Text);
+            PrintAlerts(parseAlerts);
+            var (simai, genAlerts) = new SimaiGenerator().Generate(chart);
+            PrintAlerts(genAlerts);
+            inoteBlocks.Add((levelId, simai));
+            clockCount = chart.ClockCount;
+        }
+
+        var maidata = new Maidata();
+        maidata["title"] = title;
+        maidata["first"] = "0";
+        maidata["clock_count"] = clockCount.ToString();
+        foreach (var (levelId, inote) in inoteBlocks)
+            maidata.AddLevel(levelId, new MaidataChart(inote));
+        File.WriteAllText(outPath, maidata.ToString(), new UTF8Encoding(encoderShouldEmitUTF8Identifier: false));
     }
 
     private static HashSet<int> ParseLevelList(string s)
@@ -133,7 +272,7 @@ private static void PrintAlerts(IReadOnlyList<Alert> alerts, string? header = nu
             Console.Error.WriteLine(a.ToString());
     }
 
-    private static void ConvertMaidata(string text, string outputDir, HashSet<int>? levelFilter)
+    private static void ConvertMaidata(string text, string outputDir, HashSet<int>? levelFilter, string inputPath)
     {
         var maidata = new Maidata(text);
         var ids = maidata.Levels.Keys.OrderBy(k => k).ToList();
@@ -149,34 +288,34 @@ private static void ConvertMaidata(string text, string outputDir, HashSet<int>?
 
         foreach (var id in selected)
         {
+            var outPath = Path.Combine(outputDir, $"lv_{id}.ma2");
+            Console.WriteLine($"Simai → MA2: {inputPath}(lv${id}) → {outPath}");
             var chartInfo = maidata.Levels[id];
             var bigTouch = id is 2 or 3;
             var isUtage = IsUtageFromLevelString(chartInfo.Level);
             var ma2 = SimaiToMa2(chartInfo.Inote, maidata.ClockCount, bigTouch, isUtage);
-            var outPath = Path.Combine(outputDir, $"lv_{id}.ma2");
             File.WriteAllText(outPath, ma2, new UTF8Encoding(encoderShouldEmitUTF8Identifier: false));
         }
     }
 
-    private static void ConvertPlainSimai(string text, string outputDir, HashSet<int>? levelFilter)
+    private static void ConvertPlainSimai(string text, string outputDir, HashSet<int>? levelFilter, string inputPath)
     {
         if (levelFilter != null)
             throw new ArgumentException("纯 simai 单谱（非 maidata）不能使用 -l / --levels。");
 
         const int outputLevel = 0;
-        var ma2 = SimaiToMa2(text);
         var outPath = Path.Combine(outputDir, $"lv_{outputLevel}.ma2");
+        Console.WriteLine($"Simai → MA2: {inputPath}(lv${outputLevel}) → {outPath}");
+        var ma2 = SimaiToMa2(text);
         File.WriteAllText(outPath, ma2, new UTF8Encoding(encoderShouldEmitUTF8Identifier: false));
     }
 
     private static string SimaiToMa2(string inote, int clockCount=4, bool bigTouch=false, bool isUtage=false)
     {
         var (chart, parseAlerts) = new SimaiParser(bigTouch, isUtage, clockCount).Parse(inote);
+        PrintAlerts(parseAlerts);
         var (ma2, genAlerts) = new MA2Generator().Generate(chart);
-        var combined = new List<Alert>(parseAlerts.Count + genAlerts.Count);
-        combined.AddRange(parseAlerts);
-        combined.AddRange(genAlerts);
-        PrintAlerts(combined);
+        PrintAlerts(genAlerts);
         return ma2;
     }
 }
diff --git a/maidata/Maidata.cs b/maidata/Maidata.cs
@@ -3,7 +3,7 @@
 
 namespace MuConvert.maidata;
 
-public record MaidataChart(string? Level, string? NoteDesigner, string Inote);
+public record MaidataChart(string Inote, string? Level = null, string? NoteDesigner = null);
 
 public class Maidata : Dictionary<string, string>
 {
@@ -19,6 +19,15 @@ public class Maidata : Dictionary<string, string>
      * 而由于Maidata类继承自Dictionary，如果用一般的Dict的方法遍历/访问Maidata对象的话，拿到的是整个maidata的、包含inote等在内的所有信息。
      */
     public Dictionary<string, string> Infos => _splitLevels().Item2;
+
+    public void AddLevel(int levelId, MaidataChart maidataChart)
+    {
+        this[$"inote_{levelId}"] = maidataChart.Inote;
+        if (maidataChart.Level != null) this[$"lv_{levelId}"] = maidataChart.Level;
+        if (maidataChart.NoteDesigner != null) this[$"des_{levelId}"] = maidataChart.NoteDesigner;
+    }
+    
+    public Maidata() {}
     
     /**
      * 将maidata.txt的文本传给此函数，即可构造Maidata对象。
@@ -70,7 +79,7 @@ private void _putKey(string? key, StringBuilder content)
                 infos.Remove(k, out var v);
                 infos.Remove($"lv_{id}", out var level);
                 infos.Remove($"des_{id}", out var noteDesigner);
-                levels.Add(id, new MaidataChart(level, noteDesigner, v!));
+                levels.Add(id, new MaidataChart(v!, level, noteDesigner));
             }
         }
         return (levels, infos);
@@ -102,7 +111,7 @@ public override string ToString()
         }
 
         var (levels, infos) = _splitLevels();
-        foreach (var (k, v) in Infos)
+        foreach (var (k, v) in infos)
         {
             if (fixedKeys.Contains(k)) continue; // 刚刚已经输出过了
             result.AppendLine($"&{k}={v}");
diff --git a/parser/simai/SimaiParser.cs b/parser/simai/SimaiParser.cs
@@ -7,7 +7,7 @@
 using static MuConvert.utils.Alert.LEVEL;
 using P = MuConvert.Antlr.SimaiParser;
 
-namespace MuConvert.parser.simai;
+namespace MuConvert.parser;
 
 public class SimaiParser : SimaiBaseVisitor<object>, IParser
 {
diff --git a/tests/自制谱转MA2测试.cs b/tests/自制谱转MA2测试.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using MuConvert.generator;
 using MuConvert.maidata;
-using MuConvert.parser.simai;
+using MuConvert.parser;
 using MuConvert.utils;
 using Xunit.Abstractions;
 using static MuConvert.Tests.TestUtils;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using static MuConvert.utils.Alert.LEVEL;`
`8`	`8`	`using P = MuConvert.Antlr.SimaiParser;`
`9`	`9`
`10`		`-namespace MuConvert.parser.simai;`
	`10`	`+namespace MuConvert.parser;`
`11`	`11`
`12`	`12`	`public class SimaiParser : SimaiBaseVisitor<object>, IParser`
`13`	`13`	`{`