From d9f4a2f154f8d4242572a2fcebdf76b91ed86348 Mon Sep 17 00:00:00 2001
From: Josh Fyne <josh.fyne@essencedigital.com>
Date: Thu, 16 Feb 2017 13:25:55 -0500
Subject: Standardize input and output

---
 file.go | 52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

(limited to 'file.go')

diff --git a/file.go b/file.go
index 2a044f0..17a8bba 100644
--- a/file.go
+++ b/file.go
@@ -3,6 +3,8 @@ package excelize
 import (
 	"archive/zip"
 	"bytes"
+	"fmt"
+	"io"
 	"os"
 )
 
@@ -29,53 +31,45 @@ func CreateFile() *File {
 
 // Save provides function to override the xlsx file with origin path.
 func (f *File) Save() error {
-	buf := new(bytes.Buffer)
-	w := zip.NewWriter(buf)
-	for path, content := range f.XLSX {
-		f, err := w.Create(path)
-		if err != nil {
-			return err
-		}
-		_, err = f.Write([]byte(content))
-		if err != nil {
-			return err
-		}
-	}
-	err := w.Close()
-	if err != nil {
-		return err
-	}
-	file, err := os.OpenFile(f.Path, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666)
-	if err != nil {
-		return err
+	if f.Path == "" {
+		return fmt.Errorf("No path defined for file, consider File.WriteTo or File.Write")
 	}
-	buf.WriteTo(file)
-	return err
+	return f.WriteTo(f.Path)
 }
 
 // WriteTo provides function to create or update to an xlsx file at the provided
 // path.
 func (f *File) WriteTo(name string) error {
+	file, err := os.OpenFile(name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	return f.Write(file)
+}
+
+// Write provides function to write to an io.Writer.
+func (f *File) Write(w io.Writer) error {
 	buf := new(bytes.Buffer)
-	w := zip.NewWriter(buf)
+	zw := zip.NewWriter(buf)
 	for path, content := range f.XLSX {
-		f, err := w.Create(path)
+		fi, err := zw.Create(path)
 		if err != nil {
 			return err
 		}
-		_, err = f.Write([]byte(content))
+		_, err = fi.Write([]byte(content))
 		if err != nil {
 			return err
 		}
 	}
-	err := w.Close()
+	err := zw.Close()
 	if err != nil {
 		return err
 	}
-	file, err := os.OpenFile(name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0666)
-	if err != nil {
+
+	if _, err := buf.WriteTo(w); err != nil {
 		return err
 	}
-	buf.WriteTo(file)
-	return err
+
+	return nil
 }
-- 
cgit v1.2.1