From 9817cf33947b7a73598048d47d067968851bea07 Mon Sep 17 00:00:00 2001 From: Dex Wood Date: Mon, 10 Feb 2025 23:00:54 -0600 Subject: [PATCH] Update dependencies, lift panics out of the parsing code into errors that can be handled by the caller. --- archive2/archive2.go | 68 ++++++++++++----- archive2/message31.go | 78 ++++++++++++------- cmd/ar2v-dump/main.go | 5 +- cmd/nexrad-render/main.go | 20 +++-- cmd/nexrad-tui/main.go | 5 +- go.mod | 20 +++-- go.sum | 156 +++++++++++++++++++++++++++----------- 7 files changed, 243 insertions(+), 109 deletions(-) diff --git a/archive2/archive2.go b/archive2/archive2.go index 04933f2..9130b80 100644 --- a/archive2/archive2.go +++ b/archive2/archive2.go @@ -6,7 +6,6 @@ import ( "encoding/binary" "fmt" "io" - "io/ioutil" "sort" "time" @@ -32,7 +31,7 @@ type Archive2 struct { } // Extract data from a given archive 2 data file. -func Extract(f io.ReadSeeker) *Archive2 { +func Extract(f io.ReadSeeker) (*Archive2, error) { ar2ExtractTimeStart := time.Now() defer func() { logrus.Debugf("ar2: done %s", time.Since(ar2ExtractTimeStart)) @@ -47,16 +46,19 @@ func Extract(f io.ReadSeeker) *Archive2 { // older archive2 files are gzipped, check for those and decompress if found if yes, ctype := isCompressed(f); yes { if ctype != "gz" { - logrus.Fatalf("unsupported compression %s", ctype) + logrus.Errorf("unsupported compression %s", ctype) + return nil, fmt.Errorf("unsupported compression %s", ctype) } var gzd *gzip.Reader var err error if gzd, err = gzip.NewReader(f); err != nil { - logrus.Fatalf("failed to open gzip file: %s", err) + logrus.Errorf("failed to open gzip file: %s", err) + return nil, fmt.Errorf("failed to open gzip file: %s", err) } - gzb, err := ioutil.ReadAll(gzd) + gzb, err := io.ReadAll(gzd) if err != nil { - logrus.Fatalf("failed to read gzip file: %s", err) + logrus.Errorf("failed to read gzip file: %s", err) + return nil, fmt.Errorf("failed to read gzip file: %s", err) } f = bytes.NewReader(gzb) } @@ -71,7 +73,9 @@ func Extract(f io.ReadSeeker) *Archive2 { // Archive II filename. // read in the 24 byte volume header record - binary.Read(f, binary.BigEndian, &ar2.VolumeHeader) + if err := binary.Read(f, binary.BigEndian, &ar2.VolumeHeader); err != nil { + return nil, err + } logrus.Debug(ar2.VolumeHeader) @@ -92,9 +96,10 @@ func Extract(f io.ReadSeeker) *Archive2 { // read in control word (size) of LDM record if err := binary.Read(f, binary.BigEndian, &ldm.Size); err != nil { if err != io.EOF { - logrus.Panic(err.Error()) + logrus.Errorf(err.Error()) + return nil, err } - return &ar2 + return &ar2, nil } // As the control word contains a negative size under some circumstances, @@ -104,7 +109,11 @@ func Extract(f io.ReadSeeker) *Archive2 { ldm.Size = -ldm.Size } else if ldm.Size == 0 { // older files don't have LDM records? Backup 4 bytes (int32 for size) - f.Seek(-4, io.SeekCurrent) + _, err := f.Seek(-4, io.SeekCurrent) + if err != nil { + logrus.Errorf("failed to seek back 4 bytes: %s", err) + return nil, err + } } logrus.WithFields(logrus.Fields{ @@ -132,13 +141,18 @@ func Extract(f io.ReadSeeker) *Archive2 { // begin until byte 13 (halfword 7 or full word 4). This 12 byte // offset is due to legacy compliance (previously known as the "CTM //header"). See the RDA/RPG ICD for more details (Message Header Data) - msgBuf.Seek(LegacyCTMHeaderLen, io.SeekCurrent) + _, err := msgBuf.Seek(LegacyCTMHeaderLen, io.SeekCurrent) + if err != nil { + logrus.Errorf("failed to seek forward CTM header: %s", err) + return nil, err + } msgHeader := MessageHeader{} if err := binary.Read(msgBuf, binary.BigEndian, &msgHeader); err != nil { if err != io.EOF { logrus.Debugf("processed %d messages", numMessages) - logrus.Panic(err.Error()) + logrus.Errorf("failed to read message header: %s", err) + return nil, err } break } @@ -155,18 +169,30 @@ func Extract(f io.ReadSeeker) *Archive2 { switch msgHeader.MessageType { case 2: m2 := Message2{} - binary.Read(msgBuf, binary.BigEndian, &m2) + if err := binary.Read(msgBuf, binary.BigEndian, &m2); err != nil { + logrus.Errorf("failed to read message 2: %s", err) + return nil, err + } ar2.RadarStatus = &m2 // move to the end of the message - msgBuf.Seek(MessageBodySize-Message2Length, io.SeekCurrent) + if _, err := msgBuf.Seek(MessageBodySize-Message2Length, io.SeekCurrent); err != nil { + logrus.Errorf("failed to seek forward header message size: %s", err) + return nil, err + } case 3: m3 := Message3{} - binary.Read(msgBuf, binary.BigEndian, &m3) + if err := binary.Read(msgBuf, binary.BigEndian, &m3); err != nil { + logrus.Errorf("failed to read message 3: %s", err) + return nil, err + } ar2.RadarPerformance = &m3 // move to the end of the message - msgBuf.Seek(MessageBodySize-Message3Length, io.SeekCurrent) + if _, err := msgBuf.Seek(MessageBodySize-Message3Length, io.SeekCurrent); err != nil { + logrus.Errorf("failed to seek forward header message size: %s", err) + return nil, err + } // case 5: // m5 := Message5{} // binary.Read(msgBuf, binary.BigEndian, &m5.Message5Header) @@ -184,7 +210,11 @@ func Extract(f io.ReadSeeker) *Archive2 { // // move to the end of the message // msgBuf.Seek(MessageBodySize-int64(msgHeader.MessageSize), io.SeekCurrent) case 31: - m31 := msg31(msgBuf) + m31, err := msg31(msgBuf) + if err != nil { + logrus.Errorf("failed to read message 31: %s", err) + return nil, err + } // logrus.Trace(m31.Header.String()) ar2.ElevationScans[int(m31.Header.ElevationNumber)] = append(ar2.ElevationScans[int(m31.Header.ElevationNumber)], m31) default: @@ -193,7 +223,8 @@ func Extract(f io.ReadSeeker) *Archive2 { } _, err := msgBuf.Seek(MessageBodySize, io.SeekCurrent) if err != nil { - logrus.Panic("failed to seek forward header message size") + logrus.Errorf("failed to seek forward header message size") + return nil, err } } @@ -201,7 +232,6 @@ func Extract(f io.ReadSeeker) *Archive2 { } logrus.Tracef("ar2: ldm: done: %s messages:%v", time.Since(ldmExtractTimeStart), messageCounts) } - return &ar2 } func (ar2 *Archive2) String() string { diff --git a/archive2/message31.go b/archive2/message31.go index 95c4795..6ff2883 100644 --- a/archive2/message31.go +++ b/archive2/message31.go @@ -95,13 +95,16 @@ func (h *Message31Header) AzimuthResolutionSpacing() float64 { return 1 } -func msg31(r io.ReadSeeker) *Message31 { +func msg31(r io.ReadSeeker) (*Message31, error) { m31h := Message31Header{} // save the position of the first byte so we can easily process data blocks later. startPos, _ := r.Seek(0, io.SeekCurrent) - binary.Read(r, binary.BigEndian, &m31h) + if err := binary.Read(r, binary.BigEndian, &m31h); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } m31 := Message31{ Header: m31h, @@ -119,7 +122,8 @@ func msg31(r io.ReadSeeker) *Message31 { blockPointers := make([]uint32, m31h.DataBlockCount) if err := binary.Read(r, binary.BigEndian, blockPointers); err != nil { - logrus.Panic(err.Error()) + logrus.Errorf(err.Error()) + return nil, err } // check for more DataBlockPointers @@ -130,12 +134,16 @@ func msg31(r io.ReadSeeker) *Message31 { maxLoops := 20 for i := 0; true; i++ { if err := binary.Read(r, binary.BigEndian, &lookahead); err != nil { - logrus.Panic(err.Error()) + logrus.Errorf(err.Error()) + return nil, err } if bytes.Equal(lookahead, hexRVOL) { // backup 4 bytes to keep the block intact - r.Seek(-4, io.SeekCurrent) + if _, err := r.Seek(-4, io.SeekCurrent); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } break } @@ -146,7 +154,8 @@ func msg31(r io.ReadSeeker) *Message31 { // prevent infinite loop if i == maxLoops { - logrus.Fatal("M31 Header: failed to find the end of the datablock pointers.") + logrus.Error("M31 Header: failed to find the end of the datablock pointers.") + return nil, fmt.Errorf("m31 header: failed to find the end of the datablock pointers") } i++ } @@ -155,40 +164,47 @@ func msg31(r io.ReadSeeker) *Message31 { for _, bptr := range blockPointers { // logrus.Tracef("ar2: m31: processing datablock %d", i) - r.Seek(startPos+int64(bptr), io.SeekStart) + if _, err := r.Seek(startPos+int64(bptr), io.SeekStart); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } d := DataBlock{} if err := binary.Read(r, binary.BigEndian, &d); err != nil { - logrus.Panic(err.Error()) + logrus.Errorf(err.Error()) + return nil, err } // rewind from reading the datalblock - r.Seek(-4, io.SeekCurrent) + if _, err := r.Seek(-4, io.SeekCurrent); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } blockName := string(d.DataName[:]) switch blockName { case "VOL": - binary.Read(r, binary.BigEndian, &m31.VolumeData) + if err := binary.Read(r, binary.BigEndian, &m31.VolumeData); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } case "ELV": - binary.Read(r, binary.BigEndian, &m31.ElevationData) + if err := binary.Read(r, binary.BigEndian, &m31.ElevationData); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } case "RAD": - binary.Read(r, binary.BigEndian, &m31.RadialData) - case "REF": - fallthrough - case "VEL": - fallthrough - case "CFP": - fallthrough - case "SW ": - fallthrough - case "ZDR": - fallthrough - case "PHI": - fallthrough - case "RHO": + if err := binary.Read(r, binary.BigEndian, &m31.RadialData); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } + case "REF", "VEL", "CFP", "SW ", "ZDR", "PHI", "RHO": m := GenericDataMoment{} - binary.Read(r, binary.BigEndian, &m) + if err := binary.Read(r, binary.BigEndian, &m); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } // LDM is the amount of space in bytes required for a data moment // array and equals ((NG * DWS) / 8) where NG is the number of gates @@ -197,7 +213,10 @@ func msg31(r io.ReadSeeker) *Message31 { ldm := m.NumberDataMomentGates * uint16(m.DataWordSize) / 8 data := make([]byte, ldm) - binary.Read(r, binary.BigEndian, data) + if err := binary.Read(r, binary.BigEndian, data); err != nil { + logrus.Errorf(err.Error()) + return nil, err + } d := &DataMoment{ GenericDataMoment: m, @@ -222,8 +241,9 @@ func msg31(r io.ReadSeeker) *Message31 { } default: // preview(r, 256) - logrus.Panicf("Data Block - unknown type '%s'", blockName) + logrus.Errorf("Data Block - unknown type '%s'", blockName) + return nil, fmt.Errorf("data block - unknown type '%s'", blockName) } } - return &m31 + return &m31, nil } diff --git a/cmd/ar2v-dump/main.go b/cmd/ar2v-dump/main.go index 37b36b8..878ee45 100644 --- a/cmd/ar2v-dump/main.go +++ b/cmd/ar2v-dump/main.go @@ -18,7 +18,10 @@ func main() { return } - ar2 := archive2.Extract(f) + ar2, err := archive2.Extract(f) + if err != nil { + logrus.Fatal(err) + } fmt.Printf("Station: %s\n", ar2.VolumeHeader.ICAO) fmt.Printf("Date: %s\n", ar2.VolumeHeader.Date()) diff --git a/cmd/nexrad-render/main.go b/cmd/nexrad-render/main.go index 3b1f469..c7a27b4 100644 --- a/cmd/nexrad-render/main.go +++ b/cmd/nexrad-render/main.go @@ -5,7 +5,6 @@ import ( "image" "image/color" "image/draw" - "io/ioutil" "math" "os" "runtime" @@ -130,7 +129,7 @@ func run(cmd *cobra.Command, args []string) { } func animate(dir, outdir, prod string) { - files, err := ioutil.ReadDir(dir) + files, err := os.ReadDir(dir) if err != nil { logrus.Fatal(err) } @@ -155,7 +154,10 @@ func animate(dir, outdir, prod string) { logrus.Error(err) return } - ar2 := archive2.Extract(f) + ar2, err := archive2.Extract(f) + if err != nil { + logrus.Fatal(err) + } f.Close() render(outf, ar2.ElevationScans[elevation], fmt.Sprintf("%s - %s", ar2.VolumeHeader.ICAO, ar2.VolumeHeader.Date())) bar.Increment() @@ -185,11 +187,19 @@ func single(in, out, product string) { } defer f.Close() - ar2 := archive2.Extract(f) + ar2, err := archive2.Extract(f) + if err != nil { + logrus.Fatal(err) + } logrus.Debug(ar2) label := fmt.Sprintf("%s %f %s VCP:%d %s %s", ar2.VolumeHeader.ICAO, ar2.ElevationScans[2][0].Header.ElevationAngle, strings.ToUpper(product), ar2.RadarStatus.VolumeCoveragePatternNum, ar2.VolumeHeader.FileName(), ar2.VolumeHeader.Date().Format(time.RFC3339)) - logrus.Info("Generating %s from %s -> %s\n", strings.ToUpper(product), in, out) + logrus.Info(fmt.Sprintf("Generating %s from %s -> %s\n", strings.ToUpper(product), in, out)) + logrus.WithFields(logrus.Fields{ + "product": strings.ToUpper(product), + "file": in, + "output": out, + }).Info("Generating product") render(out, ar2.ElevationScans[elevation], label) } diff --git a/cmd/nexrad-tui/main.go b/cmd/nexrad-tui/main.go index bb968ae..9ab621d 100644 --- a/cmd/nexrad-tui/main.go +++ b/cmd/nexrad-tui/main.go @@ -215,7 +215,10 @@ func main() { return } - ar2 = archive2.Extract(f) + ar2, err = archive2.Extract(f) + if err != nil { + logrus.Fatal(err) + } if err := g.MainLoop(); err != nil && err != gocui.ErrQuit { log.Panicln(err) diff --git a/go.mod b/go.mod index 0c8186a..aef707a 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,15 @@ module github.com/bwiggs/go-nexrad go 1.12 require ( - github.com/VividCortex/ewma v1.2.0 // indirect - github.com/cheggaaa/pb/v3 v3.0.8 + github.com/cheggaaa/pb/v3 v3.1.5 github.com/davecgh/go-spew v1.1.1 - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.18.0 // indirect github.com/jroimartin/gocui v0.5.0 - github.com/llgcode/draw2d v0.0.0-20210904075650-80aa0a2a901d - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-runewidth v0.0.13 // indirect - github.com/nsf/termbox-go v1.1.1 - github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cobra v1.4.0 - golang.org/x/image v0.0.0-20220601225756-64ec528b34cd - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + github.com/llgcode/draw2d v0.0.0-20240627062922-0ed1ff131195 + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/cobra v1.8.1 + golang.org/x/image v0.23.0 ) diff --git a/go.sum b/go.sum index 76bfcd3..a3f643c 100644 --- a/go.sum +++ b/go.sum @@ -1,66 +1,136 @@ -github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= -github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= -github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= +github.com/cheggaaa/pb/v3 v3.1.5 h1:QuuUzeM2WsAqG2gMqtzaWithDJv0i+i6UlnwSCI4QLk= +github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6jM60XI= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/go-gl/gl v0.0.0-20180407155706-68e253793080/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= -github.com/go-gl/glfw v0.0.0-20180426074136-46a8d530c326/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= +github.com/go-gl/glfw v0.0.0-20231124074035-2de0cf0c80af/go.mod h1:wyvWpaEu9B/VQiV1jsPs7Mha9I7yto/HqIBw197ZAzk= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jroimartin/gocui v0.5.0 h1:DCZc97zY9dMnHXJSJLLmx9VqiEnAj0yh0eTNpuEtG/4= github.com/jroimartin/gocui v0.5.0/go.mod h1:l7Hz8DoYoL6NoYnlnaX6XCNR62G7J5FfSW5jEogzaxE= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/llgcode/draw2d v0.0.0-20210904075650-80aa0a2a901d h1:4/ycg+VrwjGurTqiHv2xM/h6Qm81qSra+KbfT4FH2FA= -github.com/llgcode/draw2d v0.0.0-20210904075650-80aa0a2a901d/go.mod h1:mVa0dA29Db2S4LVqDYLlsePDzRJLDfdhVZiI15uY0FA= -github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb h1:61ndUreYSlWFeCY44JxDDkngVoI7/1MVhEl98Nm0KOk= -github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb/go.mod h1:1l8ky+Ew27CMX29uG+a2hNOKpeNYEQjjtiALiBlFQbY= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= +github.com/llgcode/draw2d v0.0.0-20240627062922-0ed1ff131195 h1:Vdz2cBh5Fw2MYHWi3ED2PraDQaWEUhNCr1XFHrP4N5A= +github.com/llgcode/draw2d v0.0.0-20240627062922-0ed1ff131195/go.mod h1:1Vk0LDW6jG5cGc2D9RQUxHaE0vYhTvIwSo9mOL6K4/U= +github.com/llgcode/ps v0.0.0-20210114104736-f4b0c5d1e02e h1:ZAvbj5hI/G/EbAYAcj4yCXUNiFKefEhH0qfImDDD0/8= +github.com/llgcode/ps v0.0.0-20210114104736-f4b0c5d1e02e/go.mod h1:1l8ky+Ew27CMX29uG+a2hNOKpeNYEQjjtiALiBlFQbY= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY= github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo= +github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/image v0.0.0-20220601225756-64ec528b34cd h1:9NbNcTg//wfC5JskFW4Z3sqwVnjmJKHxLAol1bW2qgw= -golang.org/x/image v0.0.0-20220601225756-64ec528b34cd/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= +golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68= +golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=