arnef/godeez
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(cli): remove multi-download support for albums/playlists

Browse Source
This commit is contained in:
Mathis Maquenne
2025-05-19 13:59:01 +02:00
parent e50395ae1d
commit adfd71204d
3 changed files with 77 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/download.go
+7 -7
View File
@@ -20,9 +20,9 @@ var downloadCmd = &cobra.Command{
func init() { func init() {
RootCmd.AddCommand(downloadCmd) RootCmd.AddCommand(downloadCmd)
downloadCmd.PersistentFlags().StringVarP(&opts.OutputDir, "output", "o", "", "output directory (default is $HOME/Music/GoDeez)") downloadCmd.PersistentFlags().StringVarP(&opts.OutputDir, "output", "o", "", "output directory (default $HOME/Music/GoDeez)")
downloadCmd.PersistentFlags().StringVarP(&opts.Quality, "quality", "q", "", "download quality [mp3_128, mp3_320, flac, best] (default is best)") downloadCmd.PersistentFlags().StringVarP(&opts.Quality, "quality", "q", "best", "download quality [mp3_128, mp3_320, flac, best]")
downloadCmd.PersistentFlags().DurationVarP(&opts.Timeout, "timeout", "t", 2*time.Minute, "timeout for each download (e.g. 10s, 1m, 2m30s) (default is 2m)") downloadCmd.PersistentFlags().DurationVarP(&opts.Timeout, "timeout", "t", 2*time.Minute, "timeout for each download (e.g. 10s, 1m, 2m30s)")
downloadCmd.AddCommand( downloadCmd.AddCommand(
newDownloadCmd("album"), newDownloadCmd("album"),
@@ -32,9 +32,9 @@ func init() {
func newDownloadCmd(resourceType string) *cobra.Command { func newDownloadCmd(resourceType string) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: fmt.Sprintf("%s [%s_id...]", resourceType, resourceType), Use: fmt.Sprintf("%s <id>", resourceType),
Short: fmt.Sprintf("Download songs from one or more %ss", resourceType), Short: fmt.Sprintf("Download songs from %s", resourceType),
Args: cobra.MinimumNArgs(1), Args: cobra.ExactArgs(1),
PreRunE: func(cmd *cobra.Command, args []string) error { PreRunE: func(cmd *cobra.Command, args []string) error {
return opts.Validate(appCtx.AppDir) return opts.Validate(appCtx.AppDir)
}, },
@@ -42,7 +42,7 @@ func newDownloadCmd(resourceType string) *cobra.Command {
ctx := cmd.Context() ctx := cmd.Context()
dl := downloader.New(appCtx, resourceType) dl := downloader.New(appCtx, resourceType)
if err := dl.Run(ctx, opts, args); err != nil { if err := dl.Run(ctx, opts, args[0]); err != nil {
if errors.Is(err, context.Canceled) { if errors.Is(err, context.Canceled) {
return nil return nil
} }
cmd/root.go
+1 -1
View File
@@ -23,5 +23,5 @@ var RootCmd = &cobra.Command{
} }
func init() { func init() {
RootCmd.PersistentFlags().StringVar(&cfgPath, "config", "", "config file (default is $HOME/.godeez)") RootCmd.PersistentFlags().StringVar(&cfgPath, "config", "", "config file (default $HOME/.godeez)")
} }
internal/downloader/client.go
+5 -13
View File
@@ -40,24 +40,14 @@ func New(appCtx *app.Context, resourceType string) *Client {
} }
} }
func (c *Client) Run(ctx context.Context, opts Options, ids []string) error { func (c *Client) Run(ctx context.Context, opts Options, id string) error {
var err error var err error
c.deezerClient, err = deezer.NewClient(ctx, c.appCtx) c.deezerClient, err = deezer.NewClient(ctx, c.appCtx)
if err != nil { if err != nil {
return err return err
} }
for _, id := range ids {
if ctx.Err() != nil {
return ctx.Err()
}
downloaded := 0
skipped := 0
failed := 0
var resource deezer.Resource var resource deezer.Resource
switch c.resourceType { switch c.resourceType {
case "album": case "album":
resource = &deezer.Album{} resource = &deezer.Album{}
@@ -84,6 +74,10 @@ func (c *Client) Run(ctx context.Context, opts Options, ids []string) error {
startTime := time.Now() startTime := time.Now()
fmt.Printf("%s\n\nStarting download...\n\n", resource) fmt.Printf("%s\n\nStarting download...\n\n", resource)
downloaded := 0
skipped := 0
failed := 0
for i, song := range songs { for i, song := range songs {
if ctx.Err() != nil { if ctx.Err() != nil {
return ctx.Err() return ctx.Err()
@@ -144,8 +138,6 @@ Files saved to: %s
outputDir, outputDir,
) )
}
return nil return nil
} }