mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix Bookmarks Subsonic support (#1099)

Browse source 
JSON responses were incorrect
This commit is contained in:
Deluan 2021-05-07 09:47:13 -04:00
parent 47f4e0a4de
commit 3e8d3e78c2
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/subsonic/bookmarks.go
View file

@ -31,7 +31,7 @@ func (c *BookmarksController) GetBookmarks(w http.ResponseWriter, r *http.Reques
response.Bookmarks = &responses.Bookmarks{} response.Bookmarks = &responses.Bookmarks{}
for _, bmk := range bmks { for _, bmk := range bmks {
b := responses.Bookmark{ b := responses.Bookmark{
Entry: []responses.Child{childFromMediaFile(r.Context(), bmk.Item)}, Entry: childFromMediaFile(r.Context(), bmk.Item),
Position: bmk.Position, Position: bmk.Position,
Username: user.UserName, Username: user.UserName,
Comment: bmk.Comment, Comment: bmk.Comment,

2
server/subsonic/responses/.snapshots/responses-snapshotMatcher-Match-Responses Bookmarks with data should match .JSON
View file

@ -1 +1 @@
{"status":"ok","version":"1.8.0","type":"navidrome","serverVersion":"v0.0.0","bookmarks":{"bookmark":[{"entry":[{"id":"1","isDir":false,"title":"title","isVideo":false}],"position":123,"username":"user2","comment":"a comment","created":"0001-01-01T00:00:00Z","changed":"0001-01-01T00:00:00Z"}]}} {"status":"ok","version":"1.8.0","type":"navidrome","serverVersion":"v0.0.0","bookmarks":{"bookmark":[{"entry":{"id":"1","isDir":false,"title":"title","isVideo":false},"position":123,"username":"user2","comment":"a comment","created":"0001-01-01T00:00:00Z","changed":"0001-01-01T00:00:00Z"}]}}

2
server/subsonic/responses/responses.go
View file

@ -328,7 +328,7 @@ type PlayQueue struct {
} }
type Bookmark struct { type Bookmark struct {
Entry []Child `xml:"entry,omitempty" json:"entry,omitempty"` Entry Child `xml:"entry,omitempty" json:"entry,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"`
Comment string `xml:"comment,attr" json:"comment"` Comment string `xml:"comment,attr" json:"comment"`

2
server/subsonic/responses/responses_test.go
View file

@ -516,7 +516,7 @@ var _ = Describe("Responses", func() {
Created: time.Time{}, Created: time.Time{},
Changed: time.Time{}, Changed: time.Time{},
} }
bmk.Entry = []Child{{Id: "1", Title: "title", IsDir: false}} bmk.Entry = Child{Id: "1", Title: "title", IsDir: false}
response.Bookmarks.Bookmark = []Bookmark{bmk} response.Bookmarks.Bookmark = []Bookmark{bmk}
}) })
It("should match .XML", func() { It("should match .XML", func() {