From e8ba09d0c532edbfea22467379db9566308671c5 Mon Sep 17 00:00:00 2001 From: Josh Fyne Date: Thu, 16 Feb 2017 13:30:05 -0500 Subject: io.Reader not io.ReaderAt --- excelize.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'excelize.go') diff --git a/excelize.go b/excelize.go index 3c81db2..46e0a84 100644 --- a/excelize.go +++ b/excelize.go @@ -26,19 +26,22 @@ func OpenFile(filename string) (*File, error) { if err != nil { return nil, err } - b, err := ioutil.ReadAll(file) + defer file.Close() + return OpenReader(file) +} + +// OpenReader take an io.Reader and return a populated XLSX file. +func OpenReader(r io.Reader) (*File, error) { + b, err := ioutil.ReadAll(r) if err != nil { return nil, err } - return OpenReader(bytes.NewReader(b), int64(len(b))) -} -// OpenReader take an io.Reader and return a populated XLSX file. -func OpenReader(r io.ReaderAt, size int64) (*File, error) { - zr, err := zip.NewReader(r, size) + zr, err := zip.NewReader(bytes.NewReader(b), int64(len(b))) if err != nil { return nil, err } + file, sheetCount, err := ReadZipReader(zr) if err != nil { return nil, err -- cgit v1.2.1