go.mod | 2 +- go.sum | 4 ++-- json.go | 2 +- refresh.go | 28 ++++++++++++++-------------- upload.go | 13 ++----------- diff --git a/go.mod b/go.mod index 29cb3ba684ffe04d79126145dd0e02b16b08fa3f937ad22254862ad7df169d9b..df5872bd65d9aea3315529fb26b962039d0c9eb6866d4c586be0f2ca316079af 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ go 1.24 require ( - go.cypherpunks.su/recfile/v2 v2.0.0 + go.cypherpunks.su/recfile/v3 v3.0.0 golang.org/x/crypto v0.33.0 golang.org/x/net v0.35.0 ) diff --git a/go.sum b/go.sum index 2e350fbca4ee3aa0b1d835adeaa0d660d935902a8e995fc46677a256ae7526ba..429e6d332dddde3f1793f4540859e02696534bff345ebe96e424a4f55bf37cdd 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -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.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= diff --git a/json.go b/json.go index c3b9694742f48a2debb91697dd0622e9562593925e759057dc7b9da24e7997aa..43e2a025941c6cf7fbe0b6c7910a2256ea2913e4a483c3c80771737898f9742b 100644 --- a/json.go +++ b/json.go @@ -24,7 +24,7 @@ "os" "path/filepath" "strings" - "go.cypherpunks.su/recfile/v2" + "go.cypherpunks.su/recfile/v3" ) func getMD(pkgName, version string) (*PkgMeta, []*PkgReleaseInfo, error) { diff --git a/refresh.go b/refresh.go index 50275daf6f225a5092ae819ddfeb629ae4551212cf47b778cf9d6120a088f1d1..4d29b6fd6d1c942195c15145963f469a16866cdb46d12241ae48189a510baa93 100644 --- a/refresh.go +++ b/refresh.go @@ -36,7 +36,7 @@ "regexp" "strings" "time" - "go.cypherpunks.su/recfile/v2" + "go.cypherpunks.su/recfile/v3" "golang.org/x/crypto/blake2b" ) @@ -144,8 +144,8 @@ if jsonField == "" { continue } if _, err = wr.WriteFields(recfile.Field{ - Name: MDFieldToRecField[recField], - Value: jsonField, + F: MDFieldToRecField[recField], + V: jsonField, }); err != nil { log.Fatal(err) } @@ -161,8 +161,8 @@ {MDFieldProvidesExtra, meta.Info.ProvidesExtra}, } { for _, v := range m.jsonFields { if _, err = wr.WriteFields(recfile.Field{ - Name: MDFieldToRecField[m.recField], - Value: v, + F: MDFieldToRecField[m.recField], + V: v, }); err != nil { log.Fatal(err) } @@ -200,8 +200,8 @@ if jsonField == "" { continue } if _, err = wr.WriteFields(recfile.Field{ - Name: MDFieldToRecField[recField], - Value: jsonField, + F: MDFieldToRecField[recField], + V: jsonField, }); err != nil { log.Fatal(err) } @@ -213,8 +213,8 @@ {MDFieldRequiresDist, metaStripped.Info.RequiresDist}, } { for _, v := range m.jsonFields { if _, err = wr.WriteFields(recfile.Field{ - Name: MDFieldToRecField[m.recField], - Value: v, + F: MDFieldToRecField[m.recField], + V: v, }); err != nil { log.Fatal(err) } @@ -223,11 +223,11 @@ } description = metaStripped.Info.Description allReleases = metaStripped.Releases } - lines := strings.Split(description, "\n") - if len(lines) > 0 { - if _, err = wr.WriteFieldMultiline( - MDFieldDescription, lines, - ); err != nil { + if len(description) > 0 { + if _, err = wr.WriteFields(recfile.Field{ + F: MDFieldDescription, + V: description, + }); err != nil { log.Fatal(err) } } diff --git a/upload.go b/upload.go index 2b5cb9efb0af5e3c20d3f4868f198156b898cb6a33ce049e2aa8e72c04fe48b8..70cfe9b5cf9fdf7c53d48c6c5d86b2a220b30026b5f86461b0f4eca60fe647a9 100644 --- a/upload.go +++ b/upload.go @@ -31,7 +31,7 @@ "regexp" "strings" "time" - "go.cypherpunks.su/recfile/v2" + "go.cypherpunks.su/recfile/v3" ) var NormalizationRe = regexp.MustCompilePOSIX("[-_.]+") @@ -195,16 +195,7 @@ for _, m := range MDFormToRecField { formField, recField := m[0], m[1] if vs, exists := r.MultipartForm.Value[formField]; exists { for _, v := range vs { - lines := strings.Split(v, "\n") - if len(lines) > 1 { - _, err = wr.WriteFieldMultiline(recField, lines) - } else { - _, err = wr.WriteFields(recfile.Field{ - Name: recField, - Value: lines[0], - }) - } - if err != nil { + if _, err = wr.WriteFields(recfile.Field{F: recField, V: v}); err != nil { log.Fatal(err) } }