From e7ed19abd9389079955e50ed87af658a60e104f1 Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Tue, 28 May 2019 15:07:58 +0100
Subject: [PATCH] responderror auto sprintf

---
 server/handler/handler_sub_by_folder.go | 6 ++----
 server/handler/handler_sub_by_tags.go   | 6 ++----
 server/handler/handler_sub_common.go    | 7 +++----
 server/handler/middleware_sub.go        | 7 +++----
 server/handler/respond_sub.go           | 5 +++--
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/server/handler/handler_sub_by_folder.go b/server/handler/handler_sub_by_folder.go
index f51b10d..65ee1d1 100644
--- a/server/handler/handler_sub_by_folder.go
+++ b/server/handler/handler_sub_by_folder.go
@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/jinzhu/gorm"
@@ -126,9 +125,8 @@ func (c *Controller) GetAlbumList(w http.ResponseWriter, r *http.Request) {
 			user.ID)
 		q = q.Order("plays.time DESC")
 	default:
-		respondError(w, r, 10, fmt.Sprintf(
-			"unknown value `%s` for parameter 'type'", listType,
-		))
+		respondError(w, r, 10,
+			"unknown value `%s` for parameter 'type'", listType)
 		return
 	}
 	var folders []model.Folder
diff --git a/server/handler/handler_sub_by_tags.go b/server/handler/handler_sub_by_tags.go
index f9648a1..2238e6e 100644
--- a/server/handler/handler_sub_by_tags.go
+++ b/server/handler/handler_sub_by_tags.go
@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/jinzhu/gorm"
@@ -122,9 +121,8 @@ func (c *Controller) GetAlbumListTwo(w http.ResponseWriter, r *http.Request) {
 			user.ID)
 		q = q.Order("plays.time DESC")
 	default:
-		respondError(w, r, 10, fmt.Sprintf(
-			"unknown value `%s` for parameter 'type'", listType,
-		))
+		respondError(w, r, 10,
+			"unknown value `%s` for parameter 'type'", listType)
 		return
 	}
 	var albums []model.Album
diff --git a/server/handler/handler_sub_common.go b/server/handler/handler_sub_common.go
index 752e78a..1cf0eb7 100644
--- a/server/handler/handler_sub_common.go
+++ b/server/handler/handler_sub_common.go
@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 	"path"
@@ -38,13 +37,13 @@ func (c *Controller) Stream(w http.ResponseWriter, r *http.Request) {
 		Preload("Folder").
 		First(&track, id)
 	if track.Path == "" {
-		respondError(w, r, 70, fmt.Sprintf("media with id `%d` was not found", id))
+		respondError(w, r, 70, "media with id `%d` was not found", id)
 		return
 	}
 	absPath := path.Join(c.MusicPath, track.Path)
 	file, err := os.Open(absPath)
 	if err != nil {
-		respondError(w, r, 0, fmt.Sprintf("error while streaming media: %v", err))
+		respondError(w, r, 0, "error while streaming media: %v", err)
 		return
 	}
 	stat, _ := file.Stat()
@@ -117,7 +116,7 @@ func (c *Controller) Scrobble(w http.ResponseWriter, r *http.Request) {
 		getStrParamOr(r, "submission", "true") != "false",
 	)
 	if err != nil {
-		respondError(w, r, 0, fmt.Sprintf("error when submitting: %v", err))
+		respondError(w, r, 0, "error when submitting: %v", err)
 		return
 	}
 	sub := subsonic.NewResponse()
diff --git a/server/handler/middleware_sub.go b/server/handler/middleware_sub.go
index 8f4388e..e19cac3 100644
--- a/server/handler/middleware_sub.go
+++ b/server/handler/middleware_sub.go
@@ -55,14 +55,13 @@ func (c *Controller) WithValidSubsonicArgs(next http.HandlerFunc) http.HandlerFu
 		passwordAuth, tokenAuth := token == "" && salt == "",
 			password == ""
 		if tokenAuth == passwordAuth {
-			respondError(w, r,
-				10, "please provide parameters `t` and `s`, or just `p`",
-			)
+			respondError(w, r, 10,
+				"please provide parameters `t` and `s`, or just `p`")
 			return
 		}
 		user := c.GetUserFromName(username)
 		if user == nil {
-			respondError(w, r, 40, "invalid username")
+			respondError(w, r, 40, "invalid username `%s`", username)
 			return
 		}
 		var credsOk bool
diff --git a/server/handler/respond_sub.go b/server/handler/respond_sub.go
index 04c793e..2fea72e 100644
--- a/server/handler/respond_sub.go
+++ b/server/handler/respond_sub.go
@@ -3,6 +3,7 @@ package handler
 import (
 	"encoding/json"
 	"encoding/xml"
+	"fmt"
 	"log"
 	"net/http"
 
@@ -49,8 +50,8 @@ func respond(w http.ResponseWriter, r *http.Request,
 }
 
 func respondError(w http.ResponseWriter, r *http.Request,
-	code int, message string) {
+	code int, message string, a ...interface{}) {
 	respondRaw(w, r, http.StatusBadRequest, subsonic.NewError(
-		code, message,
+		code, fmt.Sprintf(message, a...),
 	))
 }