nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-05-03 06:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(playlists): simplify Evaluate to reuse refreshSmartPlaylist directly

Browse Source 
Instead of refactoring refreshSmartPlaylist into guard+core methods,
Evaluate simply resets EvaluatedAt and delegates to refreshSmartPlaylist.
This avoids unnecessary refactoring while still bypassing the delay guard.
Also returns an error if evaluation fails.
This commit is contained in:
Deluan 2026-03-23 20:15:19 -04:00
parent af0a6615b2
commit 03b813a2f6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
persistence/playlist_repository.go
View File

@ -215,10 +215,6 @@ func (r *playlistRepository) refreshSmartPlaylist(pls *model.Playlist) bool {
return false
}
return r.doRefreshSmartPlaylist(pls, usr.ID)
}
func (r *playlistRepository) doRefreshSmartPlaylist(pls *model.Playlist, userID string) bool {
log.Debug(r.ctx, "Refreshing smart playlist", "playlist", pls.Name, "id", pls.ID)
start := time.Now()
@ -248,11 +244,11 @@ func (r *playlistRepository) doRefreshSmartPlaylist(pls *model.Playlist, userID
From("media_file").LeftJoin("annotation on ("+
"annotation.item_id = media_file.id"+
" AND annotation.item_type = 'media_file'"+
" AND annotation.user_id = ?)", userID)
" AND annotation.user_id = ?)", usr.ID)
// Conditionally join album/artist annotation tables only when referenced by criteria or sort
requiredJoins := rules.RequiredJoins()
sq = r.addSmartPlaylistAnnotationJoins(sq, requiredJoins, userID)
sq = r.addSmartPlaylistAnnotationJoins(sq, requiredJoins, usr.ID)
// Only include media files from libraries the user has access to
sq = r.applyLibraryFilter(sq, "media_file")
@ -265,8 +261,8 @@ func (r *playlistRepository) doRefreshSmartPlaylist(pls *model.Playlist, userID
LeftJoin("annotation on ("+
"annotation.item_id = media_file.id"+
" AND annotation.item_type = 'media_file'"+
" AND annotation.user_id = ?)", userID)
countSq = r.addSmartPlaylistAnnotationJoins(countSq, exprJoins, userID)
" AND annotation.user_id = ?)", usr.ID)
countSq = r.addSmartPlaylistAnnotationJoins(countSq, exprJoins, usr.ID)
countSq = r.applyLibraryFilter(countSq, "media_file")
countSq = countSq.Where(rules)
@ -322,7 +318,11 @@ func (r *playlistRepository) Evaluate(id string) error {
if !pls.IsSmartPlaylist() {
return nil
}
r.doRefreshSmartPlaylist(pls, pls.OwnerID)
// Reset EvaluatedAt so refreshSmartPlaylist won't skip due to delay check
pls.EvaluatedAt = nil
if !r.refreshSmartPlaylist(pls) {
return fmt.Errorf("failed to evaluate smart playlist %s", id)
}
return nil
}