mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Introduced helper methods for parsing/biding request parameters

Browse source
This commit is contained in:
Deluan 2016-03-07 14:13:01 -05:00
parent 91c660c746
commit 28bef732cf
8 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -3,4 +3,5 @@
static/Jamstash
devDb
/tmp
.vendor
.vendor
wiki

16
api/base_api_controller.go
View file

@ -5,6 +5,8 @@ import (
"fmt"
"github.com/astaxie/beego"
"github.com/deluan/gosonic/api/responses"
"github.com/deluan/gosonic/utils"
"time"
)
type BaseAPIController struct{ beego.Controller }
@ -13,7 +15,7 @@ func (c *BaseAPIController) NewEmpty() responses.Subsonic {
return responses.Subsonic{Status: "ok", Version: beego.AppConfig.String("apiVersion")}
}
func (c *BaseAPIController) GetParameter(param string, msg string) string {
func (c *BaseAPIController) RequiredParamString(param string, msg string) string {
p := c.Input().Get(param)
if p == "" {
c.SendError(responses.ERROR_MISSING_PARAMETER, msg)
@ -21,6 +23,18 @@ func (c *BaseAPIController) GetParameter(param string, msg string) string {
return p
}
func (c *BaseAPIController) ParamTime(param string) time.Time {
var value int64
c.Ctx.Input.Bind(&value, param)
return utils.ToTime(value)
}
func (c *BaseAPIController) ParamInt(param string) int {
var value int
c.Ctx.Input.Bind(&value, param)
return value
}
func (c *BaseAPIController) SendError(errorCode int, message ...interface{}) {
response := responses.Subsonic{Version: beego.AppConfig.String("apiVersion"), Status: "fail"}
var msg string

8
api/get_album_list.go
View file

@ -27,7 +27,7 @@ func (c *GetAlbumListController) Prepare() {
}
func (c *GetAlbumListController) Get() {
typ := c.GetParameter("type", "Required string parameter 'type' is not present")
typ := c.RequiredParamString("type", "Required string parameter 'type' is not present")
qo, found := c.types[typ]
if !found {
@ -35,10 +35,8 @@ func (c *GetAlbumListController) Get() {
c.SendError(responses.ERROR_GENERIC, "Not implemented!")
}
qo.Size = 10
c.Ctx.Input.Bind(&qo.Size, "size")
qo.Size = utils.MinInt(qo.Size, 500)
c.Ctx.Input.Bind(&qo.Offset, "offset")
qo.Size = utils.MinInt(c.ParamInt("size"), 500)
qo.Offset = c.ParamInt("offset")
albums, err := c.albumRepo.GetAll(qo)
if err != nil {

2
api/get_cover_art.go
View file

@ -22,7 +22,7 @@ func (c *GetCoverArtController) Prepare() {
// TODO accept size parameter
func (c *GetCoverArtController) Get() {
id := c.GetParameter("id", "id parameter required")
id := c.RequiredParamString("id", "id parameter required")
mf, err := c.repo.Get(id)
if err != nil {

7
api/get_indexes.go
View file

@ -23,12 +23,9 @@ func (c *GetIndexesController) Prepare() {
// TODO: Shortcuts amd validate musicFolder parameter
func (c *GetIndexesController) Get() {
var err error
ifModifiedSince := c.ParamTime("ifModifiedSince")
var ifModifiedSince int64
c.Ctx.Input.Bind(&ifModifiedSince, "ifModifiedSince")
indexes, lastModified, err := c.browser.Indexes(utils.ToTime(ifModifiedSince))
indexes, lastModified, err := c.browser.Indexes(ifModifiedSince)
if err != nil {
beego.Error("Error retrieving Indexes:", err)
c.SendError(responses.ERROR_GENERIC, "Internal Error")

2
api/get_music_directory.go
View file

@ -23,7 +23,7 @@ func (c *GetMusicDirectoryController) Prepare() {
}
func (c *GetMusicDirectoryController) Get() {
id := c.GetParameter("id", "id parameter required")
id := c.RequiredParamString("id", "id parameter required")
response := c.NewEmpty()

5
api/stream.go
View file

@ -20,7 +20,7 @@ type StreamController struct {
func (c *StreamController) Prepare() {
inject.ExtractAssignable(utils.Graph, &c.repo)
c.id = c.GetParameter("id", "id parameter required")
c.id = c.RequiredParamString("id", "id parameter required")
mf, err := c.repo.Get(c.id)
if err != nil {
@ -39,8 +39,7 @@ func (c *StreamController) Prepare() {
// TODO Still getting the "Conn.Write wrote more than the declared Content-Length" error.
// Don't know if this causes any issues
func (c *StreamController) Stream() {
var maxBitRate int
c.Ctx.Input.Bind(&maxBitRate, "maxBitRate")
maxBitRate := c.ParamInt("maxBitRate")
maxBitRate = utils.MinInt(c.mf.BitRate, maxBitRate)
beego.Debug("Streaming file", c.id, ":", c.mf.Path)

5
api/users.go
View file

@ -4,13 +4,12 @@ import "github.com/deluan/gosonic/api/responses"
type UsersController struct{ BaseAPIController }
// TODO This is a placeholder. The real one has to read this info from a config file
// TODO This is a placeholder. The real one has to read this info from a config file or the database
func (c *UsersController) GetUser() {
r := c.NewEmpty()
r.User = &responses.User{}
r.User.Username = c.GetParameter("username", "Required string parameter 'username' is not present")
r.User.Username = c.RequiredParamString("username", "Required string parameter 'username' is not present")
r.User.StreamRole = true
r.User.DownloadRole = true
c.SendResponse(r)
}