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

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
+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
} }
+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)")
} }
+69 -77
View File
@@ -40,95 +40,89 @@ 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 { var resource deezer.Resource
switch c.resourceType {
case "album":
resource = &deezer.Album{}
case "playlist":
resource = &deezer.Playlist{}
default:
return fmt.Errorf("unsupported resource type: %s", c.resourceType)
}
if err := c.deezerClient.FetchResource(ctx, resource, id); err != nil {
return fmt.Errorf("failed to fetch resource: %w", err)
}
songs := resource.GetSongs()
if len(songs) == 0 {
return fmt.Errorf("%s has no songs", c.resourceType)
}
outputDir := resource.GetOutputDir(opts.OutputDir)
if err := fileutil.EnsureDir(outputDir); err != nil {
return fmt.Errorf("failed to create output directory: %w", err)
}
startTime := time.Now()
fmt.Printf("%s\n\nStarting download...\n\n", resource)
downloaded := 0
skipped := 0
failed := 0
for i, song := range songs {
if ctx.Err() != nil { if ctx.Err() != nil {
return ctx.Err() return ctx.Err()
} }
downloaded := 0 trackProgress := fmt.Sprintf("[%d/%d]", i+1, len(songs))
skipped := 0
failed := 0
var resource deezer.Resource sp := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
sp.Writer = os.Stdout
sp.Prefix = trackProgress + " "
sp.Suffix = fmt.Sprintf(" Downloading: %s - %s", song.Artist, song.Title)
sp.Start()
switch c.resourceType { warnings, err := c.downloadSong(ctx, resource, song, opts, outputDir)
case "album": sp.Stop()
resource = &deezer.Album{}
case "playlist":
resource = &deezer.Playlist{}
default:
return fmt.Errorf("unsupported resource type: %s", c.resourceType)
}
if err := c.deezerClient.FetchResource(ctx, resource, id); err != nil { if err != nil {
return fmt.Errorf("failed to fetch resource: %w", err) if errors.Is(err, context.Canceled) {
} return err
songs := resource.GetSongs()
if len(songs) == 0 {
return fmt.Errorf("%s has no songs", c.resourceType)
}
outputDir := resource.GetOutputDir(opts.OutputDir)
if err := fileutil.EnsureDir(outputDir); err != nil {
return fmt.Errorf("failed to create output directory: %w", err)
}
startTime := time.Now()
fmt.Printf("%s\n\nStarting download...\n\n", resource)
for i, song := range songs {
if ctx.Err() != nil {
return ctx.Err()
} }
trackProgress := fmt.Sprintf("[%d/%d]", i+1, len(songs)) if path, ok := IsSkipError(err); ok {
skipped++
sp := spinner.New(spinner.CharSets[14], 100*time.Millisecond) fmt.Printf("%s ↷ Skipped: %s - %s\n Already exists at: %s\n", trackProgress, song.Artist, song.Title, path)
sp.Writer = os.Stdout
sp.Prefix = trackProgress + " "
sp.Suffix = fmt.Sprintf(" Downloading: %s - %s", song.Artist, song.Title)
sp.Start()
warnings, err := c.downloadSong(ctx, resource, song, opts, outputDir)
sp.Stop()
if err != nil {
if errors.Is(err, context.Canceled) {
return err
}
if path, ok := IsSkipError(err); ok {
skipped++
fmt.Printf("%s ↷ Skipped: %s - %s\n Already exists at: %s\n", trackProgress, song.Artist, song.Title, path)
continue
}
failed++
fmt.Printf("%s ✖ Failed: %s - %s:\n Error: %v\n", trackProgress, song.Artist, song.Title, err)
continue continue
} }
symbol := "✔" failed++
if len(warnings) > 0 { fmt.Printf("%s ✖ Failed: %s - %s:\n Error: %v\n", trackProgress, song.Artist, song.Title, err)
symbol = "⚠" continue
}
downloaded++
fmt.Printf("%s %s Downloaded: %s - %s\n", trackProgress, symbol, song.Artist, song.Title)
for _, w := range warnings {
fmt.Printf(" Warning: %s\n", w)
}
} }
fmt.Printf(` symbol := "✔"
if len(warnings) > 0 {
symbol = "⚠"
}
downloaded++
fmt.Printf("%s %s Downloaded: %s - %s\n", trackProgress, symbol, song.Artist, song.Title)
for _, w := range warnings {
fmt.Printf(" Warning: %s\n", w)
}
}
fmt.Printf(`
================== [ Summary ] ================== ================== [ Summary ] ==================
Downloaded: %d Downloaded: %d
Skipped: %d Skipped: %d
@@ -137,14 +131,12 @@ Elapsed time: %s
Files saved to: %s Files saved to: %s
================================================= =================================================
`, `,
downloaded, downloaded,
skipped, skipped,
failed, failed,
time.Since(startTime).Round(time.Second), time.Since(startTime).Round(time.Second),
outputDir, outputDir,
) )
}
return nil return nil
} }