mirror of
https://git.sr.ht/~joren/streamrip-go
synced 2026-08-17 09:38:39 +02:00
fix: playlist cover art, compilation tag, and year
- ripPlaylist/ripTrackCollection: pre-fetch playlist artwork once, embed in all tracks - ripTrack: skip per-track album cover when playlist embed is provided - buildTagMetadata: set COMPILATION=1 and year from playlist publish_date - beatport: normalize playlistMetadata to include date fields for year extraction - qobuz: normalize playlist image_rectangle to standard image map
This commit is contained in:
+50
-11
@@ -11,6 +11,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"streamrip-go/internal/artwork"
|
||||
"streamrip-go/internal/audio/convert"
|
||||
@@ -58,6 +59,7 @@ type ripTrackOptions struct {
|
||||
forPlaylist bool
|
||||
playlistName string
|
||||
playlistPos int
|
||||
playlistYear int
|
||||
}
|
||||
|
||||
type folderAudioValues struct {
|
||||
@@ -372,14 +374,22 @@ func (m *Main) ripTrackCollection(ctx context.Context, p provider.Client, source
|
||||
ids = append(ids, id)
|
||||
}
|
||||
}
|
||||
var artRes artwork.Result
|
||||
var playlistYear int
|
||||
if playlistLike {
|
||||
artRes, _ = artwork.Prepare(ctx, m.DL, folder, meta, m.Config.Session.Artwork, true)
|
||||
playlistYear = extractYear(meta)
|
||||
}
|
||||
|
||||
m.logf("%s: %s (%d tracks)\n", kind, name, len(ids))
|
||||
failures := 0
|
||||
runOne := func(i int, trackID string) {
|
||||
opts := ripTrackOptions{albumFolder: folder, index: i, total: len(ids)}
|
||||
opts := ripTrackOptions{albumFolder: folder, albumEmbedCover: artRes.EmbedPath, index: i, total: len(ids)}
|
||||
if playlistLike {
|
||||
opts.forPlaylist = true
|
||||
opts.playlistName = name
|
||||
opts.playlistPos = i
|
||||
opts.playlistYear = playlistYear
|
||||
}
|
||||
if err := m.ripTrack(ctx, p, source, trackID, "", opts); err != nil {
|
||||
failures++
|
||||
@@ -404,11 +414,12 @@ func (m *Main) ripTrackCollection(ctx context.Context, p provider.Client, source
|
||||
go func(pos int, tid string) {
|
||||
defer wg.Done()
|
||||
defer func() { <-sem }()
|
||||
opts := ripTrackOptions{albumFolder: folder, index: pos, total: len(ids)}
|
||||
opts := ripTrackOptions{albumFolder: folder, albumEmbedCover: artRes.EmbedPath, index: pos, total: len(ids)}
|
||||
if playlistLike {
|
||||
opts.forPlaylist = true
|
||||
opts.playlistName = name
|
||||
opts.playlistPos = pos
|
||||
opts.playlistYear = playlistYear
|
||||
}
|
||||
if err := m.ripTrack(ctx, p, source, tid, "", opts); err != nil {
|
||||
mu.Lock()
|
||||
@@ -806,18 +817,24 @@ func (m *Main) ripPlaylist(ctx context.Context, p provider.Client, source, playl
|
||||
}
|
||||
}
|
||||
|
||||
artRes, _ := artwork.Prepare(ctx, m.DL, folder, playlistMeta, m.Config.Session.Artwork, true)
|
||||
|
||||
playlistYear := extractYear(playlistMeta)
|
||||
|
||||
total := len(ids)
|
||||
m.logf("Playlist: %s (%d tracks)\n", name, total)
|
||||
failures := 0
|
||||
|
||||
runOne := func(i int, id string) {
|
||||
opts := ripTrackOptions{
|
||||
albumFolder: folder,
|
||||
index: i,
|
||||
total: total,
|
||||
forPlaylist: true,
|
||||
playlistName: name,
|
||||
playlistPos: i,
|
||||
albumFolder: folder,
|
||||
albumEmbedCover: artRes.EmbedPath,
|
||||
index: i,
|
||||
total: total,
|
||||
forPlaylist: true,
|
||||
playlistName: name,
|
||||
playlistPos: i,
|
||||
playlistYear: playlistYear,
|
||||
}
|
||||
if err := m.ripTrack(ctx, p, source, id, "", opts); err != nil {
|
||||
failures++
|
||||
@@ -843,7 +860,7 @@ func (m *Main) ripPlaylist(ctx context.Context, p provider.Client, source, playl
|
||||
go func(pos int, tid string) {
|
||||
defer wg.Done()
|
||||
defer func() { <-sem }()
|
||||
opts := ripTrackOptions{albumFolder: folder, index: pos, total: total, forPlaylist: true, playlistName: name, playlistPos: pos}
|
||||
opts := ripTrackOptions{albumFolder: folder, albumEmbedCover: artRes.EmbedPath, index: pos, total: total, forPlaylist: true, playlistName: name, playlistPos: pos, playlistYear: playlistYear}
|
||||
if err := m.ripTrack(ctx, p, source, tid, "", opts); err != nil {
|
||||
mu.Lock()
|
||||
failures++
|
||||
@@ -1010,7 +1027,7 @@ func (m *Main) ripTrack(ctx context.Context, p provider.Client, source, id, fall
|
||||
downloaded:
|
||||
|
||||
embedCoverPath := opts.albumEmbedCover
|
||||
if opts.forPlaylist {
|
||||
if opts.forPlaylist && embedCoverPath == "" {
|
||||
parent := opts.albumFolder
|
||||
if parent == "" {
|
||||
parent = filepath.Dir(outPath)
|
||||
@@ -1020,7 +1037,7 @@ downloaded:
|
||||
embedCoverPath = res.EmbedPath
|
||||
}
|
||||
}
|
||||
} else if embedCoverPath == "" {
|
||||
} else if !opts.forPlaylist && embedCoverPath == "" {
|
||||
parent := opts.albumFolder
|
||||
if parent == "" {
|
||||
parent = filepath.Dir(outPath)
|
||||
@@ -1473,7 +1490,9 @@ func buildTagMetadata(trackMeta map[string]any, title, source, trackID string, o
|
||||
Artist: artist,
|
||||
Artists: artistNames,
|
||||
AlbumArtist: albumArtist,
|
||||
Compilation: opts.forPlaylist,
|
||||
OmitDiscTags: opts.forPlaylist,
|
||||
Year: opts.playlistYear,
|
||||
TrackNumber: trackNumber,
|
||||
DiscNumber: discNumber,
|
||||
TrackTotal: trackTotal,
|
||||
@@ -1646,3 +1665,23 @@ func displayArtistNames(names []string) string {
|
||||
return strings.Join(names[:len(names)-1], ", ") + " & " + names[len(names)-1]
|
||||
}
|
||||
}
|
||||
|
||||
func extractYear(meta map[string]any) int {
|
||||
date := jsonutil.FirstNonEmpty(
|
||||
jsonutil.StringFromAny(meta["publish_date"]),
|
||||
jsonutil.StringFromAny(meta["creation_date"]),
|
||||
jsonutil.StringFromAny(meta["created_at"]),
|
||||
jsonutil.StringFromAny(meta["release_date"]),
|
||||
jsonutil.StringFromAny(meta["new_release_date"]),
|
||||
)
|
||||
if date == "" {
|
||||
return 0
|
||||
}
|
||||
if t, err := time.Parse(time.RFC3339, date); err == nil {
|
||||
return t.Year()
|
||||
}
|
||||
if t, err := time.Parse("2006-01-02", date); err == nil {
|
||||
return t.Year()
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user