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

Make sure album is updated if external cover changes

Browse source
This commit is contained in:
Deluan 2022-12-23 10:51:21 -05:00 • committed by Deluan Quintão
parent f5719a7571
commit 9ec349dce0
4 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/artwork.go
View file

@ -182,8 +182,10 @@ func (a *artwork) fromCoverArtPriority(ctx context.Context, priority string, al
ff = append(ff, fromTag(al.EmbedArtPath), fromFFmpegTag(ctx, a.ffmpeg, al.EmbedArtPath)) ff = append(ff, fromTag(al.EmbedArtPath), fromFFmpegTag(ctx, a.ffmpeg, al.EmbedArtPath))
continue continue
} }
if al.ImageFiles != "" {
ff = append(ff, fromExternalFile(ctx, al.ImageFiles, pattern)) ff = append(ff, fromExternalFile(ctx, al.ImageFiles, pattern))
} }
}
return ff return ff
} }
@ -201,6 +203,7 @@ func fromExternalFile(ctx context.Context, files string, pattern string) fromFun
} }
f, err := os.Open(file) f, err := os.Open(file)
if err != nil { if err != nil {
log.Warn(ctx, "Could not open cover art file", "file", file, err)
continue continue
} }
return f, file, err return f, file, err

18
scanner/refresher.go
View file

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
"time"
"github.com/Masterminds/squirrel" "github.com/Masterminds/squirrel"
"github.com/navidrome/navidrome/log" "github.com/navidrome/navidrome/log"
@ -93,7 +94,11 @@ func (r *refresher) refreshAlbums(ids ...string) error {
for _, group := range grouped { for _, group := range grouped {
songs := model.MediaFiles(group) songs := model.MediaFiles(group)
a := songs.ToAlbum() a := songs.ToAlbum()
a.ImageFiles = r.getImageFiles(songs.Dirs()) var updatedAt time.Time
a.ImageFiles, updatedAt = r.getImageFiles(songs.Dirs())
if updatedAt.After(a.UpdatedAt) {
a.UpdatedAt = updatedAt
}
err := repo.Put(&a) err := repo.Put(&a)
if err != nil { if err != nil {
return err return err
@ -102,14 +107,19 @@ func (r *refresher) refreshAlbums(ids ...string) error {
return nil return nil
} }
func (r *refresher) getImageFiles(dirs []string) string { func (r *refresher) getImageFiles(dirs []string) (string, time.Time) {
var imageFiles []string var imageFiles []string
var updatedAt time.Time
for _, dir := range dirs { for _, dir := range dirs {
for _, img := range r.dirMap[dir].Images { stats := r.dirMap[dir]
for _, img := range stats.Images {
imageFiles = append(imageFiles, filepath.Join(dir, img)) imageFiles = append(imageFiles, filepath.Join(dir, img))
} }
if stats.ImagesUpdatedAt.After(updatedAt) {
updatedAt = stats.ImagesUpdatedAt
} }
return strings.Join(imageFiles, string(filepath.ListSeparator)) }
return strings.Join(imageFiles, string(filepath.ListSeparator)), updatedAt
} }
func (r *refresher) refreshArtists(ids ...string) error { func (r *refresher) refreshArtists(ids ...string) error {

12
scanner/walk_dir_tree.go
View file

@ -20,6 +20,7 @@ type (
Path string Path string
ModTime time.Time ModTime time.Time
Images []string Images []string
ImagesUpdatedAt time.Time
HasPlaylist bool HasPlaylist bool
AudioFilesCount uint32 AudioFilesCount uint32
} }
@ -93,12 +94,15 @@ func loadDir(ctx context.Context, dirPath string) ([]string, *dirStats, error) {
if fileInfo.ModTime().After(stats.ModTime) { if fileInfo.ModTime().After(stats.ModTime) {
stats.ModTime = fileInfo.ModTime() stats.ModTime = fileInfo.ModTime()
} }
if utils.IsAudioFile(entry.Name()) { switch {
case utils.IsAudioFile(entry.Name()):
stats.AudioFilesCount++ stats.AudioFilesCount++
} else { case model.IsValidPlaylist(entry.Name()):
stats.HasPlaylist = stats.HasPlaylist || model.IsValidPlaylist(entry.Name()) stats.HasPlaylist = true
if utils.IsImageFile(entry.Name()) { case utils.IsImageFile(entry.Name()):
stats.Images = append(stats.Images, entry.Name()) stats.Images = append(stats.Images, entry.Name())
if fileInfo.ModTime().After(stats.ImagesUpdatedAt) {
stats.ImagesUpdatedAt = fileInfo.ModTime()
} }
} }
} }

2
utils/cache/file_caches.go vendored
View file

@ -127,7 +127,7 @@ func (fc *fileCache) Get(ctx context.Context, arg Item) (*CachedStream, error) {
log.Warn(ctx, "Error removing key from cache", "cache", fc.name, "key", key, err) log.Warn(ctx, "Error removing key from cache", "cache", fc.name, "key", key, err)
} }
} else { } else {
log.Trace(ctx, "File stored in cache", "cache", fc.name, "key", key) log.Trace(ctx, "File successfully stored in cache", "cache", fc.name, "key", key)
} }
}() }()
} }