[F&R] 修复若干问题

Author: Starrah

.gitignore

@@ -8,8 +8,4 @@ riderModule.iml
 .cursor
 /.tmp*
 *scratch*
-*.lscache
-
-# 测试 dump 输出
-*_output.*
-placeholder.txt
+*.lscache

generator/chu/C2sGenerator.cs

@@ -53,8 +53,8 @@ private static C2sChart ConvertToC2s(IChuChart chart, List<Alert> alerts)
             return result;
         }
 
-        alerts.Add(new Alert(Warning, string.Format(Locale.ChuGeneratorUnsupported, "→ C2S")));
-        return new C2sChart();
+        alerts.Add(new Alert(Error, string.Format(Locale.ChuGeneratorUnsupported, "→ C2S")));
+        throw new ConversionException(alerts);
     }
 
     private static ChuNote ScaleNote(ChuNote n, int tpb)

generator/chu/SusGenerator.cs

@@ -13,7 +13,6 @@ namespace MuConvert.chu;
 public class SusGenerator : IGenerator<IChuChart>
 {
     private const int SusTpb = 480;
-    private const int C2sRsl = 384;
 
     public (string, List<Alert>) Generate(IChuChart chart)
     {
@@ -33,26 +32,27 @@ private static SusChart ConvertToSus(IChuChart chart, List<Alert> alerts)
         if (chart is C2sChart c2s)
         {
             bpm = c2s.BpmEvents.Count > 0 ? c2s.BpmEvents[0].Bpm : c2s.DefBpm;
+            int c2sTpb = c2s.Resolution / 4;
             var result = new SusChart { Bpm = bpm, TicksPerBeat = SusTpb, Title = title, Artist = artist };
-            foreach (var n in c2s.Notes) result.Notes.Add(ScaleUp(n));
+            foreach (var n in c2s.Notes) result.Notes.Add(ScaleUp(n, c2sTpb));
             return result;
         }
 
         if (chart is UgcChart ugc)
         {
             bpm = ugc.BpmEvents.Count > 0 ? ugc.BpmEvents[0].Bpm : 120.0;
             var result = new SusChart { Bpm = bpm, TicksPerBeat = SusTpb, Title = ugc.Title, Artist = ugc.Artist };
-            foreach (var n in ugc.Notes) result.Notes.Add(MapLaneOnly(n));
+            foreach (var n in ugc.Notes) result.Notes.Add(ScaleUp(n, ugc.TicksPerBeat));
             return result;
         }
 
-        alerts.Add(new Alert(Warning, string.Format(Locale.ChuGeneratorUnsupported, "→ SUS")));
-        return new SusChart();
+        alerts.Add(new Alert(Error, string.Format(Locale.ChuGeneratorUnsupported, "→ SUS")));
+        throw new ConversionException(alerts);
     }
 
-    private static ChuNote ScaleUp(ChuNote n)
+    private static ChuNote ScaleUp(ChuNote n, int sourceTicksPerBeat)
     {
-        int s(int v) => (int)((long)v * SusTpb / (C2sRsl / 4));
+        int s(int v) => (int)((long)v * SusTpb / sourceTicksPerBeat);
         return new ChuNote
         {
             Type = n.Type, Measure = n.Measure, Offset = s(n.Offset),
@@ -63,15 +63,6 @@ private static ChuNote ScaleUp(ChuNote n)
         };
     }
 
-    private static ChuNote MapLaneOnly(ChuNote n) => new()
-    {
-        Type = n.Type, Measure = n.Measure, Offset = n.Offset,
-        Cell = n.Cell * 2, Width = n.Width * 2,
-        HoldDuration = n.HoldDuration, SlideDuration = n.SlideDuration,
-        EndCell = n.EndCell * 2, EndWidth = n.EndWidth * 2,
-        Extra = n.Extra, TargetNote = n.TargetNote, AirHoldDuration = n.AirHoldDuration,
-    };
-
     private static string Serialize(SusChart sus)
     {
         var sb = new StringBuilder();

generator/chu/UgcGenerator.cs

@@ -45,8 +45,8 @@ private static UgcChart ConvertToUgc(IChuChart chart, List<Alert> alerts)
             return result;
         }
 
-        alerts.Add(new Alert(Warning, string.Format(Locale.ChuGeneratorUnsupported, "→ UGC")));
-        return new UgcChart();
+        alerts.Add(new Alert(Error, string.Format(Locale.ChuGeneratorUnsupported, "→ UGC")));
+        throw new ConversionException(alerts);
     }
 
     private static ChuNote ScaleUpNote(ChuNote n)

tests/chu/ChuTests.cs

@@ -51,29 +51,12 @@ public void UgcToC2sViaGenerator()
     }
 
     [Fact]
-    public void DumpOutputFiles()
+    public void C2sToUgcViaGenerator()
     {
-        var tempDir = Path.Combine(Path.GetTempPath(), "ChuTests", Guid.NewGuid().ToString("N"));
-        Directory.CreateDirectory(tempDir);
-
-        try
-        {
-            if (!File.Exists(UgcPath)) throw new SkipException($"Missing: {UgcPath}");
-            var (ugc, _) = new UgcParser().Parse(File.ReadAllText(UgcPath));
-            var (c2sText, _) = new C2sGenerator().Generate(ugc);
-            File.WriteAllText(Path.Combine(tempDir, "basic_output.c2s"), c2sText);
-
-            if (!File.Exists(C2sPath)) throw new SkipException($"Missing: {C2sPath}");
-            var (c2s, _) = new C2sParser().Parse(File.ReadAllText(C2sPath));
-            var (ugcText, _) = new UgcGenerator().Generate(c2s);
-            File.WriteAllText(Path.Combine(tempDir, "0003_output.ugc"), ugcText);
-
-            Assert.True(File.Exists(Path.Combine(tempDir, "basic_output.c2s")));
-            Assert.True(File.Exists(Path.Combine(tempDir, "0003_output.ugc")));
-        }
-        finally
-        {
-            try { Directory.Delete(tempDir, true); } catch { }
-        }
+        if (!File.Exists(C2sPath)) throw new SkipException($"Missing: {C2sPath}");
+        var (c2s, _) = new C2sParser().Parse(File.ReadAllText(C2sPath));
+        var (ugcText, _) = new UgcGenerator().Generate(c2s);
+        Assert.Contains("@VER", ugcText);
+        Assert.Contains("#5'0", ugcText);
     }
 }