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

fix: 动态封面质量查找出错

Browse Source
This commit is contained in:
itouakirai 2025-02-12 19:43:08 +08:00
parent 53044d8678
commit 1d524651ce
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
main.go
View File

@ -869,28 +869,6 @@ func rip(albumId string, token string, storefront string, mediaUserToken string,
if Config.SaveAnimatedArtwork && meta.Data[0].Attributes.EditorialVideo.MotionDetailSquare.Video != "" { if Config.SaveAnimatedArtwork && meta.Data[0].Attributes.EditorialVideo.MotionDetailSquare.Video != "" {
fmt.Println("Found Animation Artwork.") fmt.Println("Found Animation Artwork.")
// Download tall version
motionvideoUrlTall, err := extractVideo(meta.Data[0].Attributes.EditorialVideo.MotionDetailTall.Video)
if err != nil {
fmt.Println("no motion video tall.\n", err)
} else {
exists, err := fileExists(filepath.Join(sanAlbumFolder, "animated_artwork_tall.mp4"))
if err != nil {
fmt.Println("Failed to check if animated artwork tall exists.")
}
if exists {
fmt.Println("Animated artwork tall already exists locally.")
} else {
fmt.Println("Animation Artwork Tall Downloading...")
cmd := exec.Command("ffmpeg", "-loglevel", "quiet", "-y", "-i", motionvideoUrlTall, "-c", "copy", filepath.Join(sanAlbumFolder, "animated_artwork_tall.mp4"))
if err := cmd.Run(); err != nil {
fmt.Printf("animated artwork tall dl err: %v\n", err)
} else {
fmt.Println("Animation Artwork Tall Downloaded")
}
}
}
// Download square version // Download square version
motionvideoUrlSquare, err := extractVideo(meta.Data[0].Attributes.EditorialVideo.MotionDetailSquare.Video) motionvideoUrlSquare, err := extractVideo(meta.Data[0].Attributes.EditorialVideo.MotionDetailSquare.Video)
if err != nil { if err != nil {
@ -914,18 +892,34 @@ func rip(albumId string, token string, storefront string, mediaUserToken string,
} }
if Config.EmbyAnimatedArtwork { if Config.EmbyAnimatedArtwork {
// Convert tall version to gif
cmd2 := exec.Command("ffmpeg", "-i", filepath.Join(sanAlbumFolder, "animated_artwork_tall.mp4"), "-vf", "scale=440:-1", "-r", "24", "-f", "gif", filepath.Join(sanAlbumFolder, "folder_tall.jpg"))
if err := cmd2.Run(); err != nil {
fmt.Printf("animated artwork tall to gif err: %v\n", err)
}
// Convert square version to gif // Convert square version to gif
cmd3 := exec.Command("ffmpeg", "-i", filepath.Join(sanAlbumFolder, "animated_artwork_square.mp4"), "-vf", "scale=440:-1", "-r", "24", "-f", "gif", filepath.Join(sanAlbumFolder, "folder_square.jpg")) cmd3 := exec.Command("ffmpeg", "-i", filepath.Join(sanAlbumFolder, "animated_artwork_square.mp4"), "-vf", "scale=440:-1", "-r", "24", "-f", "gif", filepath.Join(sanAlbumFolder, "folder.jpg"))
if err := cmd3.Run(); err != nil { if err := cmd3.Run(); err != nil {
fmt.Printf("animated artwork square to gif err: %v\n", err) fmt.Printf("animated artwork square to gif err: %v\n", err)
} }
} }
// Download tall version
motionvideoUrlTall, err := extractVideo(meta.Data[0].Attributes.EditorialVideo.MotionDetailTall.Video)
if err != nil {
fmt.Println("no motion video tall.\n", err)
} else {
exists, err := fileExists(filepath.Join(sanAlbumFolder, "animated_artwork_tall.mp4"))
if err != nil {
fmt.Println("Failed to check if animated artwork tall exists.")
}
if exists {
fmt.Println("Animated artwork tall already exists locally.")
} else {
fmt.Println("Animation Artwork Tall Downloading...")
cmd := exec.Command("ffmpeg", "-loglevel", "quiet", "-y", "-i", motionvideoUrlTall, "-c", "copy", filepath.Join(sanAlbumFolder, "animated_artwork_tall.mp4"))
if err := cmd.Run(); err != nil {
fmt.Printf("animated artwork tall dl err: %v\n", err)
} else {
fmt.Println("Animation Artwork Tall Downloaded")
}
}
}
} }
trackTotal := len(meta.Data[0].Relationships.Tracks.Data) trackTotal := len(meta.Data[0].Relationships.Tracks.Data)
arr := make([]int, trackTotal) arr := make([]int, trackTotal)
@ -1931,7 +1925,7 @@ func extractVideo(c string) (string, error) {
video := from.(*m3u8.MasterPlaylist) video := from.(*m3u8.MasterPlaylist)
re := regexp.MustCompile(`_(\d+)x(\d+)_`) re := regexp.MustCompile(`_(\d+)x(\d+)`)
var streamUrl *url.URL var streamUrl *url.URL
sort.Slice(video.Variants, func(i, j int) bool { sort.Slice(video.Variants, func(i, j int) bool {

6
utils/structs/structs.go
View File

@ -276,6 +276,12 @@ type AutoGenerated struct {
} `json:"playParams"` } `json:"playParams"`
IsCompilation bool `json:"isCompilation"` IsCompilation bool `json:"isCompilation"`
EditorialVideo struct { EditorialVideo struct {
MotionTall struct {
Video string `json:"video"`
} `json:"motionTallVideo3x4"`
MotionSquare struct {
Video string `json:"video"`
} `json:"motionSquareVideo1x1"`
MotionDetailTall struct { MotionDetailTall struct {
Video string `json:"video"` Video string `json:"video"`
} `json:"motionDetailTall"` } `json:"motionDetailTall"`