support type 0x0204

xls.go

@@ -1,33 +1,25 @@
 package xls
 
 import (
-	"github.com/extrame/ole2"
 	"io"
-	"io/ioutil"
+	"os"
+
+	"github.com/extrame/ole2"
 )
 
 //Open one xls file
 func Open(file string, charset string) (*WorkBook, error) {
-	if bts, err := ioutil.ReadFile(file); err == nil {
-		return parse(bts, charset)
+	if fi, err := os.Open(file); err == nil {
+		return OpenReader(fi, charset)
 	} else {
 		return nil, err
 	}
-
 }
 
 //Open xls file from reader
-func OpenReader(reader io.ReadCloser, charset string) (*WorkBook, error) {
-	if bts, err := ioutil.ReadAll(reader); err == nil {
-		return parse(bts, charset)
-	} else {
-		return nil, err
-	}
-}
-
-func parse(bts []byte, charset string) (wb *WorkBook, err error) {
+func OpenReader(reader io.ReadSeeker, charset string) (wb *WorkBook, err error) {
 	var ole *ole2.Ole
-	if ole, err = ole2.Open(bts, charset); err == nil {
+	if ole, err = ole2.Open(reader, charset); err == nil {
 		var dir []*ole2.File
 		if dir, err = ole.ListDir(); err == nil {
 			var book *ole2.File