Explorar o código

feat: add new function and refactor writeto action

* add new exported function to get Excel file content buffer

* refactor the WriteTo function
lizheao %!s(int64=7) %!d(string=hai) anos
pai
achega
2be4d45c62
Modificáronse 2 ficheiros con 16 adicións e 8 borrados
  1. 4 0
      excelize_test.go
  2. 12 8
      file.go

+ 4 - 0
excelize_test.go

@@ -135,6 +135,10 @@ func TestOpenFile(t *testing.T) {
 	if err != nil {
 		t.Log(err)
 	}
+	_, err = xlsx.WriteToBuffer()
+	if err != nil {
+		t.Error(err)
+	}
 }
 
 func TestAddPicture(t *testing.T) {

+ 12 - 8
file.go

@@ -76,6 +76,15 @@ func (f *File) Write(w io.Writer) error {
 
 // WriteTo implements io.WriterTo to write the file.
 func (f *File) WriteTo(w io.Writer) (int64, error) {
+	buf, err := f.WriteToBuffer()
+	if err != nil {
+		return 0, err
+	}
+	return buf.WriteTo(w)
+}
+
+// WriteToBuffer provides a function to get bytes.Buffer from the saved file.
+func (f *File) WriteToBuffer() (*bytes.Buffer, error) {
 	buf := new(bytes.Buffer)
 	zw := zip.NewWriter(buf)
 	f.contentTypesWriter()
@@ -86,17 +95,12 @@ func (f *File) WriteTo(w io.Writer) (int64, error) {
 	for path, content := range f.XLSX {
 		fi, err := zw.Create(path)
 		if err != nil {
-			return 0, err
+			return buf, err
 		}
 		_, err = fi.Write(content)
 		if err != nil {
-			return 0, err
+			return buf, err
 		}
 	}
-	err := zw.Close()
-	if err != nil {
-		return 0, err
-	}
-
-	return buf.WriteTo(w)
+	return buf, zw.Close()
 }