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

fix: show artist album count when searching by tags

Browse Source
This commit is contained in:
sentriz
2021-11-10 18:45:19 +00:00
parent 48c34fdffc
commit 0c790442f4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -185,13 +185,14 @@ func (c *Controller) ServeSearchThree(r *http.Request) *spec.Response {
// search "artists" // search "artists"
var artists []*db.Artist var artists []*db.Artist
q := c.DB. q := c.DB.
Select("*, count(albums.id) album_count").
Group("artists.id").
Where("name LIKE ? OR name_u_dec LIKE ?", query, query). Where("name LIKE ? OR name_u_dec LIKE ?", query, query).
Joins("JOIN albums ON albums.tag_artist_id=artists.id").
Offset(params.GetOrInt("artistOffset", 0)). Offset(params.GetOrInt("artistOffset", 0)).
Limit(params.GetOrInt("artistCount", 20)) Limit(params.GetOrInt("artistCount", 20))
if m := c.getMusicFolder(params); m != "" { if m := c.getMusicFolder(params); m != "" {
q = q. q = q.Where("albums.root_dir=?", m)
Joins("JOIN albums ON albums.tag_artist_id=artists.id").
Where("albums.root_dir=?", m)
} }
if err := q.Find(&artists).Error; err != nil { if err := q.Find(&artists).Error; err != nil {
return spec.NewError(0, "find artists: %v", err) return spec.NewError(0, "find artists: %v", err)

6
server/ctrlsubsonic/testdata/test_search_three_q_art vendored
View File

@@ -5,9 +5,9 @@
"type": "gonic", "type": "gonic",
"searchResult3": { "searchResult3": {
"artist": [ "artist": [
{ "id": "ar-1", "name": "artist-0", "albumCount": 0 }, { "id": "ar-1", "name": "artist-0", "albumCount": 3 },
{ "id": "ar-2", "name": "artist-1", "albumCount": 0 }, { "id": "ar-2", "name": "artist-1", "albumCount": 3 },
{ "id": "ar-3", "name": "artist-2", "albumCount": 0 } { "id": "ar-3", "name": "artist-2", "albumCount": 3 }
] ]
} }
} }