simplify int form

Author: drduh

handlers/download.go

@@ -14,18 +14,18 @@ func Download(app *config.App) http.HandlerFunc {
 			return
 		}
 
-		fileName := getRequestParameter(r, len(app.Download), "name")
-		if fileName == "" {
+		filename := getRequestParameter(r, len(app.Download), "name")
+		if filename == "" {
 			writeJSON(w, http.StatusNotFound, errorJSON(app.NoFilename))
 			app.Log.Error(app.NoFilename, "user", req)
 			return
 		}
-		app.Log.Debug("file requested", "filename", fileName, "user", req)
+		app.Log.Debug("file requested", "filename", filename, "user", req)
 
-		file := app.FindFile(fileName)
+		file := app.FindFile(filename)
 		if file == nil {
 			writeJSON(w, http.StatusNotFound, errorJSON(app.NotFound))
-			app.Log.Error(app.NotFound, "filename", fileName, "user", req)
+			app.Log.Error(app.NotFound, "filename", filename, "user", req)
 			return
 		}
 

handlers/form.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"math"
 	"net/http"
 	"strconv"
 	"strings"
@@ -11,21 +10,18 @@ import (
 )
 
 // parseFormInt reads an integer form value or returns the default.
-func parseFormInt(r *http.Request, field string, def int, maximum int) int {
+func parseFormInt(r *http.Request, field string, def, maximum int) int {
 	input := r.FormValue(field)
 	if input != "" {
 		input = strings.TrimSpace(input)
-		if v, err := strconv.ParseUint(input, 10, 64); err == nil {
-			if v == 0 {
+		if v, err := strconv.Atoi(input); err == nil {
+			if v <= 0 {
 				return def
 			}
-			if v > uint64(maximum) {
+			if v > maximum {
 				return maximum
 			}
-			if v > math.MaxInt {
-				return maximum
-			}
-			return int(v)
+			return v
 		}
 	}
 	return def

handlers/index.go

@@ -8,42 +8,39 @@ import (
 	"github.com/drduh/gone/templates"
 )
 
-// Index handles requests for the main index page
-// with all available application features.
+const templateData = "data/*.tmpl"
+
+// Index handles requests to load and render the index page.
 func Index(app *config.App) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		req := authRequest(w, r, app)
 		if req == nil {
 			return
 		}
-
 		app.Log.Info("serving index", "user", req)
 
 		theme := getDefaultTheme(app.Style.Theme)
-		app.Log.Debug("got theme", "default", theme)
 		if app.Style.AllowPick {
 			theme = getTheme(w, r, theme,
 				app.Cookie.Id,
 				app.Cookie.Time.GetDuration(),
 				app.Style.Available)
-			app.Log.Debug("got theme", "selected", theme)
 		}
 
-		tmpl, err := template.New("index").ParseFS(templates.All, "data/*.tmpl")
+		tmpl, err := template.New("index").ParseFS(templates.All, templateData)
 		if err != nil {
 			writeJSON(w, http.StatusInternalServerError, errorJSON(app.TmplParse))
 			app.Log.Error(app.TmplParse, "error", err.Error(), "user", req)
 			return
 		}
 
 		app.UpdateTimeRemaining()
-
 		response := templates.Index{
 			Auth:            app.Auth,
+			Default:         app.Default,
 			DefaultDuration: app.Expiration.String(),
 			Hostname:        app.Hostname,
 			Index:           app.Index,
-			Default:         app.Default,
 			Limit:           app.Limit,
 			NoFiles:         app.NoFiles,
 			Paths:           app.Paths,

handlers/random.go

@@ -7,7 +7,7 @@ import (
 	"github.com/drduh/gone/util"
 )
 
-// Random serves a random string of specified type.
+// Random handles requests to generate a random string.
 func Random(app *config.App) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		req := authRequest(w, r, app)

storage/config.go

@@ -6,7 +6,12 @@ import (
 	"time"
 )
 
-const storageVersion = "1"
+const (
+	storageVersion = "1"
+
+	filenameMessages = "messages.txt"
+	filenameWall     = "wall.txt"
+)
 
 // Storage represents content uploaded by users.
 type Storage struct {

storage/sanitize_test.go

@@ -80,10 +80,12 @@ func TestSanitizeName(t *testing.T) {
 		{"@#$%^&*", 10, extraChars, defaultName},
 	}
 	for _, test := range tests {
-		result := SanitizeName(test.input, test.maxLength, test.extraChars)
-		if result != test.want {
-			t.Fatalf("name: '%s', length: %d, special: '%s', got: '%s', want: '%s'",
-				test.input, test.maxLength, test.extraChars, result, test.want)
-		}
+		t.Run(test.input, func(t *testing.T) {
+			result := SanitizeName(test.input, test.maxLength, test.extraChars)
+			if result != test.want {
+				t.Fatalf("length: %d, special: '%s', got: '%s', want: '%s'",
+					test.maxLength, test.extraChars, result, test.want)
+			}
+		})
 	}
 }

storage/serve.go

@@ -22,12 +22,12 @@ func (f *File) Serve(w http.ResponseWriter) {
 
 // ServeMessages writes all Messages as a text file.
 func (s *Storage) ServeMessages(w http.ResponseWriter) {
-	disposition := "attachment; filename=\"messages.txt\""
+	disposition := "attachment; filename=\"" + filenameMessages + "\""
 	w.Header().Set("Content-Disposition", disposition)
 	w.Header().Set("Content-Type", "text/plain")
-	msgFormat := "%d (%s) - %s\n"
+	msgFmt := "%d (%s) - %s\n"
 	for _, msg := range s.Messages {
-		_, err := fmt.Fprintf(w, msgFormat, msg.Count, msg.Allow, msg.Data)
+		_, err := fmt.Fprintf(w, msgFmt, msg.Count, msg.Allow, msg.Data)
 		if err != nil {
 			return
 		}
@@ -36,7 +36,7 @@ func (s *Storage) ServeMessages(w http.ResponseWriter) {
 
 // ServeWall writes all Wall content as a text file.
 func (s *Storage) ServeWall(w http.ResponseWriter) {
-	disposition := "attachment; filename=\"wall.txt\""
+	disposition := "attachment; filename=\"" + filenameWall + "\""
 	w.Header().Set("Content-Disposition", disposition)
 	w.Header().Set("Content-Type", "text/plain")
 	_, err := fmt.Fprintf(w, "%s", s.WallContent)