Optimize

Author: goloop

encode.go

@@ -65,7 +65,7 @@ func marshalEnv(prefix string, obj interface{}, idle bool) ([]string, error) {
 
 		// Get parameters from tags.
 		// The name of the key.
-		key := strings.Trim(field.Tag.Get(tagNameKey), " ")
+		key := strings.TrimSpace(field.Tag.Get(tagNameKey))
 		if key == "" {
 			key = field.Name
 		}
@@ -147,9 +147,8 @@ func marshalEnv(prefix string, obj interface{}, idle bool) ([]string, error) {
 // The getSequence get sequence as string.
 func getSequence(item *reflect.Value, sep string) (string, error) {
 	var (
-		result string
-		kind   reflect.Kind
-		max    int
+		kind reflect.Kind
+		max  int
 	)
 
 	// Type checking and instance adjustment.
@@ -165,12 +164,11 @@ func getSequence(item *reflect.Value, sep string) (string, error) {
 		return "", fmt.Errorf("incorrect type: %s", item.Type())
 	}
 
-	// Item list string display.
-	result = strings.Replace(fmt.Sprint(*item), " ", sep, -1)
+	// Use strings.Builder for efficient string concatenation.
+	var sb strings.Builder
 
 	// For pointers and structures.
 	if kind == reflect.Ptr || kind == reflect.Struct {
-		tmp := []string{}
 		for i := 0; i < max; i++ {
 			elem := item.Index(i)
 			if kind == reflect.Ptr {
@@ -182,15 +180,29 @@ func getSequence(item *reflect.Value, sep string) (string, error) {
 				return "", err
 			}
 
-			tmp = append(tmp, v)
+			if i > 0 {
+				sb.WriteString(sep)
+			}
+			sb.WriteString(v)
+		}
+	} else {
+		for i := 0; i < max; i++ {
+			v, err := toStr(item.Index(i))
+			if err != nil {
+				return "", err
+			}
+
+			if i > 0 {
+				sb.WriteString(sep)
+			}
+			sb.WriteString(v)
 		}
-		result = strings.Replace(fmt.Sprint(tmp), " ", sep, -1)
 	}
 
-	return strings.Trim(result, "[]"+sep), nil
+	return sb.String(), nil
 }
 
-// The toStr converts item to string.
+// The toStr converts any item to string.
 func toStr(item reflect.Value) (string, error) {
 	switch item.Kind() {
 	case reflect.Int, reflect.Int8, reflect.Int16,

env.go

@@ -2,7 +2,6 @@ package env
 
 import (
 	"bytes"
-	"math"
 	"os"
 	"regexp"
 	"runtime"
@@ -54,18 +53,29 @@ var (
 // Initializer.
 func init() {
 	// Set the number of parallel parsing tasks.
-	Together(runtime.NumCPU())
+	ParallelTasks(runtime.NumCPU())
 }
 
 // Together sets the number of parallel transliteration tasks.
-func Together(pt int) int {
+func ParallelTasks(pt int) int {
 	// The maximum number of parallel tasks
 	// is twice the number of CPU cores.
 	max := runtime.NumCPU() * 2
 
+	// clamp returns the value limited to the given range [min, max].
+	clamp := func(value, min, max int) int {
+		if value < min {
+			return min
+		}
+		if value > max {
+			return max
+		}
+		return value
+	}
+
 	// The minimum number of parallel tasks is 2.
 	// And the maximum number is twice the number of CPU cores.
-	parallelTasks = int(math.Min(float64(max), math.Max(float64(pt), 2)))
+	parallelTasks = clamp(pt, 2, max)
 	return parallelTasks
 }
 
@@ -76,7 +86,7 @@ func Together(pt int) int {
 // Returns an error if the env-file contains incorrect data,
 // file is damaged or missing.
 //
-// # Examples
+// Examples:
 //
 // In this example, some variables are already set in the environment:
 //
@@ -318,26 +328,26 @@ func Save(filename, prefix string, obj interface{}) error {
 //
 // Check if a variable exists in the environment:
 //
-//	 fmt.Printf("KEY_0 is %v\n", env.Exists("KEY_0"))
-//	 fmt.Printf("KEY_1 is %v\n", env.Exists("KEY_1"))
-//	 fmt.Printf("KEY_0 and KEY_1 is %v\n\n", env.Exists("KEY_0", "KEY_1"))
-//
-//	 if err := env.Update("./cmd/.env"); err != nil {
-//	   log.Fatal(err)
-//	 }
-//
-//		fmt.Printf("KEY_0 is %v\n", env.Exists("KEY_0"))
-//		fmt.Printf("KEY_1 is %v\n", env.Exists("KEY_1"))
-//		fmt.Printf("KEY_0 and KEY_1 is %v\n", env.Exists("KEY_0", "KEY_1"))
-//
-//		// Output:
-//		//  KEY_0 is true
-//		//  KEY_1 is false
-//		//  KEY_0 and KEY_1 is false
-//		//
-//		//  KEY_0 is true
-//		//  KEY_1 is true
-//		//  KEY_0 and KEY_1 is true
+//	fmt.Printf("KEY_0 is %v\n", env.Exists("KEY_0"))
+//	fmt.Printf("KEY_1 is %v\n", env.Exists("KEY_1"))
+//	fmt.Printf("KEY_0 and KEY_1 is %v\n\n", env.Exists("KEY_0", "KEY_1"))
+//
+//	if err := env.Update("./cmd/.env"); err != nil {
+//	  log.Fatal(err)
+//	}
+//
+//	fmt.Printf("KEY_0 is %v\n", env.Exists("KEY_0"))
+//	fmt.Printf("KEY_1 is %v\n", env.Exists("KEY_1"))
+//	fmt.Printf("KEY_0 and KEY_1 is %v\n", env.Exists("KEY_0", "KEY_1"))
+//
+//	// Output:
+//	//  KEY_0 is true
+//	//  KEY_1 is false
+//	//  KEY_0 and KEY_1 is false
+//	//
+//	//  KEY_0 is true
+//	//  KEY_1 is true
+//	//  KEY_0 and KEY_1 is true
 func Exists(keys ...string) bool {
 	for _, key := range keys {
 		if _, ok := os.LookupEnv(key); !ok {
@@ -443,10 +453,10 @@ func Unmarshal(prefix string, obj interface{}) error {
 // Use the following tags in the fields of structure to
 // set the marshing parameters:
 //
-//	env  matches the name of the key in the environment;
-//	def  default value (if empty, sets the default value
-//	     for the field type of structure);
-//	sep  sets the separator for lists/arrays (default ` ` - space).
+//   - env  matches the name of the key in the environment;
+//   - def  default value (if empty, sets the default value
+//     for the field type of structure);
+//   - sep  sets the separator for lists/arrays (default ` ` - space).
 //
 // Structure example:
 //