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

Compare commits

base: zhaarey:4a4d3c993f30b512607b33c5e722fa6987add0a6
Branches Tags
zhaarey:main
...
compare: zhaarey:c6f5748259636b7f16da12c38cd72a4438a66810
Branches Tags
zhaarey:main

2 Commits
4a4d3c993f ... c6f5748259

Author SHA1 Message Date
ZHAAREY
c6f5748259 Merge pull request #73 from itouakirai/main 
fix: lyrics panic
 2025-08-03 23:42:18 +08:00
itouakirai
aa08ebc0f8 fix: lyrics panic 2025-08-03 20:55:01 +08:00
1 changed files with 12 additions and 8 deletions
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 _, lyric := range item.ChildElements() {
var h, m, s, ms int
if lyric.SelectAttr("begin") == nil {
beginAttr := lyric.SelectAttr("begin")
if beginAttr == nil {
return "", errors.New("no synchronised lyrics")
}
if strings.Contains(lyric.SelectAttr("begin").Value, ":") {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d:%d.%d", &h, &m, &s, &ms)
beginValue := beginAttr.Value
if strings.Contains(beginValue, ":") {
_, err = fmt.Sscanf(beginValue, "%d:%d:%d.%d", &h, &m, &s, &ms)
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 {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d", &m, &s)
_, err = fmt.Sscanf(beginValue, "%d:%d", &m, &s)
}
h = 0
}
} else {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms)
_, err = fmt.Sscanf(beginValue, "%d.%d", &s, &ms)
h, m = 0, 0
}
if err != nil {
@@ -135,7 +137,9 @@ func TtmlToLrc(ttml string) (string, error) {
if len(iTunesMetadata.FindElement("translations").FindElements("translation")) > 0 {
xpath := fmt.Sprintf("//text[@for='%s']", lyric.SelectAttr("itunes:key").Value)
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
}
}