feat(cli): add quality flag
This commit is contained in:
+36
-8
@@ -12,15 +12,26 @@ import (
|
|||||||
var downloadCmd = &cobra.Command{
|
var downloadCmd = &cobra.Command{
|
||||||
Use: "download [album_id...]",
|
Use: "download [album_id...]",
|
||||||
Short: "Download songs from one or more albums",
|
Short: "Download songs from one or more albums",
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
if len(args) == 0 {
|
|
||||||
cmd.Help()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
output, _ := cmd.Flags().GetString("output")
|
output, _ := cmd.Flags().GetString("output")
|
||||||
|
quality, _ := cmd.Flags().GetString("quality")
|
||||||
nAlbums := len(args)
|
nAlbums := len(args)
|
||||||
|
|
||||||
|
if quality == "" {
|
||||||
|
quality = "best"
|
||||||
|
}
|
||||||
|
validQualities := map[string]bool{
|
||||||
|
"mp3_128": true,
|
||||||
|
"mp3_320": true,
|
||||||
|
"flac": true,
|
||||||
|
"best": true,
|
||||||
|
}
|
||||||
|
if !validQualities[quality] {
|
||||||
|
fmt.Fprintf(os.Stderr, "invalid quality option: %s\n", quality)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
for i, id := range args {
|
for i, id := range args {
|
||||||
fmt.Printf("[%d/%d] Getting data for album %s...", i+1, nAlbums, id)
|
fmt.Printf("[%d/%d] Getting data for album %s...", i+1, nAlbums, id)
|
||||||
album, err := deezer.GetAlbumData(id)
|
album, err := deezer.GetAlbumData(id)
|
||||||
@@ -42,7 +53,7 @@ var downloadCmd = &cobra.Command{
|
|||||||
|
|
||||||
for _, song := range album.Songs.Data {
|
for _, song := range album.Songs.Data {
|
||||||
fmt.Printf("\nDownloading %s...", song.Title)
|
fmt.Printf("\nDownloading %s...", song.Title)
|
||||||
media, err := song.GetMediaData()
|
media, err := song.GetMediaData(quality)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, " could not get media data: %v\n", err)
|
fmt.Fprintf(os.Stderr, " could not get media data: %v\n", err)
|
||||||
if err.Error() == "invalid license token" {
|
if err.Error() == "invalid license token" {
|
||||||
@@ -51,13 +62,29 @@ var downloadCmd = &cobra.Command{
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(media.Data) == 0 || len(media.Data[0].Media) == 0 || len(media.Data[0].Media[0].Sources) == 0 {
|
||||||
|
fmt.Fprintf(os.Stderr, " could not get media sources\n")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
url := media.Data[0].Media[0].Sources[0].URL
|
||||||
|
for _, source := range media.Data[0].Media[0].Sources {
|
||||||
|
if source.Provider == "ak" {
|
||||||
|
url = source.URL
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
songTitle := song.Title
|
songTitle := song.Title
|
||||||
if song.Version != "" {
|
if song.Version != "" {
|
||||||
songTitle = fmt.Sprintf("%s %s", song.Title, song.Version)
|
songTitle = fmt.Sprintf("%s %s", song.Title, song.Version)
|
||||||
}
|
}
|
||||||
|
ext := "mp3"
|
||||||
|
if media.Data[0].Media[0].Format == "FLAC" {
|
||||||
|
ext = "flac"
|
||||||
|
}
|
||||||
|
|
||||||
path := path.Join(output, fmt.Sprintf("%s - %s.flac", song.ArtistName, songTitle))
|
path := path.Join(output, fmt.Sprintf("%s - %s.%s", song.ArtistName, songTitle, ext))
|
||||||
err = media.Download(path, song.ID)
|
err = media.Download(url, path, song.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, " could not download song: %v\n", err)
|
fmt.Fprintf(os.Stderr, " could not download song: %v\n", err)
|
||||||
continue
|
continue
|
||||||
@@ -71,4 +98,5 @@ var downloadCmd = &cobra.Command{
|
|||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(downloadCmd)
|
rootCmd.AddCommand(downloadCmd)
|
||||||
downloadCmd.Flags().StringP("output", "o", "", "output directory (default is current directory)")
|
downloadCmd.Flags().StringP("output", "o", "", "output directory (default is current directory)")
|
||||||
|
downloadCmd.Flags().StringP("quality", "q", "", "download quality [mp3_128, mp3_320, flac, best] (default is best)")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,19 +36,7 @@ type Source struct {
|
|||||||
|
|
||||||
const ChunkSize = 2048
|
const ChunkSize = 2048
|
||||||
|
|
||||||
func (m *Media) Download(path, songID string) error {
|
func (m *Media) Download(url, path, songID string) error {
|
||||||
if len(m.Data) == 0 || len(m.Data[0].Media) == 0 || len(m.Data[0].Media[0].Sources) == 0 {
|
|
||||||
return fmt.Errorf("no media sources found")
|
|
||||||
}
|
|
||||||
|
|
||||||
url := m.Data[0].Media[0].Sources[0].URL
|
|
||||||
for _, source := range m.Data[0].Media[0].Sources {
|
|
||||||
if source.Provider == "ak" {
|
|
||||||
url = source.URL
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resp, err := http.Get(url)
|
resp, err := http.Get(url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
+14
-2
@@ -18,9 +18,21 @@ type Song struct {
|
|||||||
TrackToken string `json:"TRACK_TOKEN"`
|
TrackToken string `json:"TRACK_TOKEN"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Song) GetMediaData() (*Media, error) {
|
func (s *Song) GetMediaData(quality string) (*Media, error) {
|
||||||
reqBody := fmt.Sprintf(`{"license_token":"%s","media":[{"type":"FULL","formats":[{"cipher":"BF_CBC_STRIPE","format":"FLAC"}]}],"track_tokens":["%s"]}`, config.Cfg.LicenseToken, s.TrackToken)
|
var formats string
|
||||||
|
|
||||||
|
switch quality {
|
||||||
|
case "mp3_128":
|
||||||
|
formats = `[{"cipher":"BF_CBC_STRIPE","format":"MP3_128"}]`
|
||||||
|
case "mp3_320":
|
||||||
|
formats = `[{"cipher":"BF_CBC_STRIPE","format":"MP3_320"}]`
|
||||||
|
case "flac":
|
||||||
|
formats = `[{"cipher":"BF_CBC_STRIPE","format":"FLAC"}]`
|
||||||
|
case "best":
|
||||||
|
formats = `[{"cipher":"BF_CBC_STRIPE","format":"FLAC"},{"cipher":"BF_CBC_STRIPE","format":"MP3_320"},{"cipher":"BF_CBC_STRIPE","format":"MP3_128"}]`
|
||||||
|
}
|
||||||
|
|
||||||
|
reqBody := fmt.Sprintf(`{"license_token":"%s","media":[{"type":"FULL","formats":%s}],"track_tokens":["%s"]}`, config.Cfg.LicenseToken, formats, s.TrackToken)
|
||||||
resp, err := http.Post("https://media.deezer.com/v1/get_url", "application/json", bytes.NewBuffer([]byte(reqBody)))
|
resp, err := http.Post("https://media.deezer.com/v1/get_url", "application/json", bytes.NewBuffer([]byte(reqBody)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
Reference in New Issue
Block a user