recfiles instead of netstrings

[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 cb270afee87d1789f2da06218ee46d4108c8976c..2b977ae7feb14c0c886851f8871ca6e1d982b32c 100644 (file)
--- a/cmd/sgblog-comment-add/main.go
+++ b/cmd/sgblog-comment-add/main.go
@@ -36,7 +36,6 @@ import (
        "syscall"
        "time"
 
-       "go.cypherpunks.ru/netstring/v2"
        "go.stargrave.org/sgblog"
 )
 
@@ -44,7 +43,7 @@ var hashFinder = regexp.MustCompile("([0-9a-f]{40})")
 
 // Remove various whitespaces and excess lines, because git-notes-add
 // will remove and we have to know exact bytes count
-func cleanupBody(body string) string {
+func cleanupBody(body string) []string {
        lines := strings.Split(string(body), "\n")
        for i, line := range lines {
                line = strings.ReplaceAll(line, "       ", "    ")
@@ -70,7 +69,7 @@ func cleanupBody(body string) string {
                }
                withoutDups = append(withoutDups, line)
        }
-       return strings.Join(withoutDups, "\n")
+       return withoutDups
 }
 
 func main() {
@@ -143,13 +142,16 @@ func main() {
        note = bytes.TrimRight(note, "\r\n")
 
        buf := bytes.NewBuffer(note)
-       w := netstring.NewWriter(buf)
-       w.WriteChunk([]byte(fmt.Sprintf(
-               "From: %s\nDate: %s\n\n%s",
+       buf.WriteString(fmt.Sprintf(
+               "\n\nFrom: %s\nDate: %s\nBody:\n",
                from,
                time.Now().UTC().Format(sgblog.WhenFmt),
-               cleanupBody(string(body)),
-       )))
+       ))
+       for _, s := range cleanupBody(string(body)) {
+               buf.WriteString("+ ")
+               buf.WriteString(s)
+               buf.WriteString("\n")
+       }
 
        if *dryRun {
                fmt.Print(buf.String())