Use an updated recfile library writer capability

[sgblog.git] / cmd / sgblog-comment-add / main.go

diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go
index 2b977ae7feb14c0c886851f8871ca6e1d982b32c..ec8910eef9362d1eb89eb5d66583ece99a7ea9bc 100644 (file)
--- a/cmd/sgblog-comment-add/main.go
+++ b/cmd/sgblog-comment-add/main.go
@@ -36,6 +36,7 @@ import (
        "syscall"
        "time"
 
+       "go.cypherpunks.ru/recfile"
        "go.stargrave.org/sgblog"
 )
 
@@ -142,15 +143,24 @@ func main() {
        note = bytes.TrimRight(note, "\r\n")
 
        buf := bytes.NewBuffer(note)
-       buf.WriteString(fmt.Sprintf(
-               "\n\nFrom: %s\nDate: %s\nBody:\n",
-               from,
-               time.Now().UTC().Format(sgblog.WhenFmt),
-       ))
-       for _, s := range cleanupBody(string(body)) {
-               buf.WriteString("+ ")
-               buf.WriteString(s)
-               buf.WriteString("\n")
+       recfileW := recfile.NewWriter(buf)
+       if _, err = recfileW.RecordStart(); err != nil {
+               log.Fatal(err)
+       }
+       // We trimmed newline, so have to start record twice
+       if _, err = recfileW.RecordStart(); err != nil {
+               log.Fatal(err)
+       }
+       if _, err = recfileW.WriteFields(
+               recfile.Field{"From", from},
+               recfile.Field{"Date", time.Now().UTC().Format(sgblog.WhenFmt)},
+       ); err != nil {
+               log.Fatal(err)
+       }
+       if _, err = recfileW.WriteFieldMultiline(
+               "Body", append([]string{""}, cleanupBody(string(body))...),
+       ); err != nil {
+               log.Fatal(err)
        }
 
        if *dryRun {