X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=w.go;h=32ee966c1e22e14454866f5366c08ff3ac304d25;hb=a24ce24d791284ed7ded63fc824c1c4e239d6d6d;hp=880c905cbdbf7b4ccb915ffd350af66b63354751;hpb=0e4a50769ab3011df2e27dbd8c7658cd64f502fd;p=gorecfile.git diff --git a/w.go b/w.go index 880c905..32ee966 100644 --- a/w.go +++ b/w.go @@ -1,6 +1,6 @@ /* recfile -- GNU recutils'es recfiles parser on pure Go -Copyright (C) 2020-2021 Sergey Matveev +Copyright (C) 2020-2023 Sergey Matveev This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -// GNU recutils'es recfiles parser on pure Go package recfile import ( @@ -31,14 +30,16 @@ func NewWriter(w io.StringWriter) *Writer { return &Writer{w} } -func (w *Writer) RecordStart(fs ...Field) (written int, err error) { +func (w *Writer) RecordStart() (written int, err error) { return w.w.WriteString("\n") } func (w *Writer) WriteFields(fs ...Field) (written int, err error) { var n int for _, f := range fs { - n, err = w.w.WriteString(f.Name + ": " + strings.TrimLeft(f.Value, " ") + "\n") + n, err = w.w.WriteString( + f.Name + ": " + strings.TrimRight(strings.TrimLeft(f.Value, " "), "\\") + "\n", + ) written += n if err != nil { return @@ -49,13 +50,15 @@ func (w *Writer) WriteFields(fs ...Field) (written int, err error) { func (w *Writer) WriteFieldMultiline(name string, lines []string) (written int, err error) { var n int - n, err = w.w.WriteString(name + ": " + strings.TrimLeft(lines[0], " ") + "\n") + n, err = w.w.WriteString( + name + ": " + strings.TrimRight(strings.TrimLeft(lines[0], " "), "\\") + "\n", + ) written += n if err != nil { return } for _, l := range lines[1:] { - n, err = w.w.WriteString("+ " + l + "\n") + n, err = w.w.WriteString("+ " + strings.TrimRight(l, "\\") + "\n") written += n if err != nil { return