go fmt
This commit is contained in:
@@ -11,6 +11,3 @@ func (c *GetLicenseController) Get() {
|
||||
response := responses.NewXML(&responses.License{Valid: true})
|
||||
c.Ctx.Output.Body(response)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -20,6 +20,3 @@ func (c *GetMusicFoldersController) Get() {
|
||||
response := responses.NewXML(musicFolders)
|
||||
c.Ctx.Output.Body(response)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-4
@@ -1,8 +1,8 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"github.com/astaxie/beego"
|
||||
"encoding/xml"
|
||||
"github.com/astaxie/beego"
|
||||
"github.com/deluan/gosonic/api/responses"
|
||||
)
|
||||
|
||||
@@ -13,6 +13,3 @@ func (c *PingController) Get() {
|
||||
xmlBody, _ := xml.Marshal(response)
|
||||
c.Ctx.Output.Body([]byte(xml.Header + string(xmlBody)))
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -32,9 +32,9 @@ func init() {
|
||||
}
|
||||
|
||||
type error struct {
|
||||
XMLName xml.Name`xml:"error"`
|
||||
Code int `xml:"code,attr"`
|
||||
Message string `xml:"message,attr"`
|
||||
XMLName xml.Name `xml:"error"`
|
||||
Code int `xml:"code,attr"`
|
||||
Message string `xml:"message,attr"`
|
||||
}
|
||||
|
||||
func NewError(errorCode int) []byte {
|
||||
@@ -47,4 +47,4 @@ func NewError(errorCode int) []byte {
|
||||
response.Body = xmlBody
|
||||
xmlResponse, _ := xml.Marshal(response)
|
||||
return []byte(xml.Header + string(xmlResponse))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,5 +4,5 @@ import "encoding/xml"
|
||||
|
||||
type License struct {
|
||||
XMLName xml.Name `xml:"license"`
|
||||
Valid bool `xml:"valid,attr"`
|
||||
}
|
||||
Valid bool `xml:"valid,attr"`
|
||||
}
|
||||
|
||||
@@ -4,11 +4,11 @@ import "encoding/xml"
|
||||
|
||||
type MusicFolder struct {
|
||||
XMLName xml.Name `xml:"musicFolder"`
|
||||
Id string `xml:"id,attr"`
|
||||
Name string `xml:"name,attr"`
|
||||
Id string `xml:"id,attr"`
|
||||
Name string `xml:"name,attr"`
|
||||
}
|
||||
|
||||
type MusicFolders struct {
|
||||
XMLName xml.Name `xml:"musicFolders"`
|
||||
XMLName xml.Name `xml:"musicFolders"`
|
||||
Folders []MusicFolder `xml:"musicFolders"`
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ 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"`
|
||||
Body []byte `xml:",innerxml"`
|
||||
}
|
||||
|
||||
func NewEmpty() Subsonic {
|
||||
@@ -22,4 +22,4 @@ func NewXML(body interface{}) []byte {
|
||||
response.Body = xmlBody
|
||||
xmlResponse, _ := xml.Marshal(response)
|
||||
return []byte(xml.Header + string(xmlResponse))
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -19,9 +19,9 @@ func Validate(controller ControllerInterface) {
|
||||
}
|
||||
|
||||
func checkParameters(c ControllerInterface) {
|
||||
requiredParameters := []string {"u", "p", "v", "c",}
|
||||
requiredParameters := []string{"u", "p", "v", "c"}
|
||||
|
||||
for _,p := range requiredParameters {
|
||||
for _, p := range requiredParameters {
|
||||
if c.GetString(p) == "" {
|
||||
cancel(c, responses.ERROR_MISSING_PARAMETER)
|
||||
}
|
||||
@@ -31,11 +31,11 @@ func checkParameters(c ControllerInterface) {
|
||||
func authenticate(c ControllerInterface) {
|
||||
user := c.GetString("u")
|
||||
pass := c.GetString("p") // TODO Handle hex-encoded password
|
||||
if (user != beego.AppConfig.String("user") || pass != beego.AppConfig.String("password")) {
|
||||
if user != beego.AppConfig.String("user") || pass != beego.AppConfig.String("password") {
|
||||
cancel(c, responses.ERROR_AUTHENTICATION_FAIL)
|
||||
}
|
||||
}
|
||||
|
||||
func cancel(c ControllerInterface, code int) {
|
||||
c.CustomAbort(200, string(responses.NewError(code)))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user