arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Add artist ID to agent's interfaces

Browse Source
This commit is contained in:
Deluan
2021-02-09 11:19:32 -05:00
parent 501af14186
commit b855fe865e
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/agents/interfaces.go
+6 -6
View File
@@ -31,27 +31,27 @@ var (
)
type ArtistMBIDRetriever interface {
GetMBID(name string) (string, error)
GetMBID(id string, name string) (string, error)
}
type ArtistURLRetriever interface {
GetURL(name, mbid string) (string, error)
GetURL(id, name, mbid string) (string, error)
}
type ArtistBiographyRetriever interface {
GetBiography(name, mbid string) (string, error)
GetBiography(id, name, mbid string) (string, error)
}
type ArtistSimilarRetriever interface {
GetSimilar(name, mbid string, limit int) ([]Artist, error)
GetSimilar(id, name, mbid string, limit int) ([]Artist, error)
}
type ArtistImageRetriever interface {
GetImages(name, mbid string) ([]ArtistImage, error)
GetImages(id, name, mbid string) ([]ArtistImage, error)
}
type ArtistTopSongsRetriever interface {
GetTopSongs(artistName, mbid string, count int) ([]Song, error)
GetTopSongs(id, artistName, mbid string, count int) ([]Song, error)
}
var Map map[string]Constructor
core/agents/lastfm.go
+5 -5
View File
@@ -34,7 +34,7 @@ func (l *lastfmAgent) AgentName() string {
return lastFMAgentName
}
func (l *lastfmAgent) GetMBID(name string) (string, error) {
func (l *lastfmAgent) GetMBID(id string, name string) (string, error) {
a, err := l.callArtistGetInfo(name, "")
if err != nil {
return "", err
@@ -45,7 +45,7 @@ func (l *lastfmAgent) GetMBID(name string) (string, error) {
return a.MBID, nil
}
func (l *lastfmAgent) GetURL(name, mbid string) (string, error) {
func (l *lastfmAgent) GetURL(id, name, mbid string) (string, error) {
a, err := l.callArtistGetInfo(name, mbid)
if err != nil {
return "", err
@@ -56,7 +56,7 @@ func (l *lastfmAgent) GetURL(name, mbid string) (string, error) {
return a.URL, nil
}
func (l *lastfmAgent) GetBiography(name, mbid string) (string, error) {
func (l *lastfmAgent) GetBiography(id, name, mbid string) (string, error) {
a, err := l.callArtistGetInfo(name, mbid)
if err != nil {
return "", err
@@ -67,7 +67,7 @@ func (l *lastfmAgent) GetBiography(name, mbid string) (string, error) {
return a.Bio.Summary, nil
}
func (l *lastfmAgent) GetSimilar(name, mbid string, limit int) ([]Artist, error) {
func (l *lastfmAgent) GetSimilar(id, name, mbid string, limit int) ([]Artist, error) {
resp, err := l.callArtistGetSimilar(name, mbid, limit)
if err != nil {
return nil, err
@@ -85,7 +85,7 @@ func (l *lastfmAgent) GetSimilar(name, mbid string, limit int) ([]Artist, error)
return res, nil
}
func (l *lastfmAgent) GetTopSongs(artistName, mbid string, count int) ([]Song, error) {
func (l *lastfmAgent) GetTopSongs(id, artistName, mbid string, count int) ([]Song, error) {
resp, err := l.callArtistGetTopTracks(artistName, mbid, count)
if err != nil {
return nil, err
core/agents/placeholders.go
+2 -2
View File
@@ -23,11 +23,11 @@ func (p *placeholderAgent) AgentName() string {
return PlaceholderAgentName
}
func (p *placeholderAgent) GetBiography(name, mbid string) (string, error) {
func (p *placeholderAgent) GetBiography(id, name, mbid string) (string, error) {
return placeholderBiography, nil
}
func (p *placeholderAgent) GetImages(name, mbid string) ([]ArtistImage, error) {
func (p *placeholderAgent) GetImages(id, name, mbid string) ([]ArtistImage, error) {
return []ArtistImage{
{placeholderArtistImageLargeUrl, 300},
{placeholderArtistImageMediumUrl, 174},
core/agents/spotify.go
+1 -1
View File
@@ -39,7 +39,7 @@ func (s *spotifyAgent) AgentName() string {
return spotifyAgentName
}
func (s *spotifyAgent) GetImages(name, mbid string) ([]ArtistImage, error) {
func (s *spotifyAgent) GetImages(id, name, mbid string) ([]ArtistImage, error) {
a, err := s.searchArtist(name)
if err != nil {
if err == model.ErrNotFound {