From 4b2bc3aec64cd174942056ab17091695617e0b78 Mon Sep 17 00:00:00 2001 From: sentriz Date: Thu, 12 Mar 2020 14:11:56 +0000 Subject: [PATCH] update genres formatting --- server/ctrlsubsonic/handlers_by_tags.go | 7 ++++--- server/ctrlsubsonic/handlers_common.go | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/ctrlsubsonic/handlers_by_tags.go b/server/ctrlsubsonic/handlers_by_tags.go index c15cc7c..c2d9e90 100644 --- a/server/ctrlsubsonic/handlers_by_tags.go +++ b/server/ctrlsubsonic/handlers_by_tags.go @@ -116,7 +116,8 @@ func (c *Controller) ServeGetAlbumListTwo(r *http.Request) *spec.Response { params.GetIntOr("toYear", 2200)) q = q.Order("tag_year") case "byGenre": - q = q.Joins("JOIN genres ON albums.tag_genre_id=genres.id AND genres.name=?", params.GetOr("genre", "Unknown Genre")) + q = q.Joins("JOIN genres ON albums.tag_genre_id=genres.id AND genres.name=?", + params.GetOr("genre", "Unknown Genre")) case "frequent": user := r.Context().Value(CtxUser).(*db.User) q = q.Joins("JOIN plays ON albums.id=plays.album_id AND plays.user_id=?", @@ -282,8 +283,8 @@ func (c *Controller) ServeGetGenres(r *http.Request) *spec.Response { var genres []*db.Genre c.DB. Select(`*, -(SELECT count(id) FROM albums WHERE tag_genre_id=genres.id) album_count, -(SELECT count(id) FROM tracks WHERE tag_genre_id=genres.id) track_count`). + (SELECT count(id) FROM albums WHERE tag_genre_id=genres.id) album_count, + (SELECT count(id) FROM tracks WHERE tag_genre_id=genres.id) track_count`). Group("genres.id"). Find(&genres) diff --git a/server/ctrlsubsonic/handlers_common.go b/server/ctrlsubsonic/handlers_common.go index 6371f29..d8a1c27 100644 --- a/server/ctrlsubsonic/handlers_common.go +++ b/server/ctrlsubsonic/handlers_common.go @@ -288,7 +288,8 @@ func (c *Controller) ServeGetRandomSongs(r *http.Request) *spec.Response { params := r.Context().Value(CtxParams).(params.Params) var tracks []*db.Track - q := c.DB.DB.Joins("JOIN albums ON tracks.album_id=albums.id"). + q := c.DB.DB. + Joins("JOIN albums ON tracks.album_id=albums.id"). Limit(params.GetIntOr("size", 10)). Preload("Album"). Order(gorm.Expr("random()"))