Extract WriteTo method (see io.WriterTo) to expose bytes written

Extract a WriteTo() method (see io.WriterTo) that exposes the count of bytes
written and rewrite Write() to use it.
This commit is contained in:
Olivier Mengué 2018-06-14 17:00:00 +02:00
parent 9e463b4614
commit 2132de1a08
1 changed files with 10 additions and 8 deletions

18
file.go
View File

@ -60,6 +60,12 @@ func (f *File) SaveAs(name string) error {
// Write provides function to write to an io.Writer. // Write provides function to write to an io.Writer.
func (f *File) Write(w io.Writer) error { func (f *File) Write(w io.Writer) error {
_, err := f.WriteTo(w)
return err
}
// WriteTo implements io.WriterTo to write the file.
func (f *File) WriteTo(w io.Writer) (int64, error) {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
zw := zip.NewWriter(buf) zw := zip.NewWriter(buf)
f.contentTypesWriter() f.contentTypesWriter()
@ -70,21 +76,17 @@ func (f *File) Write(w io.Writer) error {
for path, content := range f.XLSX { for path, content := range f.XLSX {
fi, err := zw.Create(path) fi, err := zw.Create(path)
if err != nil { if err != nil {
return err return 0, err
} }
_, err = fi.Write(content) _, err = fi.Write(content)
if err != nil { if err != nil {
return err return 0, err
} }
} }
err := zw.Close() err := zw.Close()
if err != nil { if err != nil {
return err return 0, err
} }
if _, err := buf.WriteTo(w); err != nil { return buf.WriteTo(w)
return err
}
return nil
} }