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

add year and artist to getalbum response

Browse Source 
closes #55
This commit is contained in:
sentriz
2020-04-12 18:26:39 +01:00
parent 0a9cfcb0b7
commit 5b76ab4e4b
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/ctrlsubsonic/handlers_by_tags.go
View File

@@ -77,6 +77,7 @@ func (c *Controller) ServeGetAlbum(r *http.Request) *spec.Response {
album := &db.Album{} album := &db.Album{}
err = c.DB. err = c.DB.
Preload("TagArtist"). Preload("TagArtist").
Preload("TagGenre").
Preload("Tracks", func(db *gorm.DB) *gorm.DB { Preload("Tracks", func(db *gorm.DB) *gorm.DB {
return db.Order("tracks.tag_disc_number, tracks.tag_track_number") return db.Order("tracks.tag_disc_number, tracks.tag_track_number")
}). }).

4
server/ctrlsubsonic/spec/construct_by_tags.go
View File

@@ -11,8 +11,12 @@ func NewAlbumByTags(a *db.Album, artist *db.Artist) *Album {
Created: a.ModifiedAt, Created: a.ModifiedAt,
ID: a.ID, ID: a.ID,
Name: a.TagTitle, Name: a.TagTitle,
Year: a.TagYear,
TrackCount: a.ChildCount, TrackCount: a.ChildCount,
} }
if a.TagGenre != nil {
ret.Genre = a.TagGenre.Name
}
if a.Cover != "" { if a.Cover != "" {
ret.CoverID = a.ID ret.CoverID = a.ID
} }

6
server/ctrlsubsonic/spec/spec.go
View File

@@ -92,16 +92,18 @@ type Album struct {
CoverID int `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty,string"` CoverID int `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty,string"`
ArtistID int `xml:"artistId,attr,omitempty" json:"artistId,omitempty,string"` ArtistID int `xml:"artistId,attr,omitempty" json:"artistId,omitempty,string"`
Artist string `xml:"artist,attr,omitempty" json:"artist,omitempty"` Artist string `xml:"artist,attr,omitempty" json:"artist,omitempty"`
// browsing by folder (getAlbumList) // browsing by folder (eg. getAlbumList)
Title string `xml:"title,attr,omitempty" json:"title,omitempty"` Title string `xml:"title,attr,omitempty" json:"title,omitempty"`
Album string `xml:"album,attr,omitempty" json:"album,omitempty"` Album string `xml:"album,attr,omitempty" json:"album,omitempty"`
ParentID int `xml:"parent,attr,omitempty" json:"parent,omitempty,string"` ParentID int `xml:"parent,attr,omitempty" json:"parent,omitempty,string"`
IsDir bool `xml:"isDir,attr,omitempty" json:"isDir,omitempty"` IsDir bool `xml:"isDir,attr,omitempty" json:"isDir,omitempty"`
// browsing by tags (getAlbumList2) // browsing by tags (eg. getAlbumList2)
Name string `xml:"name,attr,omitempty" json:"name,omitempty"` Name string `xml:"name,attr,omitempty" json:"name,omitempty"`
TrackCount int `xml:"songCount,attr" json:"songCount"` TrackCount int `xml:"songCount,attr" json:"songCount"`
Duration int `xml:"duration,attr" json:"duration"` Duration int `xml:"duration,attr" json:"duration"`
Created time.Time `xml:"created,attr,omitempty" json:"created,omitempty"` Created time.Time `xml:"created,attr,omitempty" json:"created,omitempty"`
Genre string `xml:"genre,attr,omitempty" json:"genre,omitempty"`
Year int `xml:"year,attr,omitempty" json:"year,omitempty"`
Tracks []*TrackChild `xml:"song,omitempty" json:"song,omitempty"` Tracks []*TrackChild `xml:"song,omitempty" json:"song,omitempty"`
} }