nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-18 07:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lyrics-timing-normalization' into songlyrics-v2-line-end

Browse Source
This commit is contained in:
Claude 2026-10-15 10:02:47 +00:00
commit b787450037
No known key found for this signature in database
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
model/lyrics_lrc.go
View File

@ -56,9 +56,7 @@ func parseLRC(language, text string) (*Lyrics, error) {
var bgEnd *int64
value, cues, bgEnd, merged = mergeBgLayers(value, cues, pendingBg)
hasBg = hasBg || merged
if bgEnd != nil && (end == nil || *bgEnd > *end) {
end = bgEnd
}
end = laterTime(end, bgEnd)
for idx := range timestamps {
startCopy := timestamps[idx]
shift := timestamps[idx] - timestamps[0]
@ -222,9 +220,7 @@ func mergeBgLayers(value string, cues []Cue, bgLines []string) (string, []Cue, *
if len(bgCues) == 0 {
continue
}
if bgEnd != nil && (latestEnd == nil || *bgEnd > *latestEnd) {
latestEnd = bgEnd
}
latestEnd = laterTime(latestEnd, bgEnd)
offset := 0
if value != "" {
offset = len(value) + 1
@ -368,6 +364,14 @@ func stripEnhancedMarkers(text string) string {
return enhancedLRCRegex.ReplaceAllString(text, "")
}
// laterTime returns whichever timestamp is later, treating nil as unknown.
func laterTime(a, b *int64) *int64 {
if a == nil || (b != nil && *b > *a) {
return b
}
return a
}
func shiftELRCTime(value *int64, offsetMs int64) *int64 {
if value == nil {
return nil