sim1222/apple-music-downloader-server
1
0
Fork 0
forked from sim1222-mirror/apple-music-downloader
Code Pull Requests Activity

Merge pull request #4 from WorldObservationLog/main

Browse Source 
fix: panic when the resp data of lyrics is empty
This commit is contained in:
zhaarey 2024-04-24 12:42:28 +08:00 committed by GitHub
commit e0520a9400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -1013,7 +1013,11 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
defer do.Body.Close() defer do.Body.Close()
obj := new(SongLyrics) obj := new(SongLyrics)
err = json.NewDecoder(do.Body).Decode(&obj) err = json.NewDecoder(do.Body).Decode(&obj)
return obj.Data[0].Attributes.Ttml, nil if obj.Data != nil {
return obj.Data[0].Attributes.Ttml, nil
} else {
return "", errors.New("failed to get lyrics")
}
} }
func writeCover(sanAlbumFolder, url string) error { func writeCover(sanAlbumFolder, url string) error {
@ -1159,7 +1163,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Sprintf("cover=%s/cover.jpg", sanAlbumFolder), fmt.Sprintf("cover=%s/cover.jpg", sanAlbumFolder),
} }
tagsString := strings.Join(tags, ":") tagsString := strings.Join(tags, ":")
cmd := exec.Command("MP4Box","-itags", tagsString, trackPath) cmd := exec.Command("MP4Box", "-itags", tagsString, trackPath)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
fmt.Printf("Embed failed: %v\n", err) fmt.Printf("Embed failed: %v\n", err)
continue continue

6
main_atmos.go
View File

@ -1019,7 +1019,11 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
defer do.Body.Close() defer do.Body.Close()
obj := new(SongLyrics) obj := new(SongLyrics)
err = json.NewDecoder(do.Body).Decode(&obj) err = json.NewDecoder(do.Body).Decode(&obj)
return obj.Data[0].Attributes.Ttml, nil if obj.Data != nil {
return obj.Data[0].Attributes.Ttml, nil
} else {
return "", errors.New("failed to get lyrics")
}
} }
func writeCover(sanAlbumFolder, url string) error { func writeCover(sanAlbumFolder, url string) error {

8
main_select.go
View File

@ -1012,7 +1012,11 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
defer do.Body.Close() defer do.Body.Close()
obj := new(SongLyrics) obj := new(SongLyrics)
err = json.NewDecoder(do.Body).Decode(&obj) err = json.NewDecoder(do.Body).Decode(&obj)
return obj.Data[0].Attributes.Ttml, nil if obj.Data != nil {
return obj.Data[0].Attributes.Ttml, nil
} else {
return "", errors.New("failed to get lyrics")
}
} }
func writeCover(sanAlbumFolder, url string) error { func writeCover(sanAlbumFolder, url string) error {
@ -1194,7 +1198,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Sprintf("cover=%s/cover.jpg", sanAlbumFolder), fmt.Sprintf("cover=%s/cover.jpg", sanAlbumFolder),
} }
tagsString := strings.Join(tags, ":") tagsString := strings.Join(tags, ":")
cmd := exec.Command("MP4Box","-itags", tagsString, trackPath) cmd := exec.Command("MP4Box", "-itags", tagsString, trackPath)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
fmt.Printf("Embed failed: %v\n", err) fmt.Printf("Embed failed: %v\n", err)
continue continue