mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove "Biography not available" when agents are not available

Browse source
This commit is contained in:
Deluan 2023-01-13 14:47:18 -05:00 • committed by Deluan Quintão
parent 3f2d24695e
commit 0ffef05cc3
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/agents/agents_test.go
View file

@ -30,9 +30,6 @@ var _ = Describe("Agents", func() {
ag = New(ds) ag = New(ds)
}) })
It("calls the placeholder GetBiography", func() {
Expect(ag.GetBiography(ctx, "123", "John Doe", "mb123")).To(Equal(localBiography))
})
It("calls the placeholder GetImages", func() { It("calls the placeholder GetImages", func() {
mfRepo.SetData(model.MediaFiles{{ID: "1", Title: "One", MbzReleaseTrackID: "111"}, {ID: "2", Title: "Two", MbzReleaseTrackID: "222"}}) mfRepo.SetData(model.MediaFiles{{ID: "1", Title: "One", MbzReleaseTrackID: "111"}, {ID: "2", Title: "Two", MbzReleaseTrackID: "222"}})
songs, err := ag.GetTopSongs(ctx, "123", "John Doe", "mb123", 2) songs, err := ag.GetTopSongs(ctx, "123", "John Doe", "mb123", 2)
@ -104,7 +101,8 @@ var _ = Describe("Agents", func() {
}) })
It("skips the agent if it returns an error", func() { It("skips the agent if it returns an error", func() {
mock.Err = errors.New("error") mock.Err = errors.New("error")
Expect(ag.GetBiography(ctx, "123", "test", "mb123")).To(Equal(localBiography)) _, err := ag.GetBiography(ctx, "123", "test", "mb123")
Expect(err).To(MatchError(ErrNotFound))
Expect(mock.Args).To(ConsistOf("123", "test", "mb123")) Expect(mock.Args).To(ConsistOf("123", "test", "mb123"))
}) })
It("interrupts if the context is canceled", func() { It("interrupts if the context is canceled", func() {

8
core/agents/local_agent.go
View file

@ -9,10 +9,6 @@ import (
const LocalAgentName = "local" const LocalAgentName = "local"
const (
localBiography = "Biography not available"
)
type localAgent struct { type localAgent struct {
ds model.DataStore ds model.DataStore
} }
@ -25,10 +21,6 @@ func (p *localAgent) AgentName() string {
return LocalAgentName return LocalAgentName
} }
func (p *localAgent) GetBiography(ctx context.Context, id, name, mbid string) (string, error) {
return localBiography, nil
}
func (p *localAgent) GetTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error) { func (p *localAgent) GetTopSongs(ctx context.Context, id, artistName, mbid string, count int) ([]Song, error) {
top, err := p.ds.MediaFile(ctx).GetAll(model.QueryOptions{ top, err := p.ds.MediaFile(ctx).GetAll(model.QueryOptions{
Sort: "playCount", Sort: "playCount",

4
scanner/refresher.go
View file

@ -139,6 +139,10 @@ func (r *refresher) refreshArtists(ctx context.Context, ids ...string) error {
grouped := slice.Group(albums, func(al model.Album) string { return al.AlbumArtistID }) grouped := slice.Group(albums, func(al model.Album) string { return al.AlbumArtistID })
for _, group := range grouped { for _, group := range grouped {
a := model.Albums(group).ToAlbumArtist() a := model.Albums(group).ToAlbumArtist()
// Force a external metadata lookup on next access
a.ExternalInfoUpdatedAt = time.Time{}
err := repo.Put(&a) err := repo.Put(&a)
if err != nil { if err != nil {
return err return err