arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactored responses

Browse Source
This commit is contained in:
Deluan
2016-03-02 11:11:46 -05:00
parent 77e3aa7620
commit 01c68d6802
9 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/responses/indexes.go
-23
View File
@@ -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
-8
View File
@@ -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
-14
View File
@@ -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
+49
View File
@@ -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
+3 -13
View File
@@ -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 {
response := NewEmpty()
xmlBody, _ := xml.Marshal(body)
response.Body = xmlBody
xmlResponse, _ := xml.Marshal(response)
return []byte(xml.Header + string(xmlResponse))
func ToXML(response Subsonic) []byte {
xmlBody, _ := xml.Marshal(response)
return []byte(xml.Header + string(xmlBody))
}