feat(subsonic)!: don't return gonic version from responses

sentriz · May 8, 2021 · 58624f0 · 58624f0
1 parent e9743f0
commit 58624f0
Show file tree

Hide file tree

Showing 24 changed files with 134 additions and 160 deletions.
diff --git a/server/ctrlsubsonic/spec/spec.go b/server/ctrlsubsonic/spec/spec.go
@@ -18,7 +18,6 @@ type Response struct {
 	Version           string             `xml:"version,attr"      json:"version"`
 	XMLNS             string             `xml:"xmlns,attr"        json:"-"`
 	Type              string             `xml:"type,attr"         json:"type"`
-	GonicVersion      string             `xml:"gonicVersion,attr" json:"gonicVersion"`
 	Error             *Error             `xml:"error"             json:"error,omitempty"`
 	Albums            *Albums            `xml:"albumList"         json:"albumList,omitempty"`
 	AlbumsTwo         *Albums            `xml:"albumList2"        json:"albumList2,omitempty"`
@@ -50,11 +49,10 @@ type Response struct {
 
 func NewResponse() *Response {
 	return &Response{
-		Status:       "ok",
-		XMLNS:        xmlns,
-		Version:      apiVersion,
-		Type:         gonic.Name,
-		GonicVersion: gonic.Version,
+		Status:  "ok",
+		XMLNS:   xmlns,
+		Version: apiVersion,
+		Type:    gonic.Name,
 	}
 }
 
@@ -82,8 +80,7 @@ func NewError(code int, message string, a ...interface{}) *Response {
 			Code:    code,
 			Message: fmt.Sprintf(message, a...),
 		},
-		Type:         gonic.Name,
-		GonicVersion: gonic.Version,
+		Type: gonic.Name,
 	}
 }
 

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList": {
       "album": [
         {

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList": {
       "album": [
         {

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_newest b/server/ctrlsubsonic/testdata/test_get_album_list_newest
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList": {
       "album": [
         {

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_random b/server/ctrlsubsonic/testdata/test_get_album_list_random
@@ -3,20 +3,32 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList": {
       "album": [
         {
-          "id": "al-8",
-          "coverArt": "al-8",
-          "artist": "13th Floor Lowervators",
-          "title": "(1967) Easter Nowhere",
+          "id": "al-16",
+          "coverArt": "al-16",
+          "artist": "Swell Maps",
+          "title": "(1980) Jane From Occupied Europe",
           "album": "",
-          "parent": "al-7",
+          "parent": "al-15",
           "isDir": true,
           "name": "",
-          "songCount": 10,
-          "duration": 2609,
+          "songCount": 16,
+          "duration": 3040,
+          "created": "0001-01-01T00:00:00Z"
+        },
+        {
+          "id": "al-19",
+          "coverArt": "al-19",
+          "artist": "Ten Years After",
+          "title": "(1967) Ten Years After",
+          "album": "",
+          "parent": "al-18",
+          "isDir": true,
+          "name": "",
+          "songCount": 15,
+          "duration": 3812,
           "created": "0001-01-01T00:00:00Z"
         },
         {
@@ -33,54 +45,55 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-16",
-          "coverArt": "al-16",
-          "artist": "Swell Maps",
-          "title": "(1980) Jane From Occupied Europe",
+          "id": "al-3",
+          "coverArt": "al-3",
+          "artist": "Jah Wobble, The Edge, Holger Czukay",
+          "title": "(1983) Snake Charmer",
           "album": "",
-          "parent": "al-15",
+          "parent": "al-2",
           "isDir": true,
           "name": "",
-          "songCount": 16,
-          "duration": 3040,
+          "songCount": 5,
+          "duration": 1871,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-5",
-          "coverArt": "al-5",
-          "artist": "A Certain Ratio",
-          "title": "(1994) The Graveyard and the Ballroom",
+          "id": "al-21",
+          "coverArt": "al-21",
+          "artist": "Captain Beefheart",
+          "title": "(1970) Lick My Decals Off, Bitch",
           "album": "",
-          "parent": "al-4",
+          "parent": "al-20",
           "isDir": true,
           "name": "",
-          "songCount": 14,
-          "duration": 2738,
+          "songCount": 15,
+          "duration": 2324,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-6",
+          "id": "al-5",
+          "coverArt": "al-5",
           "artist": "A Certain Ratio",
-          "title": "(1981) To EachOTHER.",
+          "title": "(1994) The Graveyard and the Ballroom",
           "album": "",
           "parent": "al-4",
           "isDir": true,
           "name": "",
-          "songCount": 9,
-          "duration": 2801,
+          "songCount": 14,
+          "duration": 2738,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-13",
-          "coverArt": "al-13",
-          "artist": "There",
-          "title": "(2010) Anika",
+          "id": "al-8",
+          "coverArt": "al-8",
+          "artist": "13th Floor Lowervators",
+          "title": "(1967) Easter Nowhere",
           "album": "",
-          "parent": "al-12",
+          "parent": "al-7",
           "isDir": true,
           "name": "",
-          "songCount": 9,
-          "duration": 2169,
+          "songCount": 10,
+          "duration": 2609,
           "created": "0001-01-01T00:00:00Z"
         },
         {
@@ -97,42 +110,28 @@
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-21",
-          "coverArt": "al-21",
-          "artist": "Captain Beefheart",
-          "title": "(1970) Lick My Decals Off, Bitch",
-          "album": "",
-          "parent": "al-20",
-          "isDir": true,
-          "name": "",
-          "songCount": 15,
-          "duration": 2324,
-          "created": "0001-01-01T00:00:00Z"
-        },
-        {
-          "id": "al-3",
-          "coverArt": "al-3",
-          "artist": "Jah Wobble, The Edge, Holger Czukay",
-          "title": "(1983) Snake Charmer",
+          "id": "al-6",
+          "artist": "A Certain Ratio",
+          "title": "(1981) To EachOTHER.",
           "album": "",
-          "parent": "al-2",
+          "parent": "al-4",
           "isDir": true,
           "name": "",
-          "songCount": 5,
-          "duration": 1871,
+          "songCount": 9,
+          "duration": 2801,
           "created": "0001-01-01T00:00:00Z"
         },
         {
-          "id": "al-19",
-          "coverArt": "al-19",
-          "artist": "Ten Years After",
-          "title": "(1967) Ten Years After",
+          "id": "al-13",
+          "coverArt": "al-13",
+          "artist": "There",
+          "title": "(2010) Anika",
           "album": "",
-          "parent": "al-18",
+          "parent": "al-12",
           "isDir": true,
           "name": "",
-          "songCount": 15,
-          "duration": 3812,
+          "songCount": 9,
+          "duration": 2169,
           "created": "0001-01-01T00:00:00Z"
         }
       ]

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList2": {
       "album": [
         {

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name b/server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList2": {
       "album": [
         {

diff --git a/server/ctrlsubsonic/testdata/test_get_album_list_two_newest b/server/ctrlsubsonic/testdata/test_get_album_list_two_newest
@@ -3,7 +3,6 @@
     "status": "ok",
     "version": "1.15.0",
     "type": "gonic",
-    "gonicVersion": "v0.12.3",
     "albumList2": {
       "album": [
         {