diff --git a/internal/recommendation/sessionvector.go b/internal/recommendation/sessionvector.go index 94cd3154..d244d51e 100644 --- a/internal/recommendation/sessionvector.go +++ b/internal/recommendation/sessionvector.go @@ -1,6 +1,8 @@ package recommendation import ( + "strings" + "github.com/jackc/pgx/v5/pgtype" "git.fabledsword.com/bvandeusen/minstrel/internal/db/dbq" @@ -28,7 +30,9 @@ func BuildSessionVector(priorTracks []dbq.Track) SessionVector { v.Artists = append(v.Artists, artistID) } if t.Genre != nil && *t.Genre != "" { - v.Tags[*t.Genre]++ + for _, g := range splitGenres(*t.Genre) { + v.Tags[g]++ + } } v.RecentTrackIDs = append(v.RecentTrackIDs, uuidString(t.ID)) } @@ -41,3 +45,22 @@ func uuidString(u pgtype.UUID) string { } return u.String() } + +// splitGenres splits a track's denormalized genre string on the common +// multi-genre delimiters (`;`, `,`) used by various tag editors. Trims +// whitespace; drops empty fragments. Strings with no delimiter come back +// as a single-element slice. Concatenated-without-separator inputs (e.g. +// "ElectronicComplextroGlitch Hop" from broken tag-editor output) cannot +// be split without a genre dictionary and stay as one opaque tag. +func splitGenres(s string) []string { + parts := strings.FieldsFunc(s, func(r rune) bool { + return r == ';' || r == ',' + }) + out := make([]string, 0, len(parts)) + for _, p := range parts { + if p = strings.TrimSpace(p); p != "" { + out = append(out, p) + } + } + return out +} diff --git a/internal/recommendation/sessionvector_test.go b/internal/recommendation/sessionvector_test.go index 745b3bf9..91ba38f4 100644 --- a/internal/recommendation/sessionvector_test.go +++ b/internal/recommendation/sessionvector_test.go @@ -123,6 +123,77 @@ func TestBuildSessionVector_NilGenre_NotIndexed(t *testing.T) { } } +func TestBuildSessionVector_MultiGenreSplitsOnSemicolon(t *testing.T) { + a1 := uuid("11111111-1111-1111-1111-111111111111") + v := BuildSessionVector([]dbq.Track{ + track(a1, "Indie Pop; Pop; Alternative Pop"), + track(a1, "Pop"), + track(a1, "Boom Bap; Hip Hop; Lo-Fi"), + }) + // Pop appears once on track 1 and once on track 2 → count 2. + if v.Tags["Pop"] != 2 { + t.Errorf("Tags['Pop'] = %d, want 2 (one per matching track)", v.Tags["Pop"]) + } + // Indie Pop, Alternative Pop only on track 1. + if v.Tags["Indie Pop"] != 1 || v.Tags["Alternative Pop"] != 1 { + t.Errorf("Indie/Alt Pop counts wrong: %+v", v.Tags) + } + // Track 3's genres. + if v.Tags["Boom Bap"] != 1 || v.Tags["Hip Hop"] != 1 || v.Tags["Lo-Fi"] != 1 { + t.Errorf("track-3 genre counts wrong: %+v", v.Tags) + } +} + +func TestBuildSessionVector_NoSeparatorStaysOpaque(t *testing.T) { + // Concatenated strings without separators (broken tag-editor output) + // can't be parsed; they stay as one tag and only match identical strings. + a1 := uuid("11111111-1111-1111-1111-111111111111") + v := BuildSessionVector([]dbq.Track{ + track(a1, "ElectronicComplextroGlitch Hop"), + track(a1, "ElectronicComplextroGlitch Hop"), + }) + if v.Tags["ElectronicComplextroGlitch Hop"] != 2 { + t.Errorf("opaque tag count = %d, want 2", v.Tags["ElectronicComplextroGlitch Hop"]) + } + if len(v.Tags) != 1 { + t.Errorf("len(Tags) = %d, want 1", len(v.Tags)) + } +} + +func TestSplitGenres(t *testing.T) { + cases := []struct { + in string + want []string + }{ + {"", nil}, + {"Pop", []string{"Pop"}}, + {"Pop; Rock", []string{"Pop", "Rock"}}, + {"Pop, Rock", []string{"Pop", "Rock"}}, + {"Pop; Rock, Jazz", []string{"Pop", "Rock", "Jazz"}}, + {" Pop ; Rock ", []string{"Pop", "Rock"}}, + {";; Pop ;;", []string{"Pop"}}, + {"ElectronicComplextroGlitch Hop", []string{"ElectronicComplextroGlitch Hop"}}, + } + for _, c := range cases { + got := splitGenres(c.in) + if c.want == nil { + if len(got) != 0 { + t.Errorf("splitGenres(%q) = %v, want empty", c.in, got) + } + continue + } + if len(got) != len(c.want) { + t.Errorf("splitGenres(%q) = %v, want %v", c.in, got, c.want) + continue + } + for i := range got { + if got[i] != c.want[i] { + t.Errorf("splitGenres(%q)[%d] = %q, want %q", c.in, i, got[i], c.want[i]) + } + } + } +} + func TestBuildSessionVector_JSONRoundTrip(t *testing.T) { a1 := uuid("11111111-1111-1111-1111-111111111111") v := BuildSessionVector([]dbq.Track{ diff --git a/web/src/lib/components/TrackRow.svelte b/web/src/lib/components/TrackRow.svelte index 68a76432..eeafee1e 100644 --- a/web/src/lib/components/TrackRow.svelte +++ b/web/src/lib/components/TrackRow.svelte @@ -1,7 +1,7 @@