Use an updated recfile library

diff --git a/go.mod b/go.mod
index 980574297371530b9248594eaa1d02466d0c0d8c..96942817873a2c064528ba32a865030feea66cad 100644 (file)
--- 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 a0e843874c8d29e6ae56f03689e66aa80675bd72..91cea9d25ca57887772b80d0ab69fb37176fd27f 100644 (file)
--- 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 89613b881222a07b438f1f91b202be87eff593cd..7d18d167b959fea6212702b5a75503157d2baf09 100644 (file)
--- 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 a40ef2a9850a02cea2faeab830447674ab94851d..a3f7b955f8ea2ea743b557c32827d6d0672617cd 100644 (file)
--- 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 e4dae76e8e91631ef47de0675d610a0af351f36f..979ea5452770aee895f71d46cad19a203b0c3df2 100644 (file)
--- 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)
                                }
                        }