heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: remove album.GenreStrings

Browse Source
This commit is contained in:
sentriz
2023-10-25 21:59:56 +01:00
parent d1af62d6cb
commit 46575278ed
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/db.go
View File

@@ -333,14 +333,6 @@ func (a *Album) IndexRightPath() string {
return a.RightPath return a.RightPath
} }
func (a *Album) GenreStrings() []string {
strs := make([]string, 0, len(a.Genres))
for _, genre := range a.Genres {
strs = append(strs, genre.Name)
}
return strs
}
func (a *Album) ArtistsStrings() []string { func (a *Album) ArtistsStrings() []string {
artists := append([]*Artist(nil), a.Artists...) artists := append([]*Artist(nil), a.Artists...)
sort.Slice(artists, func(i, j int) bool { sort.Slice(artists, func(i, j int) bool {

12
scanner/scanner_test.go
View File

@@ -181,7 +181,7 @@ func TestUpdatedAlbumGenre(t *testing.T) {
var album db.Album var album db.Album
assert.NoError(t, m.DB().Preload("Genres").Where("left_path=? AND right_path=?", "artist-0/", "album-0").Find(&album).Error) assert.NoError(t, m.DB().Preload("Genres").Where("left_path=? AND right_path=?", "artist-0/", "album-0").Find(&album).Error)
assert.Equal(t, []string{"gen-a", "gen-b"}, album.GenreStrings()) assert.Equal(t, []string{"gen-a", "gen-b"}, genreStrings(album))
m.SetTags("artist-0/album-0/track-0.flac", func(tags *mockfs.TagInfo) { m.SetTags("artist-0/album-0/track-0.flac", func(tags *mockfs.TagInfo) {
tags.RawGenre = "gen-a-upd;gen-b-upd" tags.RawGenre = "gen-a-upd;gen-b-upd"
@@ -191,7 +191,7 @@ func TestUpdatedAlbumGenre(t *testing.T) {
var updated db.Album var updated db.Album
assert.NoError(t, m.DB().Preload("Genres").Where("left_path=? AND right_path=?", "artist-0/", "album-0").Find(&updated).Error) assert.NoError(t, m.DB().Preload("Genres").Where("left_path=? AND right_path=?", "artist-0/", "album-0").Find(&updated).Error)
assert.Equal(t, []string{"gen-a-upd", "gen-b-upd"}, updated.GenreStrings()) assert.Equal(t, []string{"gen-a-upd", "gen-b-upd"}, genreStrings(updated))
} }
func TestDeleteAlbum(t *testing.T) { func TestDeleteAlbum(t *testing.T) {
@@ -759,3 +759,11 @@ func TestMultiArtistPreload(t *testing.T) {
} }
} }
} }
func genreStrings(album db.Album) []string {
var strs []string
for _, genre := range album.Genres {
strs = append(strs, genre.Name)
}
return strs
}