From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 13 Jul 2025 07:07:58 +0000 (+0300)
Subject: Use an updated recfile library
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=464ad2cf7f39c7e3c1fae539752d83f19b5a547a;p=gocheese.git

Use an updated recfile library
---

diff --git a/go.mod b/go.mod
index 9805742..9694281 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module go.cypherpunks.su/gocheese/v5
 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 a0e8438..91cea9d 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 89613b8..7d18d16 100644
--- a/json.go
+++ b/json.go
@@ -24,7 +24,7 @@ import (
 	"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 a40ef2a..a3f7b95 100644
--- a/refresh.go
+++ b/refresh.go
@@ -36,7 +36,7 @@ import (
 	"strings"
 	"time"
 
-	"go.cypherpunks.su/recfile/v2"
+	"go.cypherpunks.su/recfile/v3"
 	"golang.org/x/crypto/blake2b"
 )
 
@@ -144,8 +144,8 @@ func refreshDir(
 					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 @@ func refreshDir(
 			} {
 				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 @@ func refreshDir(
 					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 @@ func refreshDir(
 			} {
 				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 @@ func refreshDir(
 			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 e4dae76..979ea54 100644
--- a/upload.go
+++ b/upload.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"go.cypherpunks.su/recfile/v2"
+	"go.cypherpunks.su/recfile/v3"
 )
 
 var NormalizationRe = regexp.MustCompilePOSIX("[-_.]+")
@@ -195,16 +195,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		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)
 				}
 			}