Merge pull request #103 from getevo/dev.settings_management_2

New settings management library

evo.database.go

@@ -2,17 +2,18 @@ package evo
 
 import (
 	"fmt"
+	"log"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/getevo/evo/v2/lib/db/schema"
 	"github.com/getevo/evo/v2/lib/settings"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/sqlite"
 	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
-	"os"
-	"strings"
-	"time"
 )
 
 var db *gorm.DB
@@ -26,7 +27,7 @@ func setupDatabase() {
 	if !config.Enabled {
 		return
 	}
-	var logLevel = logger.Silent
+	var logLevel logger.LogLevel
 
 	switch config.Debug {
 	case 4:

evo.go

@@ -1,13 +1,14 @@
 package evo
 
 import (
+	"log"
+
 	dbo "github.com/getevo/evo/v2/lib/db"
 	"github.com/getevo/evo/v2/lib/generic"
 	"github.com/getevo/evo/v2/lib/memo"
 	"github.com/getevo/evo/v2/lib/settings"
 	"github.com/getevo/evo/v2/lib/settings/database"
 	"github.com/gofiber/fiber/v2"
-	"log"
 )
 
 var (
@@ -27,6 +28,9 @@ func Setup() {
 	settings.Register("HTTP", &http)
 	settings.Get("HTTP").Cast(&http)
 	err = generic.Parse(http).Cast(&fiberConfig)
+	if err != nil {
+		log.Fatal("Unable to retrieve HTTP server configurations: ", err)
+	}
 
 	app = fiber.New(fiberConfig)
 	if settings.Get("Database.Enabled").Bool() {

lib/async/error_pool.go

@@ -2,8 +2,9 @@ package async
 
 import (
 	"context"
-	"github.com/getevo/evo/v2/lib/async/multierror"
 	"sync"
+
+	"github.com/getevo/evo/v2/lib/async/multierror"
 )
 
 // ErrorPool is a pool that runs tasks that may return an error.

lib/connectors/nats/nats.go

@@ -2,13 +2,14 @@ package nats
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/getevo/evo/v2/lib/log"
 	"github.com/getevo/evo/v2/lib/memo/kv"
 	"github.com/getevo/evo/v2/lib/pubsub"
 	"github.com/getevo/evo/v2/lib/serializer"
 	"github.com/getevo/evo/v2/lib/settings"
 	"github.com/nats-io/nats.go"
-	"time"
 )
 
 var Driver = NATS{}

lib/generic/generic.go

@@ -4,15 +4,16 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
-	"github.com/araddon/dateparse"
-	"github.com/getevo/evo/v2/lib/log"
-	"github.com/iancoleman/strcase"
-	"gopkg.in/yaml.v3"
 	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/araddon/dateparse"
+	"github.com/getevo/evo/v2/lib/log"
+	"github.com/iancoleman/strcase"
+	"gopkg.in/yaml.v3"
 )
 
 const (
@@ -463,17 +464,17 @@ func (v Value) Cast(dst any) error {
 		for _, prop := range v.Props() {
 
 			if vRef.Kind() == reflect.Struct {
-				if x.HasProp(strcase.ToCamel(prop.Name)) {
-					x.SetProp(prop.Name, vRef.FieldByName(prop.Name).Interface())
+				if x.HasProp(prop.Name) {
+					x.SetProp(x.GetName(prop.Name), vRef.FieldByName(prop.Name).Interface())
 				}
 			} else if vRef.Kind() == reflect.Map {
 
 				if idx := vRef.MapIndex(reflect.ValueOf(prop.Name)); idx.IsValid() {
-					x.SetProp(strcase.ToCamel(prop.Name), idx.Interface())
+					x.SetProp(x.GetName(prop.Name), idx.Interface())
 					continue
 				}
 				if idx := vRef.MapIndex(reflect.ValueOf(strcase.ToSnake(prop.Name))); idx.IsValid() {
-					x.SetProp(strcase.ToCamel(prop.Name), idx.Interface())
+					x.SetProp(x.GetName(prop.Name), idx.Interface())
 				}
 
 			} else {
@@ -492,6 +493,7 @@ func (v Value) Cast(dst any) error {
 			x.SetProp(prop.Name, v.Prop(prop.Name).Input)
 		}
 	}
+
 	var x any
 	switch kind {
 	case reflect.Int:
@@ -575,7 +577,7 @@ func (v Value) Cast(dst any) error {
 	case reflect.Func, reflect.Struct, reflect.Interface:
 		return nil
 	default:
-		return fmt.Errorf("couldnt convert to %s", ref.String())
+		return fmt.Errorf("couldnt convert to %s %s", ref.String(), v.String())
 	}
 	ref.Set(reflect.ValueOf(x).Convert(ref.Type()))
 	return nil
@@ -616,6 +618,20 @@ func (v Value) HasProp(name string) bool {
 	return false
 }
 
+func (v Value) GetName(name string) string {
+	var typ = v.IndirectType()
+
+	toMatch := strings.ReplaceAll(strings.ToLower(name), "_", "")
+
+	for i := 0; i < typ.NumField(); i++ {
+		var field = typ.Field(i)
+		if strings.ReplaceAll(strings.ToLower(field.Name), "_", "") == toMatch {
+			return field.Name
+		}
+	}
+	return ""
+}
+
 func (v Value) Indirect() reflect.Value {
 	return indirect(v.Input)
 }

lib/memo/drivers/memory/memory.go

@@ -2,12 +2,13 @@ package memory
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/getevo/evo/v2/lib/log"
 	"github.com/getevo/evo/v2/lib/memo/kv"
 	"github.com/getevo/evo/v2/lib/serializer"
 	"github.com/getevo/evo/v2/lib/settings"
-	"sync"
-	"time"
 )
 
 var Driver = driver{}
@@ -28,7 +29,7 @@ func (driver) Register() error {
 	settings.Register(
 		settings.SettingDomain{
 			Title:       "Cache",
-			Domain:      "Cache",
+			Domain:      "CACHE",
 			Description: "system cache configurations",
 			ReadOnly:    false,
 			Visible:     true,