remote/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-10-13 21:07:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor(lyrics): collapse ParseLyrics suffix/sniff branches into one loop

Browse source 
Both modes differ only in which formats to try, so select candidates in a
single loop (all formats when sniffing, the suffix's own otherwise) and run
them through parseFirstMatch once. Drops the projected-slice make+index and
the ContainsFunc closure; unmatched suffixes yield no candidates and fall to
the plain-text floor, as before.
This commit is contained in:
Deluan 2026-06-19 16:28:13 -04:00
commit 77befad0de
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
model/lyrics_parse.go
View file

@ -34,20 +34,17 @@ var lyricFormats = []struct {
// a structured parser that does not match falls back to the LRC/plain-text floor.
func ParseLyrics(suffix, lang string, contents []byte) (LyricList, error) {
contents = stripBOM(contents)
sniff := suffix == "" || strings.EqualFold(suffix, "auto")
if suffix == "" || strings.EqualFold(suffix, "auto") {
candidates := make([]lyricParser, len(lyricFormats))
for i, f := range lyricFormats {
candidates[i] = f.parse
}
return parseFirstMatch(lang, contents, candidates...)
}
// Sniffing tries every format in order; a known suffix selects just its own.
// Unmatched suffixes leave no candidates, so parseFirstMatch falls to plain.
var candidates []lyricParser
for _, f := range lyricFormats {
if slices.ContainsFunc(f.suffixes, func(s string) bool { return strings.EqualFold(s, suffix) }) {
return parseFirstMatch(lang, contents, f.parse)
if sniff || slices.Contains(f.suffixes, strings.ToLower(suffix)) {
candidates = append(candidates, f.parse)
}
}
return plainLRC(lang, contents)
return parseFirstMatch(lang, contents, candidates...)
}
func parseFirstMatch(lang string, contents []byte, candidates ...lyricParser) (LyricList, error) {