Don't try to connect to external services if artist is Unknown

This commit is contained in:
Deluan 2023-02-02 10:57:37 -05:00
parent f4b50c493c
commit cf04db7a98
1 changed files with 20 additions and 2 deletions

View File

@ -5,10 +5,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/conf" "github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/consts"
"github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/utils" "github.com/navidrome/navidrome/utils"
) )
@ -42,6 +42,9 @@ func (a *Agents) AgentName() string {
} }
func (a *Agents) GetArtistMBID(ctx context.Context, id string, name string) (string, error) { func (a *Agents) GetArtistMBID(ctx context.Context, id string, name string) (string, error) {
if id == consts.UnknownArtistID {
return "", ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {
@ -61,6 +64,9 @@ func (a *Agents) GetArtistMBID(ctx context.Context, id string, name string) (str
} }
func (a *Agents) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) { func (a *Agents) GetArtistURL(ctx context.Context, id, name, mbid string) (string, error) {
if id == consts.UnknownArtistID {
return "", ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {
@ -80,6 +86,9 @@ func (a *Agents) GetArtistURL(ctx context.Context, id, name, mbid string) (strin
} }
func (a *Agents) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) { func (a *Agents) GetArtistBiography(ctx context.Context, id, name, mbid string) (string, error) {
if id == consts.UnknownArtistID {
return "", ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {
@ -99,6 +108,9 @@ func (a *Agents) GetArtistBiography(ctx context.Context, id, name, mbid string)
} }
func (a *Agents) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]Artist, error) { func (a *Agents) GetSimilarArtists(ctx context.Context, id, name, mbid string, limit int) ([]Artist, error) {
if id == consts.UnknownArtistID {
return nil, ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {
@ -122,6 +134,9 @@ func (a *Agents) GetSimilarArtists(ctx context.Context, id, name, mbid string, l
} }
func (a *Agents) GetArtistImages(ctx context.Context, id, name, mbid string) ([]ExternalImage, error) { func (a *Agents) GetArtistImages(ctx context.Context, id, name, mbid string) ([]ExternalImage, error) {
if id == consts.UnknownArtistID {
return nil, ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {
@ -141,6 +156,9 @@ func (a *Agents) GetArtistImages(ctx context.Context, id, name, mbid string) ([]
} }
func (a *Agents) GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error) { func (a *Agents) GetArtistTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error) {
if id == consts.UnknownArtistID {
return nil, ErrNotFound
}
start := time.Now() start := time.Now()
for _, ag := range a.agents { for _, ag := range a.agents {
if utils.IsCtxDone(ctx) { if utils.IsCtxDone(ctx) {