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

add more omitempty changes

Browse Source
This commit is contained in:
sentriz
2020-02-21 17:55:30 +00:00
parent 9b8a35df00
commit 7c170a68c2
4 changed files with 112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,16 @@ func NewTrackByTags(t *db.Track, album *db.Album) *TrackChild {
if album.TagArtist != nil {
ret.ArtistID = album.TagArtist.ID
}
// replace tags that we're present
if ret.Title == "" {
ret.Title = "<title>"
}
if ret.Artist == "" {
ret.Artist = "<artist>"
}
if ret.Album == "" {
ret.Album = "<album>"
}
return ret
}

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

@@ -134,12 +134,12 @@ type TrackChild struct {
}
type Artists struct {
List []*Index `xml:"index,omitempty" json:"index"`
List []*Index `xml:"index" json:"index"`
}
type Artist struct {
ID int `xml:"id,attr,omitempty" json:"id,string"`
Name string `xml:"name,attr,omitempty" json:"name"`
Name string `xml:"name,attr" json:"name"`
CoverID int `xml:"coverArt,attr,omitempty" json:"coverArt,omitempty,string"`
AlbumCount int `xml:"albumCount,attr" json:"albumCount"`
Albums []*Album `xml:"album,omitempty" json:"album,omitempty"`
@@ -147,12 +147,12 @@ type Artist struct {
type Indexes struct {
LastModified int `xml:"lastModified,attr,omitempty" json:"lastModified"`
Index []*Index `xml:"index,omitempty" json:"index"`
Index []*Index `xml:"index" json:"index"`
}
type Index struct {
Name string `xml:"name,attr,omitempty" json:"name"`
Artists []*Artist `xml:"artist,omitempty" json:"artist"`
Artists []*Artist `xml:"artist" json:"artist"`
}
type Directory struct {
@@ -164,7 +164,7 @@ type Directory struct {
}
type MusicFolders struct {
List []*MusicFolder `xml:"musicFolder,omitempty" json:"musicFolder,omitempty"`
List []*MusicFolder `xml:"musicFolder" json:"musicFolder"`
}
type MusicFolder struct {
@@ -224,7 +224,7 @@ type Playlist struct {
Created time.Time `xml:"created,attr" json:"created"`
Duration string `xml:"duration,attr" json:"duration,omitempty"`
Public bool `xml:"public,attr" json:"public,omitempty"`
List []*TrackChild `xml:"entry" json:"entry,omitempty"`
List []*TrackChild `xml:"entry" json:"entry"`
}
type SimilarArtist struct {