Updated to v2

Author: onattech

go.mod

@@ -1,3 +1,3 @@
-module github.com/onattech/toolkit
+module github.com/onattech/toolkit/v2
 
 go 1.19

tools.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -189,11 +188,10 @@ func (t *Tools) Slugify(s string) (string, error) {
 // DownloadStaticFile downloads a file, and tries to force the browser to avoid displaying it
 // in the browser window by setting content disposition. It also allows specification of the
 // display name
-func (t *Tools) DownloadStaticFile(w http.ResponseWriter, r *http.Request, p, file, displayName string) {
-	fp := path.Join(p, file)
+func (t *Tools) DownloadStaticFile(w http.ResponseWriter, r *http.Request, pathName, displayName string) {
 	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", displayName))
 
-	http.ServeFile(w, r, fp)
+	http.ServeFile(w, r, pathName)
 }
 
 // JSONResponse is the type used for sending JSON around

tools_test.go

@@ -235,7 +235,7 @@ func TestTools_DownloadStaticFile(t *testing.T) {
 
 	var testTool Tools
 
-	testTool.DownloadStaticFile(rr, req, "./testdata", "pic.jpg", "moon.jpg")
+	testTool.DownloadStaticFile(rr, req, "./testdata/pic.jpg", "moon.jpg")
 
 	res := rr.Result()
 	defer res.Body.Close()