From 1e02509dd354dc16ce4e3d5225f260476b05b27b Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 13 Jul 2025 10:31:24 +0300 Subject: [PATCH] Use an updated recfile library --- cmd/sgblog-comment-add/main.go | 8 ++++---- common.go | 14 +++++++------- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index cfc57af..47a15ef 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -34,7 +34,7 @@ import ( "syscall" "time" - "go.cypherpunks.su/recfile/v2" + "go.cypherpunks.su/recfile/v3" "go.stargrave.org/sgblog" ) @@ -157,12 +157,12 @@ func main() { log.Fatal(err) } if _, err = recfileW.WriteFields( - recfile.Field{Name: "From", Value: from}, - recfile.Field{Name: "Date", Value: time.Now().UTC().Format(sgblog.WhenFmt)}, + recfile.Field{F: "From", V: from}, + recfile.Field{F: "Date", V: time.Now().UTC().Format(sgblog.WhenFmt)}, ); err != nil { log.Fatal(err) } - if _, err = recfileW.WriteFieldMultiline( + if _, err = recfileW.WriteField( "Body", append([]string{""}, cleanupBody(string(body))...), ); err != nil { log.Fatal(err) diff --git a/common.go b/common.go index ae0961e..128a745 100644 --- a/common.go +++ b/common.go @@ -26,7 +26,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" - "go.cypherpunks.su/recfile/v2" + "go.cypherpunks.su/recfile/v3" ) const ( @@ -43,16 +43,16 @@ func ParseComments(data []byte) []string { break } if len(fields) != 3 || - fields[0].Name != "From" || - fields[1].Name != "Date" || - fields[2].Name != "Body" { + fields[0].F != "From" || + fields[1].F != "Date" || + fields[2].F != "Body" { continue } comments = append(comments, fmt.Sprintf( "%s: %s\n%s: %s\n%s", - fields[0].Name, fields[0].Value, - fields[1].Name, fields[1].Value, - fields[2].Value, + fields[0].F, fields[0].V, + fields[1].F, fields[1].V, + fields[2].V, )) } return comments diff --git a/go.mod b/go.mod index b942c44..a920dc9 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/hjson/hjson-go/v4 v4.4.0 github.com/klauspost/compress v1.17.11 github.com/vorlif/spreak v0.6.0 - go.cypherpunks.su/recfile/v2 v2.0.0 + go.cypherpunks.su/recfile/v3 v3.0.0 golang.org/x/text v0.16.0 lukechampine.com/blake3 v1.3.0 ) diff --git a/go.sum b/go.sum index 4269a8d..c966ee5 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ github.com/vorlif/spreak v0.6.0/go.mod h1:vcqv4dB1XgHpxIXhV5C+8EgqlzKfL37Atj2O/b github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.cypherpunks.su/recfile/v2 v2.0.0 h1:Q2o+OzM1H2O1WnshU88r+waBqylkqZj8plBdBWZitcU= -go.cypherpunks.su/recfile/v2 v2.0.0/go.mod h1:36EnyBwx6VpsSM5MMcYGTDiKrVEP49S09p33EFuhQYU= +go.cypherpunks.su/recfile/v3 v3.0.0 h1:cHuH9GK153v+XJogb4XxuDMaC+RGmn4G2G5MLJ3SIpc= +go.cypherpunks.su/recfile/v3 v3.0.0/go.mod h1:JAkipcy9IUNuYMR+vfNqf/f6KydLdhw1TBaOnNjdHv4= 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.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -- 2.51.0