[R] 将FirstNoteTime的类型改为Duration，修改一些可见性级别等

Author: Starrah

chart/Chart.cs

@@ -24,6 +24,7 @@ public void Sort()
         Notes = Notes.OrderBy(n => n.Time).ThenBy(n=>n.FalseEachIdx).ToList(); // LINQ OrderBy 是稳定排序
     }
 
+    // 谱面开头的BPM
     public decimal StartBpm {
         get
         {
@@ -32,14 +33,16 @@ public decimal StartBpm {
         }
     }
 
-    public Rational FirstNoteTime => Notes[0].Time;
-
-    public decimal FirstNoteTimeInSeconds => (decimal)Duration.ConvertTime(0, FirstNoteTime, null, 240, BpmList);
-
+    /**
+     * 获得“谱面中第一个音符的时刻”，或者返回的Duration也可以理解成“从谱面开头到出现第一个音符所经过的时长”。
+     * 所以同样的，它也有Bar、InvariantBar、Seconds的不同形态，因此使用Duration的形式存储。
+     */
+    public Duration FirstNoteTime => new(new PseudoNote(this)) {Bar = Notes[0].Time};
+    
     /**
      * 对整首歌曲，应用一个偏移量进行整体平移。
      * <param name="offset">偏移量，正数表示歌曲整体向后，负数表示歌曲整体向前。</param>
-     * <param name="bpm">上述偏移量所对应的Bpm。若不传，默认使用歌曲开头的BPM。</param>
+     * <param name="bpm">上述偏移量所对应的Bpm。若不传，默认使用歌曲开头的BPM（即chart.StartBpm）。</param>
      */
     public void Shift(Rational offset, decimal? bpm = null)
     {
@@ -63,4 +66,12 @@ public void Shift(Rational offset, decimal? bpm = null)
         Utils.Assert(BpmList[0].Time == 0, "BPM列表的开头必须为0时刻");
         Notes = Notes.Select(x => { x.Time += offset; return x; }).Where(x => x.Time >= 0).ToList();
     }
+
+    public bool IsDxChart => Notes.Any(note => // 判定DX谱的标准：存在
+        note is Touch || note.IsEx || (note.IsBreak && note is not Tap) || // Touch 或者 保护套 或者 非Tap/Star的绝赞
+        note is Slide { segments.Count: > 1 }); // 星星段数大于1（fes星星）
+    
+    // TODO 把谱面统计搬到Chart类下面来
+    
+    
 }

chart/Duration.cs

@@ -130,7 +130,7 @@ private Rational ConvertTime(Rational value, Rational? srcBpm, Rational? dstBpm)
         return ConvertTime(startTime, value, srcBpm, dstBpm, BpmList);
     }
 
-    public static Rational ConvertTime(Rational startTime, Rational value, Rational? srcBpm, Rational? dstBpm, BPMList bpmList)
+    internal static Rational ConvertTime(Rational startTime, Rational value, Rational? srcBpm, Rational? dstBpm, BPMList bpmList)
     {
         if (srcBpm != null && dstBpm != null)
         {
@@ -200,5 +200,5 @@ public static Rational ConvertTime(Rational startTime, Rational value, Rational?
         return new Duration(a._note){_type = a._type, _data = (a._data / b).CanonicalForm};
     }
 
-    public string DebuggerDisplay() => _type == Type.Seconds ? $"[#{(float)_data}]" : $"[{_data.Denominator}:{_data.Numerator}]";
+    internal string DebuggerDisplay() => _type == Type.Seconds ? $"[#{(float)_data}]" : $"[{_data.Denominator}:{_data.Numerator}]";
 }

chart/Note.cs

@@ -43,7 +43,7 @@ protected Note(Chart chart, Rational time)
 [DebuggerDisplay("{DebuggerDisplay(),nq}")]
 public class Tap(Chart chart, Rational time) : Note(chart, time)
 {
-    public string DebuggerDisplay() => $"{Key}{Modifiers}";
+    internal string DebuggerDisplay() => $"{Key}{Modifiers}";
 }
 
 [DebuggerDisplay("{DebuggerDisplay(),nq}")]
@@ -100,3 +100,6 @@ public class TouchHold : Touch
 
     private string DebuggerDisplay() => $"{TouchArea}h{Modifiers}{Duration.DebuggerDisplay()}";
 }
+
+// 仅用于内部实现某些trick时使用的“伪音符”。用户在正常的谱面中是不会看到这个的。
+internal class PseudoNote(Chart chart) : Note(chart, 0);

tests/ChartShift测试.cs

@@ -32,7 +32,7 @@ private static Chart LoadChart(out List<Alert> alerts)
 
         Assert.NotEmpty(chart.Notes);
         Assert.NotEmpty(chart.BpmList);
-        Utils.Assert(chart.BpmList[0].Time == 0, "sanity");
+        Assert.True(chart.BpmList[0].Time == 0, "sanity");
         Assert.DoesNotContain(alerts, a => a.Level >= Alert.LEVEL.Error);
         return chart;
     }
@@ -44,7 +44,7 @@ private static Chart LoadChart(out List<Alert> alerts)
 
     private static void AssertShiftResultTimelineValid(Chart c)
     {
-        Utils.Assert(c.BpmList[0].Time == 0, "BPM 起点应在 0");
+        Assert.True(c.BpmList[0].Time == 0, "BPM 起点应在 0");
         foreach (var b in c.BpmList)
             Assert.True(b.Time >= 0);
         foreach (var n in c.Notes)
@@ -125,7 +125,7 @@ public void Shift_Zero()
         chart.Shift(0);
 
         Assert.Equal(startBpm, chart.StartBpm);
-        Utils.Assert(chart.BpmList[0].Time == 0, "BPM 起点应在 0");
+        Assert.True(chart.BpmList[0].Time == 0, "BPM 起点应在 0");
         Assert.Equal(notesBefore, NotesInStableOrder(chart));
         Assert.Equal(bpmsBefore, BpmInOrder(chart));
     }
@@ -153,12 +153,11 @@ public void Shift_NegativeQuarterBar()
         var notesBefore = NotesInStableOrder(chart);
         var bpmsBefore = BpmInOrder(chart);
         var userOffset = -QuarterBar;
-        var appliedBarOffset = -Duration.ConvertTime(Rational.Zero, -userOffset, (Rational)chart.StartBpm, null, chart.BpmList);
 
         chart.Shift(userOffset);
 
         AssertShiftResultTimelineValid(chart);
-        AssertBpmAndNotesMatchPositiveShiftOffset(bpmsBefore, BpmInOrder(chart), notesBefore, NotesInStableOrder(chart), appliedBarOffset);
+        AssertBpmAndNotesMatchPositiveShiftOffset(bpmsBefore, BpmInOrder(chart), notesBefore, NotesInStableOrder(chart), userOffset);
     }
 
     [Fact]

utils/Utils.cs

@@ -7,12 +7,12 @@ namespace MuConvert.utils;
 
 public static class Utils
 {
-    public static void Assert(bool condition, string msg = "")
+    internal static void Assert(bool condition, string msg = "")
     {
         if (!condition) throw new Exception(string.Format(Locale.AssertionFailed, msg));
     }
 
-    public static Exception Fail(string msg = "")
+    internal static Exception Fail(string msg = "")
     {
         return new Exception(string.Format(Locale.AssertionFailed, msg));
     }
@@ -21,7 +21,7 @@ public static Exception Fail(string msg = "")
 
     public static void SetLocale(CultureInfo culture) => Locale.Culture = culture;
 
-    public static void Add<K, V>(this Dictionary<K, List<V>> dict, K key, V value) where K : notnull
+    internal static void Add<K, V>(this Dictionary<K, List<V>> dict, K key, V value) where K : notnull
     {
         if (!dict.ContainsKey(key)) dict[key] = new();
         dict[key].Add(value);