Refactored responses

api/get_indexes.go

@@ -30,7 +30,7 @@ func (c *GetIndexesController) Get() {
 		ifModifiedSince = "0"
 	}
 
-	res := &responses.ArtistIndex{}
+	res := responses.ArtistIndex{}
 	res.IgnoredArticles = beego.AppConfig.String("ignoredArticles")
 
 	res.LastModified, err = c.properties.DefaultGet(consts.LastScan, "-1")
@@ -61,5 +61,7 @@ func (c *GetIndexesController) Get() {
 
 	}
 
-	c.Ctx.Output.Body(responses.NewXML(res))
+	response := responses.NewEmpty()
+	response.ArtistIndex = res
+	c.Ctx.Output.Body(responses.ToXML(response))
 }

api/get_license.go

@@ -8,6 +8,8 @@ import (
 type GetLicenseController struct{ beego.Controller }
 
 func (c *GetLicenseController) Get() {
-	response := responses.NewXML(&responses.License{Valid: true})
+	response := responses.NewEmpty()
-	c.Ctx.Output.Body(response)
+	response.License = responses.License{Valid: true}
+
+	c.Ctx.Output.Body(responses.ToXML(response))
 }

api/get_music_folders.go

@@ -24,7 +24,7 @@ func (c *GetMusicFoldersController) Get() {
 		folders[i].Id = f.Id
 		folders[i].Name = f.Name
 	}
-	musicFolders := &responses.MusicFolders{Folders: folders}
+	response := responses.NewEmpty()
-	response := responses.NewXML(musicFolders)
+	response.MusicFolders = responses.MusicFolders{Folders: folders}
-	c.Ctx.Output.Body(response)
+	c.Ctx.Output.Body(responses.ToXML(response))
 }

api/ping.go

@@ -1,7 +1,6 @@
 package api
 
 import (
-	"encoding/xml"
 	"github.com/astaxie/beego"
 	"github.com/deluan/gosonic/api/responses"
 )
@@ -9,7 +8,5 @@ import (
 type PingController struct{ beego.Controller }
 
 func (c *PingController) Get() {
-	response := responses.NewEmpty()
+	c.Ctx.Output.Body(responses.ToXML(responses.NewEmpty()))
-	xmlBody, _ := xml.Marshal(response)
-	c.Ctx.Output.Body([]byte(xml.Header + string(xmlBody)))
 }

api/responses/indexes.go

@@ -1,23 +0,0 @@
-package responses
-
-import "encoding/xml"
-
-type IdxArtist struct {
-	XMLName xml.Name `xml:"artist"`
-	Id      string   `xml:"id,attr"`
-	Name    string   `xml:"name,attr"`
-}
-
-type IdxIndex struct {
-	XMLName xml.Name    `xml:"index"`
-	Name    string      `xml:"name,attr"`
-	Artists []IdxArtist `xml:"index"`
-}
-
-type ArtistIndex struct {
-	XMLName         xml.Name   `xml:"indexes"`
-	Index           []IdxIndex `xml:"indexes"`
-	LastModified	string     `xml:"lastModified,attr"`
-	IgnoredArticles string     `xml:"ignoredArticles,attr"`
-}
-

api/responses/license.go

@@ -1,8 +0,0 @@
-package responses
-
-import "encoding/xml"
-
-type License struct {
-	XMLName xml.Name `xml:"license"`
-	Valid   bool     `xml:"valid,attr"`
-}

api/responses/music_folders.go

@@ -1,14 +0,0 @@
-package responses
-
-import "encoding/xml"
-
-type MusicFolder struct {
-	XMLName xml.Name `xml:"musicFolder"`
-	Id      string   `xml:"id,attr"`
-	Name    string   `xml:"name,attr"`
-}
-
-type MusicFolders struct {
-	XMLName xml.Name      `xml:"musicFolders"`
-	Folders []MusicFolder `xml:"musicFolders"`
-}

api/responses/responses.go

@@ -0,0 +1,49 @@
+package responses
+
+import "encoding/xml"
+
+type Subsonic struct {
+	XMLName      xml.Name `xml:"http://subsonic.org/restapi subsonic-response"`
+	Status       string   `xml:"status,attr"`
+	Version      string   `xml:"version,attr"`
+	Body         []byte   `xml:",innerxml"`
+	License      License  `xml:",omitempty"`
+	MusicFolders MusicFolders `xml:",omitempty"`
+	ArtistIndex  ArtistIndex `xml:",omitempty"`
+}
+
+type License struct {
+	XMLName xml.Name `xml:"license"`
+	Valid   bool     `xml:"valid,attr"`
+}
+
+type MusicFolder struct {
+	XMLName xml.Name `xml:"musicFolder"`
+	Id      string   `xml:"id,attr"`
+	Name    string   `xml:"name,attr"`
+}
+
+type MusicFolders struct {
+	XMLName xml.Name      `xml:"musicFolders"`
+	Folders []MusicFolder `xml:"musicFolders"`
+}
+
+type IdxArtist struct {
+	XMLName xml.Name `xml:"artist"`
+	Id      string   `xml:"id,attr"`
+	Name    string   `xml:"name,attr"`
+}
+
+type IdxIndex struct {
+	XMLName xml.Name    `xml:"index"`
+	Name    string      `xml:"name,attr"`
+	Artists []IdxArtist `xml:"index"`
+}
+
+type ArtistIndex struct {
+	XMLName         xml.Name   `xml:"indexes"`
+	Index           []IdxIndex `xml:"indexes"`
+	LastModified    string     `xml:"lastModified,attr"`
+	IgnoredArticles string     `xml:"ignoredArticles,attr"`
+}
+

api/responses/subsonic.go

@@ -5,21 +5,11 @@ import (
 	"github.com/astaxie/beego"
 )
 
-type Subsonic struct {
-	XMLName xml.Name `xml:"http://subsonic.org/restapi subsonic-response"`
-	Status  string   `xml:"status,attr"`
-	Version string   `xml:"version,attr"`
-	Body    []byte   `xml:",innerxml"`
-}
-
 func NewEmpty() Subsonic {
 	return Subsonic{Status: "ok", Version: beego.AppConfig.String("apiVersion")}
 }
 
-func NewXML(body interface{}) []byte {
+func ToXML(response Subsonic) []byte {
-	response := NewEmpty()
+	xmlBody, _ := xml.Marshal(response)
-	xmlBody, _ := xml.Marshal(body)
+	return []byte(xml.Header + string(xmlBody))
-	response.Body = xmlBody
-	xmlResponse, _ := xml.Marshal(response)
-	return []byte(xml.Header + string(xmlResponse))
 }