Use an updated recfile library

diff --git a/go.mod b/go.mod
index 823be12b9bbdf4c8bc2ad57adc510dd39c0ade3a..8f19256c6013f17bd877ede50812b0de9d756ea4 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 toolchain go1.22.5
 
 require (
-       go.cypherpunks.su/recfile/v2 v2.0.0
+       go.cypherpunks.su/recfile/v3 v3.0.0
        go.cypherpunks.su/tai64n/v4 v4.1.0
        golang.org/x/net v0.21.0
        lukechampine.com/blake3 v1.3.0

diff --git a/go.sum b/go.sum
index 24c132538cdb1fc79777142c4b33942ba861a9a8..58ecf9b1cd5c59e8df5be3003f59e8ac6a83faae 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
 github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-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=
 go.cypherpunks.su/tai64n/v4 v4.1.0 h1:jW0EyklKXpSy9DSFMcDbu7XuLlMkn6kkpNWiMG6UT5c=
 go.cypherpunks.su/tai64n/v4 v4.1.0/go.mod h1:/uKUdhLOy8UciRKpapPaFXSOoa/SiXjs3XsDDpAz7OA=
 golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=

diff --git a/main.go b/main.go
index af1add3ffdecb9889168a55aba70f54bf54855a7..62704d589c5fa35e5d6a86d03fe4f211bf5d5fa6 100644 (file)
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@ import (
        "sync"
        "time"
 
-       "go.cypherpunks.su/recfile/v2"
+       "go.cypherpunks.su/recfile/v3"
        "go.cypherpunks.su/tai64n/v4"
        "golang.org/x/net/netutil"
        "lukechampine.com/blake3"
@@ -137,9 +137,9 @@ func upload(w http.ResponseWriter, r *http.Request) {
        var rec bytes.Buffer
        wr := recfile.NewWriter(&rec)
        if _, err = wr.WriteFields(
-               recfile.Field{Name: "TAI64N", Value: tai},
-               recfile.Field{Name: "Size", Value: strconv.FormatInt(n, 10)},
-               recfile.Field{Name: "Checksum", Value: sum},
+               recfile.Field{F: "TAI64N", V: tai},
+               recfile.Field{F: "Size", V: strconv.FormatInt(n, 10)},
+               recfile.Field{F: "Checksum", V: sum},
        ); err != nil {
                log.Println(r.RemoteAddr, tai, fnOrig, n, sum, err)
                return
@@ -152,19 +152,17 @@ func upload(w http.ResponseWriter, r *http.Request) {
        }
 
        if _, err = wr.WriteFields(
-               recfile.Field{Name: "Filename", Value: fnOrig},
+               recfile.Field{F: "Filename", V: fnOrig},
        ); err != nil {
                log.Println(r.RemoteAddr, tai, fnOrig, n, sum, err)
                return
        }
 
-       var commentLines []string
        p, err = mr.NextPart()
        if err == nil && p.FormName() == CommentFieldName {
                comment, err := io.ReadAll(p)
                if err == nil && len(comment) > 0 {
-                       commentLines = strings.Split(string(comment), "\n")
-                       wr.WriteFieldMultiline("Comment", commentLines)
+                       wr.WriteFields(recfile.Field{F: "Comment", V: string(comment)})
                }
        }