From ba7fd9618b04bbf0f1a957e433739ec3f7ff60e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=91=D0=B0?= =?UTF-8?q?=D0=B4=D1=8F=D0=B5=D0=B2?= Date: Wed, 23 Oct 2024 20:13:43 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B7=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20log/slog.LogLevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.go | 9 ++++++++- config_test.go | 2 ++ test/data.go | 6 +++++- utils.go | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/config.go b/config.go index 3a07a62..57ce078 100644 --- a/config.go +++ b/config.go @@ -104,10 +104,17 @@ func parseValue(value reflect.Value) error { func setValue(value reflect.Value, defValue string, field reflect.StructField) error { var err error - if value.Type().PkgPath() == "time" && value.Type().Name() == "Duration" { + valueTypePkgPath := value.Type().PkgPath() + valueTypeName := value.Type().Name() + + if valueTypePkgPath == "time" && valueTypeName == "Duration" { return SetValueWithDuration(value, defValue) } + if valueTypePkgPath == "log/slog" && valueTypeName == "Level" { + return SetValueSlogLevel(value, defValue) + } + switch value.Kind() { case reflect.Bool: err = SetValueWithBool(value, defValue) diff --git a/config_test.go b/config_test.go index 8a58315..2bf96b4 100644 --- a/config_test.go +++ b/config_test.go @@ -16,6 +16,7 @@ package config import ( + "log/slog" "os" "path/filepath" "runtime" @@ -41,6 +42,7 @@ func TestDefaultValueConfig(t *testing.T) { assert.Equal("yy", conf.SliceValue[1]) assert.Equal("zz", conf.SliceValue[2]) assert.Equal(time.Second*15, conf.Interval) + assert.Equal(slog.LevelInfo, conf.LogLevel) assert.Equal("", conf.NoDefValue) } diff --git a/test/data.go b/test/data.go index cd6af2b..98839fe 100644 --- a/test/data.go +++ b/test/data.go @@ -15,7 +15,10 @@ */ package test -import "time" +import ( + "log/slog" + "time" +) type DBConfig struct { Host string `cli:"host" env:"HOST" json:"host" usage:"database server hostname" yaml:"host"` @@ -67,6 +70,7 @@ type DefValueConfig struct { StrValue string `cli:"str" default:"default-string" env:"CONFIG_TEST_STR" usage:"string value"` SliceValue []string `cli:"slice" default:"xx:yy:zz" env:"CONFIG_TEST_SLICE" usage:"slice values"` Interval time.Duration `cli:"interval" default:"15s" env:"CONFIG_TEST_INTERVAL" usage:"time duration"` + LogLevel slog.Level `cli:"log_level" default:"INFO" env:"LOG_LEVEL" usage:"log level"` NoDefValue string `cli:"nodefvalue" env:"CONFIG_TEST_NO_DEFVALUE" usage:"no default value"` } diff --git a/utils.go b/utils.go index 02dd95d..b65366f 100644 --- a/utils.go +++ b/utils.go @@ -16,7 +16,9 @@ package config import ( + "encoding" "fmt" + "log/slog" "reflect" "strconv" "strings" @@ -25,6 +27,14 @@ import ( func SetValueWithBool(value reflect.Value, boolValue string) error { b, err := strconv.ParseBool(boolValue) + if err != nil { + if txt, ok := value.Interface().(encoding.TextUnmarshaler); ok { + if err = txt.UnmarshalText([]byte(boolValue)); err == nil { + return nil + } + } + } + if err != nil { return fmt.Errorf("parse bool: %w", err) } @@ -45,6 +55,18 @@ func SetValueWithDuration(value reflect.Value, str string) error { return nil } +func SetValueSlogLevel(value reflect.Value, str string) error { + var level slog.Level + + if err := level.UnmarshalText([]byte(str)); err != nil { + return fmt.Errorf("parse slog level: %w", err) + } + + value.Set(reflect.ValueOf(level)) + + return nil +} + func SetValueWithFloatX(value reflect.Value, floatValue string, bitSize int) error { f, err := strconv.ParseFloat(floatValue, bitSize) if err != nil { @@ -58,6 +80,14 @@ func SetValueWithFloatX(value reflect.Value, floatValue string, bitSize int) err func SetValueWithIntX(value reflect.Value, intValue string, bitSize int) error { v, err := strconv.ParseInt(intValue, 10, bitSize) + if err != nil { + if txt, ok := value.Interface().(encoding.TextUnmarshaler); ok { + if err = txt.UnmarshalText([]byte(intValue)); err == nil { + return nil + } + } + } + if err != nil { return fmt.Errorf("parse int: %w", err) } @@ -69,6 +99,14 @@ func SetValueWithIntX(value reflect.Value, intValue string, bitSize int) error { func SetValueWithUintX(value reflect.Value, uintValue string, bitSize int) error { v, err := strconv.ParseUint(uintValue, 10, bitSize) + if err != nil { + if txt, ok := value.Interface().(encoding.TextUnmarshaler); ok { + if err = txt.UnmarshalText([]byte(uintValue)); err == nil { + return nil + } + } + } + if err != nil { return fmt.Errorf("parse uint: %w", err) }