fix(library): split comma-separated main artists
ci / module boundaries / boundaries (push) Successful in 8s
ci / api / api (push) Successful in 1m17s
ci / mobile / mobile (Metro-бандл Android) (push) Successful in 1m21s
ci / ts / ts (packages + web) (push) Successful in 3m43s
ci / db / db (push) Canceled after 11m9s
ci / module boundaries / boundaries (push) Successful in 8s
ci / api / api (push) Successful in 1m17s
ci / mobile / mobile (Metro-бандл Android) (push) Successful in 1m21s
ci / ts / ts (packages + web) (push) Successful in 3m43s
ci / db / db (push) Canceled after 11m9s
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
11b890c2e7
commit
795bb7de46
2 files changed
+4
-3
No files matched your search
@@ -32,6 +32,7 @@ func TestSplitArtists(t *testing.T) {
|
|||||||
assert.Equal(t, []string{"main:Simon & Garfunkel"}, names(SplitArtists("Simon & Garfunkel", known)))
|
assert.Equal(t, []string{"main:Simon & Garfunkel"}, names(SplitArtists("Simon & Garfunkel", known)))
|
||||||
assert.Equal(t, []string{"main:Tom", "main:Jerry"}, names(SplitArtists("Tom & Jerry", known)))
|
assert.Equal(t, []string{"main:Tom", "main:Jerry"}, names(SplitArtists("Tom & Jerry", known)))
|
||||||
assert.Equal(t, []string{"main:A", "main:B"}, names(SplitArtists("A; B", nil)))
|
assert.Equal(t, []string{"main:A", "main:B"}, names(SplitArtists("A; B", nil)))
|
||||||
|
assert.Equal(t, []string{"main:A", "main:B", "main:C"}, names(SplitArtists("A, B, C", nil)))
|
||||||
assert.Equal(t, []string{"main:A", "feat:B", "feat:C"}, names(SplitArtists("A feat. B & C", nil)))
|
assert.Equal(t, []string{"main:A", "feat:B", "feat:C"}, names(SplitArtists("A feat. B & C", nil)))
|
||||||
assert.Equal(t, []string{"main:A"}, names(SplitArtists("A / a", nil)), "duplicates by key are dropped")
|
assert.Equal(t, []string{"main:A"}, names(SplitArtists("A / a", nil)), "duplicates by key are dropped")
|
||||||
assert.Empty(t, SplitArtists(" ", nil))
|
assert.Empty(t, SplitArtists(" ", nil))
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ type ArtistCredit struct {
|
|||||||
Role string // main | feat
|
Role string // main | feat
|
||||||
}
|
}
|
||||||
|
|
||||||
// SplitArtists разбирает поле исполнителя на отдельных. « & » делит имя, только если составного
|
// SplitArtists разбирает поле исполнителя на отдельных. « & » и «, » делят имя, только если составного
|
||||||
// исполнителя нет в библиотеке (known), — иначе «Simon & Garfunkel» распался бы на двоих.
|
// исполнителя нет в библиотеке (known), — иначе «Simon & Garfunkel» распался бы на двоих.
|
||||||
// Всё после feat./ft. — приглашённые исполнители.
|
// Всё после feat./ft. — приглашённые исполнители.
|
||||||
func SplitArtists(s string, known func(key string) bool) []ArtistCredit {
|
func SplitArtists(s string, known func(key string) bool) []ArtistCredit {
|
||||||
@@ -85,8 +85,8 @@ func SplitArtists(s string, known func(key string) bool) []ArtistCredit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, part := range splitAny(main, artistSeparators) {
|
for _, part := range splitAny(main, artistSeparators) {
|
||||||
if strings.Contains(part, " & ") && (known == nil || !known(Key(part))) {
|
if (strings.Contains(part, " & ") || strings.Contains(part, ", ")) && (known == nil || !known(Key(part))) {
|
||||||
for _, p := range strings.Split(part, " & ") {
|
for _, p := range splitAny(part, []string{" & ", ", "}) {
|
||||||
add(p, "main")
|
add(p, "main")
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in new issue
Block a user