third-party-mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-16 12:10:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

More metadata for directories (albums)

Browse Source
This commit is contained in:
Deluan 2016-03-21 09:35:18 -04:00
parent 6a4a178e14
commit 37f72f2efc
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/browsing.go
View File

@ -83,7 +83,15 @@ func (c *BrowsingController) GetDirectory() {
}
func (c *BrowsingController) buildDirectory(d *engine.DirectoryInfo) *responses.Directory {
dir := &responses.Directory{Id: d.Id, Name: d.Name}
dir := &responses.Directory{
Id: d.Id,
Name: d.Name,
Parent: d.Parent,
PlayCount: d.PlayCount,
}
if !d.Starred.IsZero() {
dir.Starred = &d.Starred
}
dir.Child = make([]responses.Child, len(d.Entries))
for i, entry := range d.Entries {

12
api/responses/responses.go
View File

@ -104,15 +104,15 @@ type Child struct {
}
type Directory struct {
Child []Child `xml:"child" json:"child,omitempty"`
Id string `xml:"id,attr" json:"id"`
Name string `xml:"name,attr" json:"name"`
Child []Child `xml:"child" json:"child,omitempty"`
Id string `xml:"id,attr" json:"id"`
Name string `xml:"name,attr" json:"name"`
Parent string `xml:"parent,attr,omitempty" json:"parent,omitempty"`
Starred *time.Time `xml:"starred,attr,omitempty" json:"starred,omitempty"`
PlayCount int32 `xml:"playCount,attr,omitempty" json:"playcount,omitempty"`
/*
<xs:attribute name="parent" type="xs:string" use="optional"/>
<xs:attribute name="starred" type="xs:dateTime" use="optional"/> <!-- Added in 1.10.1 -->
<xs:attribute name="userRating" type="sub:UserRating" use="optional"/> <!-- Added in 1.13.0 -->
<xs:attribute name="averageRating" type="sub:AverageRating" use="optional"/> <!-- Added in 1.13.0 -->
<xs:attribute name="playCount" type="xs:long" use="optional"/> <!-- Added in 1.14.0 -->
*/
}

20
engine/browser.go
View File

@ -54,9 +54,12 @@ func (b browser) Indexes(ifModifiedSince time.Time) (domain.ArtistIndexes, time.
}
type DirectoryInfo struct {
Id string
Name string
Entries Entries
Id string
Name string
Entries Entries
Parent string
Starred time.Time
PlayCount int32
}
func (c browser) Directory(id string) (*DirectoryInfo, error) {
@ -90,12 +93,21 @@ func (c browser) buildArtistDir(a *domain.Artist, albums domain.Albums) *Directo
dir.Entries = make(Entries, len(albums))
for i, al := range albums {
dir.Entries[i] = FromAlbum(&al)
dir.PlayCount += int32(al.PlayCount)
}
return dir
}
func (c browser) buildAlbumDir(al *domain.Album, tracks domain.MediaFiles) *DirectoryInfo {
dir := &DirectoryInfo{Id: al.Id, Name: al.Name}
dir := &DirectoryInfo{
Id: al.Id,
Name: al.Name,
Parent: al.ArtistId,
PlayCount: int32(al.PlayCount),
}
if al.Starred {
dir.Starred = al.UpdatedAt
}
dir.Entries = make(Entries, len(tracks))
for i, mf := range tracks {