mirror of
https://github.com/navidrome/navidrome.git
synced 2026-11-08 11:18:41 +01:00
d15d85ad0c
bestImageURL selected the largest by size and only then parsed it, so a malformed largest URL (e.g. a bad percent-escape) returned nil and shadowed a valid smaller candidate, contradicting the documented skip-unparseable behavior. Parse per candidate and compare sizes only among URLs that parse.
102 lines
3.3 KiB
Go
102 lines
3.3 KiB
Go
package artwork
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net/url"
|
|
|
|
"github.com/navidrome/navidrome/core/agents"
|
|
"github.com/navidrome/navidrome/model"
|
|
)
|
|
|
|
// gateFunc gates one named external fetch (rate limit + circuit breaker per name).
|
|
// resolveItem defaults to passthroughGate; the worker injects the per-agent gate.
|
|
type gateFunc = func(name string, f func() (io.ReadCloser, string, error)) (io.ReadCloser, string, error)
|
|
|
|
func passthroughGate(_ string, f func() (io.ReadCloser, string, error)) (io.ReadCloser, string, error) {
|
|
return f()
|
|
}
|
|
|
|
// denyGate refuses every external fetch with a definitive not-found, so local-only
|
|
// resolution never runs a network step even if an external branch is reached.
|
|
func denyGate(_ string, _ func() (io.ReadCloser, string, error)) (io.ReadCloser, string, error) {
|
|
return nil, "", model.ErrNotFound
|
|
}
|
|
|
|
// bestImageURL returns the largest-Size image URL, skipping empty or unparseable
|
|
// URLs; nil when none qualifies. Parsing happens per candidate so a malformed largest
|
|
// URL never shadows a valid smaller one.
|
|
func bestImageURL(imgs []agents.ExternalImage) *url.URL {
|
|
var best *url.URL
|
|
var bestSize int
|
|
for i := range imgs {
|
|
if imgs[i].URL == "" {
|
|
continue
|
|
}
|
|
u, err := url.Parse(imgs[i].URL)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if best == nil || imgs[i].Size > bestSize {
|
|
best, bestSize = u, imgs[i].Size
|
|
}
|
|
}
|
|
return best
|
|
}
|
|
|
|
// fetchArtistImage tries each enabled artist-image agent in order, each under its own gate.
|
|
// Returns the winning reader + agent name; extErr is true only when NO agent succeeded and
|
|
// at least one failed transiently (a later success beats an earlier agent error).
|
|
func fetchArtistImage(ctx context.Context, ag *agents.Agents, gate gateFunc, ar model.Artist) (r io.ReadCloser, agentName string, extErr bool) {
|
|
for _, a := range ag.ArtistImageAgents() {
|
|
reader, _, err := gate(a.Name, func() (io.ReadCloser, string, error) {
|
|
imgs, err := a.Retriever.GetArtistImages(ctx, ar.ID, ar.Name, ar.MbzArtistID)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
u := bestImageURL(imgs)
|
|
if u == nil {
|
|
return nil, "", agents.ErrNotFound
|
|
}
|
|
return fromURL(ctx, u)
|
|
})
|
|
if reader != nil {
|
|
return reader, a.Name, false
|
|
}
|
|
if isTransientExternal(err) {
|
|
extErr = true // includes errBreakerOpen and download failures: retry via the next agent
|
|
}
|
|
}
|
|
return nil, "", extErr
|
|
}
|
|
|
|
// fetchAlbumImage is the album counterpart of fetchArtistImage.
|
|
func fetchAlbumImage(ctx context.Context, ag *agents.Agents, gate gateFunc, al model.Album) (r io.ReadCloser, agentName string, extErr bool) {
|
|
for _, a := range ag.AlbumImageAgents() {
|
|
reader, _, err := gate(a.Name, func() (io.ReadCloser, string, error) {
|
|
imgs, err := a.Retriever.GetAlbumImages(ctx, al.Name, al.AlbumArtist, al.MbzAlbumID)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
u := bestImageURL(imgs)
|
|
if u == nil {
|
|
return nil, "", agents.ErrNotFound
|
|
}
|
|
return fromURL(ctx, u)
|
|
})
|
|
if reader != nil {
|
|
return reader, a.Name, false
|
|
}
|
|
if isTransientExternal(err) {
|
|
extErr = true
|
|
}
|
|
}
|
|
return nil, "", extErr
|
|
}
|
|
|
|
// isTransientExternal reports whether an external step failed in a way worth retrying;
|
|
// a not-found (from either package) is a definitive answer, not a fault.
|
|
func isTransientExternal(err error) bool {
|
|
return err != nil && !errors.Is(err, agents.ErrNotFound) && !errors.Is(err, model.ErrNotFound)
|
|
}
|