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

fix(subsonic): honour PreferSortTag when building indexes for getArtist and getIndexes (#3286)

Browse source 
* fix(scanner): use sort_artist_name when the config PreferSortTags is true - #3285

* revert unwanted modifications

* refactor(server): use cmp.Or to simplify nested ifs

---------

Co-authored-by: Deluan <deluan@navidrome.org>
This commit is contained in:
naiar 2024-09-20 02:44:29 +09:00 • committed by GitHub
parent 50870d3e61
commit 04603a1ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 161 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
persistence/artist_repository.go
View file

@ -1,6 +1,7 @@
package persistence
import (
"cmp"
"context"
"fmt"
"net/url"
@ -143,7 +144,11 @@ func (r *artistRepository) toModels(dba []dbArtist) model.Artists {
}
func (r *artistRepository) getIndexKey(a *model.Artist) string {
name := strings.ToLower(str.RemoveArticle(a.Name))
source := a.Name
if conf.Server.PreferSortTags {
source = cmp.Or(a.SortArtistName, a.OrderArtistName, source)
}
name := strings.ToLower(str.RemoveArticle(source))
for k, v := range r.indexGroups {
key := strings.ToLower(k)
if strings.HasPrefix(name, key) {
@ -155,7 +160,11 @@ func (r *artistRepository) getIndexKey(a *model.Artist) string {
// TODO Cache the index (recalculate when there are changes to the DB)
func (r *artistRepository) GetIndex() (model.ArtistIndexes, error) {
all, err := r.GetAll(model.QueryOptions{Sort: "order_artist_name"})
sortColumn := "order_artist_name"
if conf.Server.PreferSortTags {
sortColumn = "sort_artist_name, order_artist_name"
}
all, err := r.GetAll(model.QueryOptions{Sort: sortColumn})
if err != nil {
return nil, err
}