zhaarey/apple-music-downloader
1
0
Fork 0
mirror of https://github.com/zhaarey/apple-music-downloader.git synced 2025-10-23 15:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: lyrics panic

Browse Source
This commit is contained in:
itouakirai
2025-08-03 20:55:01 +08:00
parent 4a4d3c993f
commit aa08ebc0f8
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/lyrics/lyrics.go
View File

@@ -105,20 +105,22 @@ func TtmlToLrc(ttml string) (string, error) {
for _, item := range parsedTTML.FindElement("tt").FindElement("body").ChildElements() { for _, item := range parsedTTML.FindElement("tt").FindElement("body").ChildElements() {
for _, lyric := range item.ChildElements() { for _, lyric := range item.ChildElements() {
var h, m, s, ms int var h, m, s, ms int
if lyric.SelectAttr("begin") == nil { beginAttr := lyric.SelectAttr("begin")
if beginAttr == nil {
return "", errors.New("no synchronised lyrics") return "", errors.New("no synchronised lyrics")
} }
if strings.Contains(lyric.SelectAttr("begin").Value, ":") { beginValue := beginAttr.Value
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d:%d.%d", &h, &m, &s, &ms) if strings.Contains(beginValue, ":") {
_, err = fmt.Sscanf(beginValue, "%d:%d:%d.%d", &h, &m, &s, &ms)
if err != nil { if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms) _, err = fmt.Sscanf(beginValue, "%d:%d.%d", &m, &s, &ms)
if err != nil { if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d", &m, &s) _, err = fmt.Sscanf(beginValue, "%d:%d", &m, &s)
} }
h = 0 h = 0
} }
} else { } else {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms) _, err = fmt.Sscanf(beginValue, "%d.%d", &s, &ms)
h, m = 0, 0 h, m = 0, 0
} }
if err != nil { if err != nil {
@@ -135,7 +137,9 @@ func TtmlToLrc(ttml string) (string, error) {
if len(iTunesMetadata.FindElement("translations").FindElements("translation")) > 0 { if len(iTunesMetadata.FindElement("translations").FindElements("translation")) > 0 {
xpath := fmt.Sprintf("//text[@for='%s']", lyric.SelectAttr("itunes:key").Value) xpath := fmt.Sprintf("//text[@for='%s']", lyric.SelectAttr("itunes:key").Value)
trans := iTunesMetadata.FindElement("translations").FindElement("translation").FindElement(xpath) trans := iTunesMetadata.FindElement("translations").FindElement("translation").FindElement(xpath)
lyric = trans if trans != nil {
lyric = trans
}
} }
} }
} }
@@ -282,4 +286,4 @@ func conventSyllableTTMLToLRC(ttml string) (string, error) {
} }
} }
return strings.Join(lrcLines, "\n"), nil return strings.Join(lrcLines, "\n"), nil
} }