initialise slices for browse-by-tag children
related https://github.com/sentriz/gonic/pull/397#issuecomment-1806808586
This commit is contained in:
@@ -9,15 +9,18 @@ import (
|
|||||||
|
|
||||||
func NewAlbumByTags(a *db.Album, artists []*db.Artist) *Album {
|
func NewAlbumByTags(a *db.Album, artists []*db.Artist) *Album {
|
||||||
ret := &Album{
|
ret := &Album{
|
||||||
Created: a.CreatedAt,
|
|
||||||
ID: a.SID(),
|
ID: a.SID(),
|
||||||
|
Created: a.CreatedAt,
|
||||||
|
Artists: []*ArtistRef{},
|
||||||
|
DisplayArtist: a.TagAlbumArtist,
|
||||||
|
Title: a.TagTitle,
|
||||||
Album: a.TagTitle,
|
Album: a.TagTitle,
|
||||||
Name: a.TagTitle,
|
Name: a.TagTitle,
|
||||||
Title: a.TagTitle,
|
|
||||||
Year: a.TagYear,
|
|
||||||
TrackCount: a.ChildCount,
|
TrackCount: a.ChildCount,
|
||||||
Duration: a.Duration,
|
Duration: a.Duration,
|
||||||
DisplayArtist: a.TagAlbumArtist,
|
Genres: []*GenreRef{},
|
||||||
|
Year: a.TagYear,
|
||||||
|
Tracks: []*TrackChild{},
|
||||||
AverageRating: formatRating(a.AverageRating),
|
AverageRating: formatRating(a.AverageRating),
|
||||||
}
|
}
|
||||||
if a.Cover != "" {
|
if a.Cover != "" {
|
||||||
@@ -54,29 +57,29 @@ func NewAlbumByTags(a *db.Album, artists []*db.Artist) *Album {
|
|||||||
func NewTrackByTags(t *db.Track, album *db.Album) *TrackChild {
|
func NewTrackByTags(t *db.Track, album *db.Album) *TrackChild {
|
||||||
ret := &TrackChild{
|
ret := &TrackChild{
|
||||||
ID: t.SID(),
|
ID: t.SID(),
|
||||||
ContentType: t.MIME(),
|
|
||||||
Suffix: formatExt(t.Ext()),
|
|
||||||
ParentID: t.AlbumSID(),
|
|
||||||
CreatedAt: t.CreatedAt,
|
|
||||||
Size: t.Size,
|
|
||||||
Title: t.TagTitle,
|
|
||||||
Artist: t.TagTrackArtist,
|
|
||||||
DisplayArtist: t.TagTrackArtist,
|
|
||||||
AlbumDisplayArtist: album.TagAlbumArtist,
|
|
||||||
TrackNumber: t.TagTrackNumber,
|
|
||||||
DiscNumber: t.TagDiscNumber,
|
|
||||||
Path: filepath.Join(
|
|
||||||
album.LeftPath,
|
|
||||||
album.RightPath,
|
|
||||||
t.Filename,
|
|
||||||
),
|
|
||||||
Album: album.TagTitle,
|
Album: album.TagTitle,
|
||||||
AlbumID: album.SID(),
|
AlbumID: album.SID(),
|
||||||
Duration: t.Length,
|
Artist: t.TagTrackArtist,
|
||||||
|
Artists: []*ArtistRef{},
|
||||||
|
DisplayArtist: t.TagTrackArtist,
|
||||||
|
AlbumArtists: []*ArtistRef{},
|
||||||
|
AlbumDisplayArtist: album.TagAlbumArtist,
|
||||||
Bitrate: t.Bitrate,
|
Bitrate: t.Bitrate,
|
||||||
|
ContentType: t.MIME(),
|
||||||
|
CreatedAt: t.CreatedAt,
|
||||||
|
Duration: t.Length,
|
||||||
|
Genres: []*GenreRef{},
|
||||||
|
ParentID: t.AlbumSID(),
|
||||||
|
Path: filepath.Join(album.LeftPath, album.RightPath, t.Filename),
|
||||||
|
Size: t.Size,
|
||||||
|
Suffix: formatExt(t.Ext()),
|
||||||
|
Title: t.TagTitle,
|
||||||
|
TrackNumber: t.TagTrackNumber,
|
||||||
|
DiscNumber: t.TagDiscNumber,
|
||||||
Type: "music",
|
Type: "music",
|
||||||
Year: album.TagYear,
|
Year: album.TagYear,
|
||||||
AverageRating: formatRating(t.AverageRating),
|
AverageRating: formatRating(t.AverageRating),
|
||||||
|
TranscodeMeta: TranscodeMeta{},
|
||||||
}
|
}
|
||||||
if album.Cover != "" {
|
if album.Cover != "" {
|
||||||
ret.CoverID = album.SID()
|
ret.CoverID = album.SID()
|
||||||
@@ -113,6 +116,7 @@ func NewArtistByTags(a *db.Artist) *Artist {
|
|||||||
ID: a.SID(),
|
ID: a.SID(),
|
||||||
Name: a.Name,
|
Name: a.Name,
|
||||||
AlbumCount: a.AlbumCount,
|
AlbumCount: a.AlbumCount,
|
||||||
|
Albums: []*Album{},
|
||||||
AverageRating: formatRating(a.AverageRating),
|
AverageRating: formatRating(a.AverageRating),
|
||||||
}
|
}
|
||||||
if a.Info != nil && a.Info.ImageURL != "" {
|
if a.Info != nil && a.Info.ImageURL != "" {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
"id": "al-2",
|
"id": "al-2",
|
||||||
"created": "2019-11-30T00:00:00Z",
|
"created": "2019-11-30T00:00:00Z",
|
||||||
"artist": "",
|
"artist": "",
|
||||||
"artists": null,
|
"artists": [],
|
||||||
"displayArtist": "",
|
"displayArtist": "",
|
||||||
"title": "",
|
"title": "",
|
||||||
"album": "",
|
"album": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user