feat(acceptHeaders): allow whitespace between value and qulity

Author: marjune163

src/acceptHeaders/acceptItem.go

@@ -1,11 +1,12 @@
 package acceptHeaders
 
 import (
+	"mjpclab.dev/ghfs/src/util"
 	"strconv"
 	"strings"
 )
 
-const qualitySign = ";q="
+const qualitySign = "q="
 const defaultQuality = 1000
 const maxQualityDecimals = 3
 
@@ -42,9 +43,21 @@ func (item acceptItem) match(value string) bool {
 }
 
 func parseAcceptItem(input string) acceptItem {
-	value := input
-	if semiColonIndex := strings.IndexByte(value, ';'); semiColonIndex >= 0 {
-		value = value[:semiColonIndex]
+	entries := strings.Split(input, ";")
+	if len(entries) == 0 {
+		return acceptItem{}
+	}
+	util.InPlaceTrim(entries)
+
+	value := entries[0]
+	entries = entries[1:]
+
+	quality := defaultQuality
+	for _, entry := range entries {
+		entry = strings.TrimSpace(entry)
+		if strings.HasPrefix(entry, qualitySign) {
+			quality = parseQuality(entry[len(qualitySign):])
+		}
 	}
 
 	wildcards := 0
@@ -54,43 +67,37 @@ func parseAcceptItem(input string) acceptItem {
 		wildcards = 1
 	}
 
-	rest := input[len(value):]
-	qSignIndex := strings.Index(rest, qualitySign)
-	if qSignIndex < 0 {
-		return acceptItem{value, defaultQuality, wildcards}
-	}
+	return acceptItem{value, quality, wildcards}
+}
 
-	rest = rest[qSignIndex+len(qualitySign):]
-	if semiColonIndex := strings.IndexByte(rest, ';'); semiColonIndex >= 0 {
-		rest = rest[:semiColonIndex]
-	}
-	qLen := len(rest)
+func parseQuality(input string) (quality int) {
+	qLen := len(input)
 
 	if qLen == 0 {
-		return acceptItem{value, defaultQuality, wildcards}
+		return defaultQuality
 	}
-	if qLen > 1 && rest[1] != '.' {
-		return acceptItem{value, defaultQuality, wildcards}
+	if qLen > 1 && input[1] != '.' {
+		return defaultQuality
 	}
 
-	// "q=1" or q is an invalid value
-	if rest[0] != '0' {
-		return acceptItem{value, defaultQuality, wildcards}
+	// q is "1" or q is an invalid value
+	if input[0] != '0' {
+		return defaultQuality
 	}
 
-	// "q=0."
+	// "0."
 	if qLen <= 2 {
-		return acceptItem{value, 0, wildcards}
+		return 0
 	}
 
-	rest = rest[2:]
-	qDecimalLen := len(rest)
+	input = input[2:]
+	qDecimalLen := len(input)
 	if qDecimalLen > maxQualityDecimals {
 		qDecimalLen = maxQualityDecimals
-		rest = rest[:qDecimalLen]
+		input = input[:qDecimalLen]
 	}
 
-	quality, err := strconv.Atoi(rest)
+	quality, err := strconv.Atoi(input)
 	if err != nil {
 		quality = defaultQuality
 	} else {
@@ -99,5 +106,5 @@ func parseAcceptItem(input string) acceptItem {
 			quality *= 10
 		}
 	}
-	return acceptItem{value, quality, wildcards}
+	return quality
 }

src/acceptHeaders/acceptItem_test.go

@@ -51,7 +51,7 @@ func TestParseAcceptItem(t *testing.T) {
 		t.Error(output.quality)
 	}
 
-	input = "en-US;q=0.97"
+	input = "en-US; q=0.97"
 	output = parseAcceptItem(input)
 	if output.value != "en-US" {
 		t.Error(output.value)

src/acceptHeaders/accepts_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestParseAccept(t *testing.T) {
-	accept := "text/html, */*;q=0.6, text/plain;q=0.9, application/json;q=0.7, image/*;q=0.8, image/png;q=0.8"
+	accept := "text/html, */*;q=0.6, text/plain; q=0.9, application/json;q=0.7, image/*;q=0.8, image/png;q=0.8"
 	accepts := ParseAccepts(accept)
 	if len(accepts) != 6 {
 		t.Error(len(accepts))