Merge branch 'dev' into plugin

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.2.253.0" />
+	  Version="1.2.256.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs

@@ -19,9 +19,10 @@ namespace BetterLyrics.WinUI3.Extensions
                         new LyricsLine
                         {
                             StartMs = 0,
-                            EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                            EndMs = (int)TimeSpan.FromSeconds(30).TotalMilliseconds,
                             PrimaryText = "● ● ●",
-                            PrimarySyllables = [new BaseLyrics { Text = "● ● ●", StartMs = 0, EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds }],
+                            PrimarySyllables = [new BaseLyrics { Text = "● ● ●", StartMs = 0, EndMs = (int)TimeSpan.FromSeconds(30).TotalMilliseconds }],
+                            IsPrimaryHasRealSyllableInfo = true,
                         },
                     ],
                     LanguageCode = "N/A",

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -68,11 +68,17 @@ namespace BetterLyrics.WinUI3.Logic
             for (int i = safeStart; i <= safeEnd; i++)
             {
                 var line = lines[i];
-
                 var lineHeight = line.PrimaryLineHeight;
-
                 if (lineHeight == null || lineHeight <= 0) continue;
 
+                bool isWordAnimationEnabled = lyricsEffect.WordByWordEffectMode switch
+                {
+                    Enums.WordByWordEffectMode.Auto => line.IsPrimaryHasRealSyllableInfo,
+                    Enums.WordByWordEffectMode.Always => true,
+                    Enums.WordByWordEffectMode.Never => false,
+                    _ => line.IsPrimaryHasRealSyllableInfo
+                };
+
                 double targetCharFloat = lyricsEffect.IsLyricsFloatAnimationAmountAutoAdjust
                     ? lineHeight.Value * 0.1
                     : lyricsEffect.LyricsFloatAnimationAmount;
@@ -83,7 +89,7 @@ namespace BetterLyrics.WinUI3.Logic
                     ? 1.15
                     : lyricsEffect.LyricsScaleEffectAmount / 100.0;
 
-                var maxAnimationDurationMs = Math.Max(line.EndMs - currentPositionMs, 0);
+                var maxAnimationDurationMs = Math.Max(line.EndMs ?? 0 - currentPositionMs, 0);
 
                 bool isSecondaryLinePlaying = line.GetIsPlaying(currentPositionMs);
                 bool isSecondaryLinePlayingChanged = line.IsPlayingLastFrame != isSecondaryLinePlaying;
@@ -176,7 +182,7 @@ namespace BetterLyrics.WinUI3.Logic
                     line.AngleTransition.SetDelay(yScrollDelay);
                     line.AngleTransition.Start(
                         (isFanEnabled && !isMouseScrolling) ?
-                        Math.PI * (fanAngleRad / 180.0) * distanceFactor * (i > primaryPlayingLineIndex ? 1 : -1) :
+                        fanAngleRad * distanceFactor * (i > primaryPlayingLineIndex ? 1 : -1) :
                         0);
 
                     line.YOffsetTransition.SetEasingType(canvasYScrollTransition.EasingType);
@@ -187,7 +193,9 @@ namespace BetterLyrics.WinUI3.Logic
                     line.YOffsetTransition.Start(targetYScrollOffset);
                 }
 
-                if (isLayoutChanged || isSecondaryLinePlayingChanged)
+                if (isWordAnimationEnabled)
+                {
+                    if (isSecondaryLinePlayingChanged)
                     {
                         // 辉光动画
                         if (isGlowEnabled && lyricsEffect.LyricsGlowEffectScope == Enums.LyricsEffectScope.LineStartToCurrentChar
@@ -275,11 +283,11 @@ namespace BetterLyrics.WinUI3.Logic
                         }
                     }
 
-                // 使动画步进一帧
                     foreach (var renderChar in line.PrimaryRenderChars)
                     {
                         renderChar.Update(elapsedTime);
                     }
+                }
 
                 line.Update(elapsedTime);
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs

@@ -215,7 +215,7 @@ namespace BetterLyrics.WinUI3.Logic
                     lanesEndMs.Add(0);
                 }
 
-                lanesEndMs[assignedLane] = end;
+                lanesEndMs[assignedLane] = end ?? 0;
                 line.LaneIndex = assignedLane;
             }
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsSynchronizer.cs

@@ -74,7 +74,7 @@ namespace BetterLyrics.WinUI3.Logic
 
             if (line == null) return state;
 
-            double lineEndMs = line.EndMs;
+            double lineEndMs = line.EndMs ?? 0;
 
             // 还没到
             if (currentTimeMs < line.StartMs) return state;
@@ -91,7 +91,7 @@ namespace BetterLyrics.WinUI3.Logic
             switch (wordByWordEffectMode)
             {
                 case WordByWordEffectMode.Auto:
-                    if (line.PrimaryRenderSyllables.Count > 1)
+                    if (line.IsPrimaryHasRealSyllableInfo)
                     {
                         return CalculateSyllableProgress(currentTimeMs, line, lineEndMs);
                     }
@@ -106,7 +106,7 @@ namespace BetterLyrics.WinUI3.Logic
                     state.SyllableProgress = 1f;
                     return state;
                 case WordByWordEffectMode.Always:
-                    if (line.PrimaryRenderSyllables.Count > 1)
+                    if (line.IsPrimaryHasRealSyllableInfo)
                     {
                         return CalculateSyllableProgress(currentTimeMs, line, lineEndMs);
                     }
@@ -129,8 +129,7 @@ namespace BetterLyrics.WinUI3.Logic
                 var timing = line.PrimaryRenderSyllables[i];
                 var nextTiming = (i + 1 < count) ? line.PrimaryRenderSyllables[i + 1] : null;
 
-                //double timingEndMs = timing.EndMs ?? nextTiming?.StartMs ?? lineEndMs;
+                double timingEndMs = timing.EndMs ?? 0;
-                double timingEndMs = timing.EndMs;
 
                 // 在当前字范围内
                 if (time >= timing.StartMs && time <= timingEndMs)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/BaseLyrics.cs

@@ -7,8 +7,8 @@ namespace BetterLyrics.WinUI3.Models.Lyrics
     public class BaseLyrics
     {
         public int StartMs { get; set; }
-        public int EndMs { get; set; }
+        public int? EndMs { get; set; } = null;
-        public int DurationMs => EndMs - StartMs;
+        public int DurationMs => Math.Max((EndMs ?? 0) - StartMs, 0);
 
         public string Text { get; set; } = "";
         public int Length => Text.Length;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/LyricsLine.cs

@@ -22,6 +22,8 @@ namespace BetterLyrics.WinUI3.Models.Lyrics
         public new string Text => PrimaryText;
         public new int StartIndex = 0;
 
+        public bool IsPrimaryHasRealSyllableInfo { get; set; } = false;
+
         public LyricsLine()
         {
             for (int charStartIndex = 0; charStartIndex < PrimaryText.Length; charStartIndex++)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Lyrics/RenderLyricsLine.cs

@@ -76,6 +76,8 @@ namespace BetterLyrics.WinUI3.Models.Lyrics
 
         public double? PrimaryLineHeight => PrimaryRenderChars.FirstOrDefault()?.LayoutRect.Height;
 
+        public bool IsPrimaryHasRealSyllableInfo { get; set; }
+
         public RenderLyricsLine(LyricsLine lyricsLine) : base(lyricsLine)
         {
             AngleTransition = new(
@@ -130,6 +132,7 @@ namespace BetterLyrics.WinUI3.Models.Lyrics
             PrimaryText = lyricsLine.PrimaryText;
             SecondaryText = lyricsLine.SecondaryText;
             PrimaryRenderSyllables = lyricsLine.PrimarySyllables.Select(x => new RenderLyricsSyllable(x)).ToList();
+            IsPrimaryHasRealSyllableInfo = lyricsLine.IsPrimaryHasRealSyllableInfo;
         }
 
         public void UpdateCenterPosition(double maxWidth, TextAlignmentType type)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Lrc.cs

@@ -40,26 +40,14 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                     startIndex += text.Length;
                 }
 
-                int lineEndMs = 0;
-
-                if (syllables.Count > 0)
-                {
-                    var lastSyllable = syllables[syllables.Count - 1];
-                    if (string.IsNullOrWhiteSpace(lastSyllable.Text))
-                    {
-                        lineEndMs = lastSyllable.StartMs;
-                        syllables.RemoveAt(syllables.Count - 1);
-                    }
-                }
-
                 if (syllables.Count > 1)
                 {
                     lrcLines.Add(new LyricsLine
                     {
                         StartMs = syllables[0].StartMs,
-                        EndMs = lineEndMs,
                         PrimaryText = string.Concat(syllables.Select(s => s.Text)),
-                        PrimarySyllables = syllables
+                        PrimarySyllables = syllables,
+                        IsPrimaryHasRealSyllableInfo = true
                     });
                 }
                 else
@@ -81,7 +69,13 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                         content = bracketRegex!.Replace(line, "").Trim();
                         if (content == "//") content = "";
 
-                        lrcLines.Add(new LyricsLine { StartMs = lineStartMs, PrimaryText = content });
+                        var lyricsLine = new LyricsLine
+                        {
+                            StartMs = lineStartMs,
+                            PrimaryText = content,
+                            IsPrimaryHasRealSyllableInfo = false
+                        };
+                        lrcLines.Add(lyricsLine);
                     }
                 }
             }
@@ -125,5 +119,6 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 }
             }
         }
+
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.QrcKrc.cs

@@ -21,9 +21,8 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                     var lineWrite = new LyricsLine
                     {
                         StartMs = lineRead.StartTime ?? 0,
-                        EndMs = lineRead.EndTime ?? (nextLineRead?.StartTime ?? 0),
                         PrimaryText = lineRead.Text,
-                        PrimarySyllables = [],
+                        IsPrimaryHasRealSyllableInfo = true,
                     };
 
                     var syllables = (lineRead as Lyricify.Lyrics.Models.SyllableLineInfo)?.Syllables;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.Ttml.cs

@@ -127,7 +127,8 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 StartMs = containerStartMs,
                 EndMs = containerEndMs,
                 PrimaryText = fullOriginalText,
-                PrimarySyllables = syllables
+                PrimarySyllables = syllables,
+                IsPrimaryHasRealSyllableInfo = true,
             });
 
             var transSpan = container.Elements()
@@ -151,7 +152,8 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 {
                     StartMs = startMs,
                     EndMs = endMs,
-                    PrimaryText = text
+                    PrimaryText = text,
+                    IsPrimaryHasRealSyllableInfo = false,
                 });
             }
             else
@@ -160,7 +162,8 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
                 {
                     StartMs = startMs,
                     EndMs = endMs,
-                    PrimaryText = ""
+                    PrimaryText = "",
+                    IsPrimaryHasRealSyllableInfo = false,
                 });
             }
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Parsers/LyricsParser/LyricsParser.cs

@@ -69,6 +69,9 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
             LoadTransliteration(lyricsSearchResult);
             GenerateTransliterationLyricsData();
 
+            EnsureEndMs(lyricsSearchResult?.Duration);
+            EnsureSyllables();
+
             return _lyricsDataArr;
         }
 
@@ -271,5 +274,84 @@ namespace BetterLyrics.WinUI3.Parsers.LyricsParser
             }
         }
 
+        private void EnsureEndMs(double? duration)
+        {
+            foreach (var lyricsData in _lyricsDataArr)
+            {
+                var lines = lyricsData.LyricsLines;
+                // 计算结束时间
+                for (int i = 0; i < lines.Count; i++)
+                {
+                    // 计算行结束时间
+                    if (lines[i].EndMs == null)
+                    {
+                        if (i + 1 < lines.Count)
+                        {
+                            lines[i].EndMs = lines[i + 1].StartMs;
+                        }
+                        else
+                        {
+                            lines[i].EndMs = (int)(duration ?? 0) * 1000;
+                        }
+                    }
+                    // 计算音节结束时间
+                    for (int j = 0; j < lines[i].PrimarySyllables.Count; j++)
+                    {
+                        var syllable = lines[i].PrimarySyllables[j];
+                        if (syllable.EndMs == null)
+                        {
+                            if (j < lines[i].PrimarySyllables.Count - 1)
+                            {
+                                syllable.EndMs = lines[i].PrimarySyllables[j + 1].StartMs;
+                            }
+                            else
+                            {
+                                syllable.EndMs = lines[i].EndMs;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invoke this after <see cref="EnsureEndMs"/>
+        /// </summary>
+        private void EnsureSyllables()
+        {
+            foreach (var lyricsData in _lyricsDataArr)
+            {
+                if (lyricsData == null) continue;
+
+                var lines = lyricsData.LyricsLines;
+                if (lines == null) continue;
+
+                foreach (var line in lines)
+                {
+                    if (line == null) continue;
+                    if (line.IsPrimaryHasRealSyllableInfo) continue;
+                    if (line.PrimarySyllables.Count > 0) continue;
+
+                    var content = line.PrimaryText;
+                    var length = content.Length;
+                    if (length == 0) continue;
+
+                    var avgSyllableDuration = line.DurationMs / length;
+                    if (avgSyllableDuration == 0) continue;
+
+                    for (int j = 0; j < length; j++)
+                    {
+                        line.PrimarySyllables.Add(new BaseLyrics
+                        {
+                            Text = content[j].ToString(),
+                            StartIndex = j,
+                            StartMs = line.StartMs + avgSyllableDuration * j,
+                            EndMs = line.StartMs + avgSyllableDuration * (j + 1),
+                        });
+                    }
+                }
+            }
+        }
+
     }
 }

README.CN.md

@@ -1,4 +1,4 @@
-[**中文**](README.CN.md) | [**English**](README.md)
+**中文** | [**English**](README.md)
 
 <div align="center">
   <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="Logo" width="120">

README.md

@@ -1,4 +1,4 @@
-[**中文**](README.CN.md) | [**English**](README.md)
+[**中文**](README.CN.md) | **English**
 
 <div align="center">
   <img src="BetterLyrics.WinUI3/BetterLyrics.WinUI3/Assets/Logo.png" alt="Logo" width="120">