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

Implement new Artist refresh

Browse source
This commit is contained in:
Deluan 2022-12-21 11:30:19 -05:00 • committed by Deluan Quintão
parent bce7b163ba
commit 8e640bb858
9 changed files with 170 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

67
scanner/refresher.go
View file

@ -13,6 +13,11 @@ import (
"github.com/navidrome/navidrome/utils/slice"
)
// refresher is responsible for rolling up mediafiles attributes into albums attributes,
// and albums attributes into artists attributes. This is done by accumulating all album and artist IDs
// found during scan, and "refreshing" the albums and artists when flush is called.
//
// The actual mappings happen in MediaFiles.ToAlbum() and Albums.ToAlbumArtist()
type refresher struct {
ctx context.Context
ds model.DataStore
@ -31,18 +36,30 @@ func newRefresher(ctx context.Context, ds model.DataStore, dirMap dirMap) *refre
}
}
func (f *refresher) accumulate(mf model.MediaFile) {
func (r *refresher) accumulate(mf model.MediaFile) {
if mf.AlbumID != "" {
f.album[mf.AlbumID] = struct{}{}
r.album[mf.AlbumID] = struct{}{}
}
if mf.AlbumArtistID != "" {
f.artist[mf.AlbumArtistID] = struct{}{}
r.artist[mf.AlbumArtistID] = struct{}{}
}
}
func (r *refresher) flush() error {
err := r.flushMap(r.album, "album", r.refreshAlbums)
if err != nil {
return err
}
err = r.flushMap(r.artist, "artist", r.refreshArtists)
if err != nil {
return err
}
return nil
}
type refreshCallbackFunc = func(ids ...string) error
func (f *refresher) flushMap(m map[string]struct{}, entity string, refresh refreshCallbackFunc) error {
func (r *refresher) flushMap(m map[string]struct{}, entity string, refresh refreshCallbackFunc) error {
if len(m) == 0 {
return nil
}
@ -51,26 +68,19 @@ func (f *refresher) flushMap(m map[string]struct{}, entity string, refresh refre
ids = append(ids, id)
delete(m, id)
}
if err := refresh(ids...); err != nil {
log.Error(f.ctx, fmt.Sprintf("Error writing %ss to the DB", entity), err)
return err
}
return nil
}
func (f *refresher) refreshAlbumsChunked(ids ...string) error {
chunks := utils.BreakUpStringSlice(ids, 100)
for _, chunk := range chunks {
err := f.refreshAlbums(chunk...)
err := refresh(chunk...)
if err != nil {
log.Error(r.ctx, fmt.Sprintf("Error writing %ss to the DB", entity), err)
return err
}
}
return nil
}
func (f *refresher) refreshAlbums(ids ...string) error {
mfs, err := f.ds.MediaFile(f.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": ids}})
func (r *refresher) refreshAlbums(ids ...string) error {
mfs, err := r.ds.MediaFile(r.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_id": ids}})
if err != nil {
return err
}
@ -78,12 +88,12 @@ func (f *refresher) refreshAlbums(ids ...string) error {
return nil
}
repo := f.ds.Album(f.ctx)
repo := r.ds.Album(r.ctx)
grouped := slice.Group(mfs, func(m model.MediaFile) string { return m.AlbumID })
for _, group := range grouped {
songs := model.MediaFiles(group)
a := songs.ToAlbum()
a.ImageFiles = f.getImageFiles(songs.Dirs())
a.ImageFiles = r.getImageFiles(songs.Dirs())
err := repo.Put(&a)
if err != nil {
return err
@ -92,24 +102,33 @@ func (f *refresher) refreshAlbums(ids ...string) error {
return nil
}
func (f *refresher) getImageFiles(dirs []string) string {
func (r *refresher) getImageFiles(dirs []string) string {
var imageFiles []string
for _, dir := range dirs {
for _, img := range f.dirMap[dir].Images {
for _, img := range r.dirMap[dir].Images {
imageFiles = append(imageFiles, filepath.Join(dir, img))
}
}
return strings.Join(imageFiles, string(filepath.ListSeparator))
}
func (f *refresher) flush() error {
err := f.flushMap(f.album, "album", f.refreshAlbumsChunked)
func (r *refresher) refreshArtists(ids ...string) error {
albums, err := r.ds.Album(r.ctx).GetAll(model.QueryOptions{Filters: squirrel.Eq{"album_artist_id": ids}})
if err != nil {
return err
}
err = f.flushMap(f.artist, "artist", f.ds.Artist(f.ctx).Refresh) // TODO Move Artist Refresh out of persistence
if err != nil {
return err
if len(albums) == 0 {
return nil
}
repo := r.ds.Artist(r.ctx)
grouped := slice.Group(albums, func(al model.Album) string { return al.AlbumArtistID })
for _, group := range grouped {
a := model.Albums(group).ToAlbumArtist()
err := repo.Put(&a)
if err != nil {
return err
}
}
return nil
}