diff --git a/plc4go/go.mod b/plc4go/go.mod index ed80b79ac2..72567f99d8 100644 --- a/plc4go/go.mod +++ b/plc4go/go.mod @@ -25,6 +25,7 @@ require ( github.com/IBM/netaddr v1.5.0 github.com/ajankovic/xdiff v0.0.1 github.com/cstockton/go-conv v1.0.0 + github.com/fatih/color v1.17.0 github.com/google/uuid v1.6.0 github.com/gopacket/gopacket v1.3.0 github.com/icza/bitio v1.1.0 diff --git a/plc4go/go.sum b/plc4go/go.sum index c6c06e007f..dc413a6090 100644 --- a/plc4go/go.sum +++ b/plc4go/go.sum @@ -11,6 +11,8 @@ github.com/cstockton/go-conv v1.0.0/go.mod h1:HuiHkkRgOA0IoBNPC7ysG7kNpjDYlgM7Kj github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/plc4go/internal/s7/s7Io_test.go b/plc4go/internal/s7/s7Io_test.go index 03576e92e2..1024692f3b 100644 --- a/plc4go/internal/s7/s7Io_test.go +++ b/plc4go/internal/s7/s7Io_test.go @@ -22,11 +22,11 @@ package s7 import ( "context" "fmt" - "github.com/stretchr/testify/require" "strings" "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/apache/plc4x/plc4go/protocols/s7/readwrite/model" "github.com/apache/plc4x/plc4go/spi/utils" diff --git a/plc4go/spi/utils/asciiBox.go b/plc4go/spi/utils/asciiBox.go index c5a37ce460..dc2e3edde6 100644 --- a/plc4go/spi/utils/asciiBox.go +++ b/plc4go/spi/utils/asciiBox.go @@ -20,10 +20,12 @@ package utils import ( + "fmt" "math" "regexp" "strings" + "github.com/fatih/color" "github.com/rs/zerolog" ) @@ -141,22 +143,7 @@ type AsciiBoxWriter interface { } func NewAsciiBoxWriter(opts ...func(writer *asciiBoxWriter)) AsciiBoxWriter { - a := &asciiBoxWriter{ - newLine: '\n', - emptyPadding: " ", - // the name gets prefixed with an extra symbol for indent - extraNameCharIndent: 1, - borderWidth: 1, - newLineCharWidth: 1, - defaultBoxSet: DefaultBoxSet(), - } - for _, opt := range opts { - opt(a) - } - hl := a.defaultBoxSet.HorizontalLine - a.boxHeaderRegex = regexp.MustCompile(`^` + a.defaultBoxSet.UpperLeftCorner + hl + `(?P[^` + hl + `]+)` + hl + `*` + `(?P
[^` + hl + `]+)?` + hl + `*` + a.defaultBoxSet.UpperRightCorner) - a.boxFooterRegex = regexp.MustCompile(`(?m)^` + a.defaultBoxSet.LowerLeftCorner + hl + `*` + `(?P