summaryrefslogtreecommitdiff
path: root/excelize.go
diff options
context:
space:
mode:
authorxuri <xuri.me@gmail.com>2022-05-20 20:46:29 +0800
committerxuri <xuri.me@gmail.com>2022-05-20 20:46:29 +0800
commit63adac25897f295ef4493e060d917650f03ebd3b (patch)
tree5153f2be474304832fe4420905a922013bb2088f /excelize.go
parent8f16a76781fb8f47094492c38a02c2cdc4ce5013 (diff)
make workbook open filed exception message clear
- New exported constant `ErrWorkbookPassword` - Rename exported constant `ErrWorkbookExt` to `ErrWorkbookFileFormat`
Diffstat (limited to 'excelize.go')
-rw-r--r--excelize.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/excelize.go b/excelize.go
index d78d2b1..0e2f440 100644
--- a/excelize.go
+++ b/excelize.go
@@ -158,13 +158,15 @@ func OpenReader(r io.Reader, opt ...Options) (*File, error) {
return nil, ErrOptionsUnzipSizeLimit
}
if bytes.Contains(b, oleIdentifier) {
- b, err = Decrypt(b, f.options)
- if err != nil {
- return nil, fmt.Errorf("decrypted file failed")
+ if b, err = Decrypt(b, f.options); err != nil {
+ return nil, ErrWorkbookFileFormat
}
}
zr, err := zip.NewReader(bytes.NewReader(b), int64(len(b)))
if err != nil {
+ if len(f.options.Password) > 0 {
+ return nil, ErrWorkbookPassword
+ }
return nil, err
}
file, sheetCount, err := f.ReadZipReader(zr)