From adfec414a10bfbf1b4a723e0253c68a24ae24175 Mon Sep 17 00:00:00 2001
From: Deluan <github@deluan.com>
Date: Thu, 3 Mar 2016 17:41:11 -0500
Subject: [PATCH] Renamed parameter validation method and removed "side effect"

---
 api/base_api_controller.go | 3 +--
 api/get_cover_art.go       | 2 +-
 api/get_music_directory.go | 2 +-
 api/stream.go              | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/api/base_api_controller.go b/api/base_api_controller.go
index 716d0fc44..780b45bef 100644
--- a/api/base_api_controller.go
+++ b/api/base_api_controller.go
@@ -13,12 +13,11 @@ func (c *BaseAPIController) NewEmpty() responses.Subsonic {
 	return responses.Subsonic{Status: "ok", Version: beego.AppConfig.String("apiVersion")}
 }
 
-func (c *BaseAPIController) ValidateParameters(param string, msg string) string {
+func (c *BaseAPIController) GetParameter(param string, msg string) string {
 	p := c.Input().Get(param)
 	if p == "" {
 		c.SendError(responses.ERROR_MISSING_PARAMETER, msg)
 	}
-	c.Data[param] = p
 	return p
 }
 
diff --git a/api/get_cover_art.go b/api/get_cover_art.go
index 227befb28..7daf9e558 100644
--- a/api/get_cover_art.go
+++ b/api/get_cover_art.go
@@ -21,7 +21,7 @@ func (c *GetCoverArtController) Prepare() {
 }
 
 func (c *GetCoverArtController) Get() {
-	id := c.ValidateParameters("id", "id parameter required")
+	id := c.GetParameter("id", "id parameter required")
 
 	mf, err := c.repo.Get(id)
 	if err != nil {
diff --git a/api/get_music_directory.go b/api/get_music_directory.go
index 3cddd9d32..e28e755e7 100644
--- a/api/get_music_directory.go
+++ b/api/get_music_directory.go
@@ -23,7 +23,7 @@ func (c *GetMusicDirectoryController) Prepare() {
 }
 
 func (c *GetMusicDirectoryController) Get() {
-	id := c.ValidateParameters("id", "id parameter required")
+	id := c.GetParameter("id", "id parameter required")
 
 	response := c.NewEmpty()
 
diff --git a/api/stream.go b/api/stream.go
index dd0d2700c..eea243f02 100644
--- a/api/stream.go
+++ b/api/stream.go
@@ -22,7 +22,7 @@ func (c *StreamController) Prepare() {
 
 // For realtime transcoding, see : http://stackoverflow.com/questions/19292113/not-buffered-http-responsewritter-in-golang
 func (c *StreamController) Get() {
-	id := c.ValidateParameters("id", "id parameter required")
+	id := c.GetParameter("id", "id parameter required")
 
 	mf, err := c.repo.Get(id)
 	if err != nil {