nik/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2026-05-03 06:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

update play queue types

Browse Source
This commit is contained in:
Kendall Garner 2025-11-07 16:33:22 -08:00
parent 2a62b53f73
commit 72eb314267
No known key found for this signature in database
GPG Key ID: 9355F387FE765C94
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/subsonic/bookmarks.go
View File

@ -91,7 +91,7 @@ func (api *Router) GetPlayQueue(r *http.Request) (*responses.Subsonic, error) {
Current: currentID, Current: currentID,
Position: pq.Position, Position: pq.Position,
Username: user.UserName, Username: user.UserName,
Changed: &pq.UpdatedAt, Changed: pq.UpdatedAt,
ChangedBy: pq.ChangedBy, ChangedBy: pq.ChangedBy,
} }
return response, nil return response, nil
@ -160,7 +160,7 @@ func (api *Router) GetPlayQueueByIndex(r *http.Request) (*responses.Subsonic, er
CurrentIndex: index, CurrentIndex: index,
Position: pq.Position, Position: pq.Position,
Username: user.UserName, Username: user.UserName,
Changed: &pq.UpdatedAt, Changed: pq.UpdatedAt,
ChangedBy: pq.ChangedBy, ChangedBy: pq.ChangedBy,
} }
return response, nil return response, nil

1
server/subsonic/responses/.snapshots/Responses PlayQueue without data should match .JSON
View File

@ -6,6 +6,7 @@
"openSubsonic": true, "openSubsonic": true,
"playQueue": { "playQueue": {
"username": "", "username": "",
"changed": "0001-01-01T00:00:00Z",
"changedBy": "" "changedBy": ""
} }
} }

2
server/subsonic/responses/.snapshots/Responses PlayQueue without data should match .XML
View File

@ -1,3 +1,3 @@
<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true"> <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
<playQueue username="" changedBy=""></playQueue> <playQueue username="" changed="0001-01-01T00:00:00Z" changedBy=""></playQueue>
</subsonic-response> </subsonic-response>

1
server/subsonic/responses/.snapshots/Responses PlayQueueByIndex without data should match .JSON
View File

@ -6,6 +6,7 @@
"openSubsonic": true, "openSubsonic": true,
"playQueueByIndex": { "playQueueByIndex": {
"username": "", "username": "",
"changed": "0001-01-01T00:00:00Z",
"changedBy": "" "changedBy": ""
} }
} }

2
server/subsonic/responses/.snapshots/Responses PlayQueueByIndex without data should match .XML
View File

@ -1,3 +1,3 @@
<subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true"> <subsonic-response xmlns="http://subsonic.org/restapi" status="ok" version="1.16.1" type="navidrome" serverVersion="v0.55.0" openSubsonic="true">
<playQueueByIndex username="" changedBy=""></playQueueByIndex> <playQueueByIndex username="" changed="0001-01-01T00:00:00Z" changedBy=""></playQueueByIndex>
</subsonic-response> </subsonic-response>

24
server/subsonic/responses/responses.go
View File

@ -440,21 +440,21 @@ type TopSongs struct {
} }
type PlayQueue struct { type PlayQueue struct {
Entry []Child `xml:"entry,omitempty" json:"entry,omitempty"` Entry []Child `xml:"entry,omitempty" json:"entry,omitempty"`
Current string `xml:"current,attr,omitempty" json:"current,omitempty"` Current string `xml:"current,attr,omitempty" json:"current,omitempty"`
Position int64 `xml:"position,attr,omitempty" json:"position,omitempty"` Position int64 `xml:"position,attr,omitempty" json:"position,omitempty"`
Username string `xml:"username,attr" json:"username"` Username string `xml:"username,attr" json:"username"`
Changed *time.Time `xml:"changed,attr,omitempty" json:"changed,omitempty"` Changed time.Time `xml:"changed,attr" json:"changed"`
ChangedBy string `xml:"changedBy,attr" json:"changedBy"` ChangedBy string `xml:"changedBy,attr" json:"changedBy"`
} }
type PlayQueueByIndex struct { type PlayQueueByIndex struct {
Entry []Child `xml:"entry,omitempty" json:"entry,omitempty"` Entry []Child `xml:"entry,omitempty" json:"entry,omitempty"`
CurrentIndex *int `xml:"currentIndex,attr,omitempty" json:"currentIndex,omitempty"` CurrentIndex *int `xml:"currentIndex,attr,omitempty" json:"currentIndex,omitempty"`
Position int64 `xml:"position,attr,omitempty" json:"position,omitempty"` Position int64 `xml:"position,attr,omitempty" json:"position,omitempty"`
Username string `xml:"username,attr" json:"username"` Username string `xml:"username,attr" json:"username"`
Changed *time.Time `xml:"changed,attr,omitempty" json:"changed,omitempty"` Changed time.Time `xml:"changed,attr" json:"changed"`
ChangedBy string `xml:"changedBy,attr" json:"changedBy"` ChangedBy string `xml:"changedBy,attr" json:"changedBy"`
} }
type Bookmark struct { type Bookmark struct {

4
server/subsonic/responses/responses_test.go
View File

@ -768,7 +768,7 @@ var _ = Describe("Responses", func() {
response.PlayQueue.Username = "user1" response.PlayQueue.Username = "user1"
response.PlayQueue.Current = "111" response.PlayQueue.Current = "111"
response.PlayQueue.Position = 243 response.PlayQueue.Position = 243
response.PlayQueue.Changed = &time.Time{} response.PlayQueue.Changed = time.Time{}
response.PlayQueue.ChangedBy = "a_client" response.PlayQueue.ChangedBy = "a_client"
child := make([]Child, 1) child := make([]Child, 1)
child[0] = Child{Id: "1", Title: "title", IsDir: false} child[0] = Child{Id: "1", Title: "title", IsDir: false}
@ -802,7 +802,7 @@ var _ = Describe("Responses", func() {
response.PlayQueueByIndex.Username = "user1" response.PlayQueueByIndex.Username = "user1"
response.PlayQueueByIndex.CurrentIndex = gg.P(0) response.PlayQueueByIndex.CurrentIndex = gg.P(0)
response.PlayQueueByIndex.Position = 243 response.PlayQueueByIndex.Position = 243
response.PlayQueueByIndex.Changed = &time.Time{} response.PlayQueueByIndex.Changed = time.Time{}
response.PlayQueueByIndex.ChangedBy = "a_client" response.PlayQueueByIndex.ChangedBy = "a_client"
child := make([]Child, 1) child := make([]Child, 1)
child[0] = Child{Id: "1", Title: "title", IsDir: false} child[0] = Child{Id: "1", Title: "title", IsDir: false}