From 538445a201aac4284ee2ec0a05583463a4719002 Mon Sep 17 00:00:00 2001 From: starainrt Date: Fri, 18 Mar 2022 13:49:38 +0800 Subject: [PATCH] add InputMsg slice support --- io.go | 150 +++++++++++++++++++++++++++++++++++++++++++++++++---- io_test.go | 23 ++++++++ 2 files changed, 163 insertions(+), 10 deletions(-) create mode 100644 io_test.go diff --git a/io.go b/io.go index c2b2c1f..23e4464 100644 --- a/io.go +++ b/io.go @@ -11,8 +11,9 @@ import ( ) type InputMsg struct { - msg string - err error + msg string + err error + skipSliceSigErr bool } func Passwd(hint string, defaultVal string) InputMsg { @@ -38,7 +39,7 @@ func messageBox(hint string, defaultVal string) InputMsg { fd := int(os.Stdin.Fd()) state, err := terminal.MakeRaw(fd) if err != nil { - return InputMsg{"", err} + return InputMsg{msg: "", err: err} } defer fmt.Println() defer terminal.Restore(fd, state) @@ -46,14 +47,14 @@ func messageBox(hint string, defaultVal string) InputMsg { for { b, _, err := inputReader.ReadRune() if err != nil { - return InputMsg{"", err} + return InputMsg{msg: "", err: err} } if b == 0x0d { strValue := strings.TrimSpace(string(ioBuf)) if len(strValue) == 0 { strValue = defaultVal } - return InputMsg{strValue, nil} + return InputMsg{msg: "", err: err} } if b == 0x08 || b == 0x7F { if len(ioBuf) > 0 { @@ -85,7 +86,7 @@ func passwd(hint string, defaultVal string, mask string) InputMsg { fd := int(os.Stdin.Fd()) state, err := terminal.MakeRaw(fd) if err != nil { - return InputMsg{"", err} + return InputMsg{msg: "", err: err} } defer fmt.Println() defer terminal.Restore(fd, state) @@ -93,14 +94,14 @@ func passwd(hint string, defaultVal string, mask string) InputMsg { for { b, _, err := inputReader.ReadRune() if err != nil { - return InputMsg{"", err} + return InputMsg{msg: "", err: err} } if b == 0x0d { strValue := strings.TrimSpace(string(ioBuf)) if len(strValue) == 0 { strValue = defaultVal } - return InputMsg{strValue, nil} + return InputMsg{msg: "", err: err} } if b == 0x08 || b == 0x7F { if len(ioBuf) > 0 { @@ -130,13 +131,18 @@ func MessageBox(hint string, defaultVal string) InputMsg { inputReader := bufio.NewReader(os.Stdin) str, err := inputReader.ReadString('\n') if err != nil { - return InputMsg{"", err} + return InputMsg{msg: "", err: err} } str = strings.TrimSpace(str) if len(str) == 0 { str = defaultVal } - return InputMsg{str, nil} + return InputMsg{msg: "", err: err} +} + +func (im InputMsg) IgnoreSliceParseError(i bool) InputMsg { + im.skipSliceSigErr = i + return im } func (im InputMsg) String() (string, error) { @@ -151,6 +157,35 @@ func (im InputMsg) MustString() string { return res } +func (im InputMsg) SliceString(sep string) ([]string, error) { + if im.err != nil { + return nil, im.err + } + return strings.Split(im.msg, sep), nil +} + +func (im InputMsg) MustSliceString(sep string) []string { + res, _ := im.SliceString(sep) + return res +} + +func (im InputMsg) sliceFn(sep string, fn func(string) (interface{}, error)) ([]interface{}, error) { + var res []interface{} + data, err := im.SliceString(sep) + if err != nil { + return res, err + } + for _, v := range data { + code, err := fn(v) + if err != nil && !im.skipSliceSigErr { + return nil, err + } else if err == nil { + res = append(res, code) + } + } + return res, nil +} + func (im InputMsg) Int() (int, error) { if im.err != nil { return 0, im.err @@ -158,6 +193,22 @@ func (im InputMsg) Int() (int, error) { return strconv.Atoi(im.msg) } +func (im InputMsg) SliceInt(sep string) ([]int, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.Atoi(v) + }) + var res []int + for _, v := range data { + res = append(res, v.(int)) + } + return res, err +} + +func (im InputMsg) MustSliceInt(sep string) []int { + res, _ := im.SliceInt(sep) + return res +} + func (im InputMsg) MustInt() int { res, _ := im.Int() return res @@ -175,6 +226,22 @@ func (im InputMsg) MustInt64() int64 { return res } +func (im InputMsg) SliceInt64(sep string) ([]int64, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.ParseInt(v, 10, 64) + }) + var res []int64 + for _, v := range data { + res = append(res, v.(int64)) + } + return res, err +} + +func (im InputMsg) MustSliceInt64(sep string) []int64 { + res, _ := im.SliceInt64(sep) + return res +} + func (im InputMsg) Uint64() (uint64, error) { if im.err != nil { return 0, im.err @@ -186,6 +253,21 @@ func (im InputMsg) MustUint64() uint64 { res, _ := im.Uint64() return res } +func (im InputMsg) SliceUint64(sep string) ([]uint64, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.ParseUint(v, 10, 64) + }) + var res []uint64 + for _, v := range data { + res = append(res, v.(uint64)) + } + return res, err +} + +func (im InputMsg) MustSliceUint64(sep string) []uint64 { + res, _ := im.SliceUint64(sep) + return res +} func (im InputMsg) Bool() (bool, error) { if im.err != nil { @@ -199,6 +281,22 @@ func (im InputMsg) MustBool() bool { return res } +func (im InputMsg) SliceBool(sep string) ([]bool, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.ParseBool(v) + }) + var res []bool + for _, v := range data { + res = append(res, v.(bool)) + } + return res, err +} + +func (im InputMsg) MustSliceBool(sep string) []bool { + res, _ := im.SliceBool(sep) + return res +} + func (im InputMsg) Float64() (float64, error) { if im.err != nil { return 0, im.err @@ -211,6 +309,22 @@ func (im InputMsg) MustFloat64() float64 { return res } +func (im InputMsg) SliceFloat64(sep string) ([]float64, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.ParseFloat(v, 64) + }) + var res []float64 + for _, v := range data { + res = append(res, v.(float64)) + } + return res, err +} + +func (im InputMsg) MustSliceFloat64(sep string) []float64 { + res, _ := im.SliceFloat64(sep) + return res +} + func (im InputMsg) Float32() (float32, error) { if im.err != nil { return 0, im.err @@ -224,6 +338,22 @@ func (im InputMsg) MustFloat32() float32 { return res } +func (im InputMsg) SliceFloat32(sep string) ([]float32, error) { + data, err := im.sliceFn(sep, func(v string) (interface{}, error) { + return strconv.ParseFloat(v, 32) + }) + var res []float32 + for _, v := range data { + res = append(res, v.(float32)) + } + return res, err +} + +func (im InputMsg) MustSliceFloat32(sep string) []float32 { + res, _ := im.SliceFloat32(sep) + return res +} + func YesNo(hint string, defaults bool) bool { for { res := strings.ToUpper(MessageBox(hint, "").MustString()) diff --git a/io_test.go b/io_test.go new file mode 100644 index 0000000..98b6e18 --- /dev/null +++ b/io_test.go @@ -0,0 +1,23 @@ +package stario + +import ( + "fmt" + "testing" +) + +func Test_Slice(t *testing.T) { + var data = InputMsg{ + msg: "true,false,true,true,false,0,1,hello", + err: nil, + skipSliceSigErr: false, + } + res, err := data.IgnoreSliceParseError(true).SliceBool(",") + if err != nil { + fmt.Println(res) + t.Fatal(err) + } + if len(res) == 0 { + t.Fatal(res) + } + fmt.Println(res) +}