nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-08-31 07:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(scanner): split performer names and honor split exceptions

Browse Source 
Performer pair values were never split; multiple names in one PERFORMER
value stayed a single artist. Split them with the roles separators, using
the same whitelist protection as other participant tags.
This commit is contained in:
Deluan 2026-07-02 00:20:01 -04:00
parent 63ae6f6d4b
commit 847cac7344
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
model/metadata/map_participants.go
View File

@ -94,18 +94,24 @@ func (md Metadata) processPerformers(participants model.Participants, rolesMbzId
roleIdx[role] = 0
}
conf := model.TagRolesConf()
conf.ExceptionsRx = model.ArtistSplitExceptionsRx()
titleCaser := cases.Title(language.Und)
for _, performer := range md.Pairs(model.TagPerformer) {
name := performer.Value()
subRole := titleCaser.String(performer.Key())
artist := model.Artist{
ID: md.artistID(name),
Name: name,
OrderArtistName: str.SanitizeFieldForSortingNoArticle(name),
MbzArtistID: md.getPerformerMbid(subRole, rolesMbzIdMap, roleIdx),
names := []string{performer.Value()}
if len(conf.Split) > 0 {
names = filterDuplicatedOrEmptyValues(conf.SplitTagValue(names))
}
for _, name := range names {
artist := model.Artist{
ID: md.artistID(name),
Name: name,
OrderArtistName: str.SanitizeFieldForSortingNoArticle(name),
MbzArtistID: md.getPerformerMbid(subRole, rolesMbzIdMap, roleIdx),
}
participants.AddWithSubRole(model.RolePerformer, subRole, artist)
}
participants.AddWithSubRole(model.RolePerformer, subRole, artist)
}
}

29
model/metadata/map_participants_test.go
View File

@ -565,6 +565,23 @@ var _ = Describe("Participants", func() {
matchPerformer("Tim Carmon", "tim carmon", "Hammond Organ"),
))
})
It("should split multiple names in a single value", func() {
mf = toMediaFile(model.RawTags{
"PERFORMER:GUITAR": {"Eric Clapton/B.B. King"},
"PERFORMER:BASS": {"Nathan East"},
})
participants := mf.Participants
Expect(participants).To(HaveKeyWithValue(model.RolePerformer, HaveLen(3)))
p := participants[model.RolePerformer]
Expect(p).To(ContainElements(
matchPerformer("Eric Clapton", "eric clapton", "Guitar"),
matchPerformer("B.B. King", "b.b. king", "Guitar"),
matchPerformer("Nathan East", "nathan east", "Bass"),
))
})
})
When("MUSICBRAINZ_PERFORMERID tag is set", func() {
@ -847,5 +864,17 @@ var _ = Describe("Participants", func() {
Expect(artists[0].Name).To(Equal("Artist Name"))
Expect(artists[1].Name).To(Equal("Someone Else"))
})
It("does not split a whitelisted name in performer tags", func() {
conf.Server.Scanner.ArtistSplitExceptions = []string{"AC/DC"}
mf = toMediaFile(model.RawTags{
"PERFORMER:GUITAR": {"AC/DC/Brian Johnson"},
})
performers := mf.Participants[model.RolePerformer]
Expect(performers).To(HaveLen(2))
Expect(performers[0].Name).To(Equal("AC/DC"))
Expect(performers[1].Name).To(Equal("Brian Johnson"))
})
})
})