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

feat(subsonic): add getOpenSubsonicExtensions endpoint and openSubsonic response key

Browse Source
This commit is contained in:
sentriz
2023-09-28 21:11:15 +01:00
parent e0b1603c00
commit 2caee441ca
30 changed files with 158 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/ctrlsubsonic/handlers_common.go
View File

@@ -35,6 +35,12 @@ func (c *Controller) ServePing(_ *http.Request) *spec.Response {
return spec.NewResponse()
}
func (c *Controller) ServeGetOpenSubsonicExtensions(_ *http.Request) *spec.Response {
sub := spec.NewResponse()
sub.OpenSubsonicExtensions = spec.OpenSubsonicExtensions{}
return sub
}
func (c *Controller) ServeScrobble(r *http.Request) *spec.Response {
user := r.Context().Value(CtxUser).(*db.User)
params := r.Context().Value(CtxParams).(params.Params)

4
server/ctrlsubsonic/routes.go
View File

@@ -9,9 +9,11 @@ func AddRoutes(c *Controller, r *mux.Router) {
// common
r.Handle("/getLicense{_:(?:\\.view)?}", c.H(c.ServeGetLicence))
r.Handle("/ping{_:(?:\\.view)?}", c.H(c.ServePing))
r.Handle("/getOpenSubsonicExtensions{_:(?:\\.view)?}", c.H(c.ServeGetOpenSubsonicExtensions))
r.Handle("/getMusicFolders{_:(?:\\.view)?}", c.H(c.ServeGetMusicFolders))
r.Handle("/getScanStatus{_:(?:\\.view)?}", c.H(c.ServeGetScanStatus))
r.Handle("/ping{_:(?:\\.view)?}", c.H(c.ServePing))
r.Handle("/scrobble{_:(?:\\.view)?}", c.H(c.ServeScrobble))
r.Handle("/startScan{_:(?:\\.view)?}", c.H(c.ServeStartScan))
r.Handle("/getUser{_:(?:\\.view)?}", c.H(c.ServeGetUser))

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

@@ -26,8 +26,10 @@ type Response struct {
XMLNS string `xml:"xmlns,attr" json:"-"`
// https://opensubsonic.netlify.app/docs/responses/subsonic-response/
Type string `xml:"type,attr" json:"type"`
ServerVersion string `xml:"serverVersion,attr" json:"serverVersion"`
Type string `xml:"type,attr" json:"type"`
ServerVersion string `xml:"serverVersion,attr" json:"serverVersion"`
OpenSubsonic bool `xml:"openSubsonic,attr" json:"openSubsonic"`
OpenSubsonicExtensions OpenSubsonicExtensions `xml:"openSubsonicExtensions" json:"openSubsonicExtensions,omitempty"`
Error *Error `xml:"error" json:"error,omitempty"`
Albums *Albums `xml:"albumList" json:"albumList,omitempty"`
@@ -73,6 +75,7 @@ func NewResponse() *Response {
Version: apiVersion,
Type: gonic.Name,
ServerVersion: gonic.Version,
OpenSubsonic: true,
}
}
@@ -429,6 +432,8 @@ type Lyrics struct {
Title string `xml:"title,attr,omitempty" json:"title,omitempty"`
}
type OpenSubsonicExtensions map[string][]int
func formatRating(rating float64) string {
if rating == 0 {
return ""

1
server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_get_album_list_alpha_name vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_get_album_list_newest vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList": {
"album": [
{

83
server/ctrlsubsonic/testdata/test_get_album_list_random vendored
View File

@@ -4,16 +4,30 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList": {
"album": [
{
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"title": "album-1",
"album": "",
"parent": "al-2",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-9",
"coverArt": "al-9",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-6",
"isDir": true,
"name": "",
"songCount": 3,
@@ -33,12 +47,25 @@
"duration": 300
},
{
"id": "al-7",
"coverArt": "al-7",
"artist": "artist-1",
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-8",
"coverArt": "al-8",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-6",
"isDir": true,
"name": "",
@@ -59,37 +86,24 @@
"duration": 300
},
{
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-10",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-8",
"coverArt": "al-8",
"id": "al-7",
"coverArt": "al-7",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-6",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-9",
"coverArt": "al-9",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"title": "album-0",
"album": "",
"parent": "al-6",
"isDir": true,
@@ -109,19 +123,6 @@
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
}
]
}

1
server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList2": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList2": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_get_album_list_two_newest vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList2": {
"album": [
{

149
server/ctrlsubsonic/testdata/test_get_album_list_two_random vendored
View File

@@ -4,17 +4,88 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"albumList2": {
"album": [
{
"id": "al-8",
"coverArt": "al-8",
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artists": [{ "id": "ar-1", "name": "artist-0" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-7",
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artists": [{ "id": "ar-2", "name": "artist-1" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-12",
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artists": [{ "id": "ar-3", "name": "artist-2" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-1",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-13",
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artists": [{ "id": "ar-3", "name": "artist-2" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-9",
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artists": [{ "id": "ar-2", "name": "artist-1" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-4",
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artists": [{ "id": "ar-1", "name": "artist-0" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-1",
"songCount": 3,
"duration": 300,
@@ -49,84 +120,14 @@
"year": 2021
},
{
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artists": [{ "id": "ar-1", "name": "artist-0" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-9",
"coverArt": "al-9",
"id": "al-8",
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artists": [{ "id": "ar-2", "name": "artist-1" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-7",
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artists": [{ "id": "ar-2", "name": "artist-1" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-13",
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artists": [{ "id": "ar-3", "name": "artist-2" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-4",
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artists": [{ "id": "ar-1", "name": "artist-0" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-1",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-12",
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artists": [{ "id": "ar-3", "name": "artist-2" }],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-1",
"songCount": 3,
"duration": 300,

1
server/ctrlsubsonic/testdata/test_get_album_with_cover vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"album": {
"id": "al-3",
"coverArt": "al-3",

1
server/ctrlsubsonic/testdata/test_get_album_without_cover vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"album": {
"id": "al-2",
"created": "2019-11-30T00:00:00Z",

1
server/ctrlsubsonic/testdata/test_get_artist_id_one vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artist": {
"id": "ar-1",
"name": "artist-0",

1
server/ctrlsubsonic/testdata/test_get_artist_id_three vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artist": {
"id": "ar-3",
"name": "artist-2",

1
server/ctrlsubsonic/testdata/test_get_artist_id_two vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artist": {
"id": "ar-2",
"name": "artist-1",

1
server/ctrlsubsonic/testdata/test_get_artists_no_args vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artists": {
"ignoredArticles": "",
"index": [

1
server/ctrlsubsonic/testdata/test_get_artists_with_music_folder_1 vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artists": {
"ignoredArticles": "",
"index": [

1
server/ctrlsubsonic/testdata/test_get_artists_with_music_folder_2 vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"artists": {
"ignoredArticles": "",
"index": [

1
server/ctrlsubsonic/testdata/test_get_indexes_no_args vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"indexes": {
"lastModified": 0,
"ignoredArticles": "",

1
server/ctrlsubsonic/testdata/test_get_indexes_with_music_folder_1 vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"indexes": {
"lastModified": 0,
"ignoredArticles": "",

1
server/ctrlsubsonic/testdata/test_get_indexes_with_music_folder_2 vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"indexes": {
"lastModified": 0,
"ignoredArticles": "",

1
server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"directory": {
"id": "al-3",
"parent": "al-2",

1
server/ctrlsubsonic/testdata/test_get_music_directory_without_tracks vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"directory": {
"id": "al-2",
"parent": "al-1",

1
server/ctrlsubsonic/testdata/test_search_three_q_alb vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult3": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_search_three_q_art vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult3": {
"artist": [
{ "id": "ar-1", "name": "artist-0", "albumCount": 3 },

1
server/ctrlsubsonic/testdata/test_search_three_q_tra vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult3": {
"song": [
{

1
server/ctrlsubsonic/testdata/test_search_two_q_alb vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult2": {
"album": [
{

1
server/ctrlsubsonic/testdata/test_search_two_q_art vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult2": {
"artist": [
{ "id": "al-2", "parent": "al-1", "name": "artist-0" },

1
server/ctrlsubsonic/testdata/test_search_two_q_tra vendored
View File

@@ -4,6 +4,7 @@
"version": "1.15.0",
"type": "gonic",
"serverVersion": "",
"openSubsonic": true,
"searchResult2": {
"song": [
{