[#89] simplified some code by returning early and reducing local variable scopes

2022-07-13 00:52:09 +08:00
parent d71c3cd19c
commit 63d5a8d633
5 changed files with 64 additions and 89 deletions
@@ -34,26 +34,18 @@ func (s *SortField) BuildExpr(fieldResolver FieldResolver) (string, error) {
 //
 // Example:
 //	fields := search.ParseSortFromString("-name,+created")
-func ParseSortFromString(str string) []SortField {
-	result := []SortField{}
-
+func ParseSortFromString(str string) (fields []SortField) {
 	data := strings.Split(str, ",")

 	for _, field := range data {
 		// trim whitespaces
 		field = strings.TrimSpace(field)
-
-		var dir string
 		if strings.HasPrefix(field, "-") {
-			dir = SortDesc
-			field = strings.TrimPrefix(field, "-")
+			fields = append(fields, SortField{strings.TrimPrefix(field, "-"), SortDesc})
 		} else {
-			dir = SortAsc
-			field = strings.TrimPrefix(field, "+")
+			fields = append(fields, SortField{strings.TrimPrefix(field, "+"), SortAsc})
 		}
-
-		result = append(result, SortField{field, dir})
 	}

-	return result
+	return
 }