Fixed issue #539 Fixed error opening excel file created in encoding d…

[monoflash]

Fixed issue #539 Fixed error opening excel file created in encoding different from UTF-8, added logging of possible errors when decoding xml, if the function does not provide exit with error

[codecov-io]

Codecov Report

Merging #540 into v2 will decrease coverage by 0.91%.
The diff coverage is 76.92%.

@@            Coverage Diff            @@
##               v2    #540      +/-   ##
=========================================
- Coverage   96.11%   95.2%   -0.92%     
=========================================
  Files          26      26              
  Lines        5452    5543      +91     
=========================================
+ Hits         5240    5277      +37     
- Misses        119     149      +30     
- Partials       93     117      +24

Impacted Files	Coverage Δ
file.go	88.05% <100%> (-0.52%)	⬇️
rows.go	83.25% <50%> (-0.69%)	⬇️
calcchain.go	87.09% <60%> (-6.01%)	⬇️
comment.go	95.81% <60%> (-1.64%)	⬇️
styles.go	98.58% <66.66%> (-0.7%)	⬇️
sheet.go	94.69% <72.22%> (-1.3%)	⬇️
chart.go	99.08% <75%> (-0.2%)	⬇️
sparkline.go	97.02% <76%> (-2.98%)	⬇️
picture.go	96.4% <82.35%> (-2.09%)	⬇️
docProps.go	91.54% <82.35%> (-8.46%)	⬇️
... and 1 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a00ba75...207c926. Read the comment docs.

[xuri]

Hi @monoflash, thanks for your PR. I've left some comments.

[monoflash]

Oops.. I didn’t think that the commits following the pool-request would be added to the pool-request.
Returned package name changes.
Without this patch, excel files do not open and I need to take the library from somewhere. I wanted to connect from a fork, but go mod resists ...

[monoflash]

I fixed all remarks you wrote about.

[xuri]

Hi @monoflash, I've left some comments. If we use charset.NewReaderLabel instead of the CharsetReader function, that will simplify the code.

[monoflash]

Part of the proposed changes has been implemented.

[xuri]

Specified charset reader for the Rows function like is:

func (f *File) Rows(sheet string) (*Rows, error) {
    name, ok := f.sheetMap[trimSheetName(sheet)]
    if !ok {
        return nil, ErrSheetNotExist{sheet}
    }
    if f.Sheet[name] != nil {
        // flush data
        output, _ := xml.Marshal(f.Sheet[name])
        f.saveFileList(name, replaceWorkSheetsRelationshipsNameSpaceBytes(output))
    }
    var (
        err       error
        inElement string
        row       int
        rows      Rows
    )
    decoder := xml.NewDecoder(bytes.NewReader(f.readXML(name)))
    decoder.CharsetReader = charset.NewReaderLabel
    for {
        token, _ := decoder.Token()
        if token == nil {
            break
        }
        switch startElement := token.(type) {
        case xml.StartElement:
            inElement = startElement.Name.Local
            if inElement == "row" {
                for _, attr := range startElement.Attr {
                    if attr.Name.Local == "r" {
                        row, err = strconv.Atoi(attr.Value)
                        if err != nil {
                            return &rows, err
                        }
                    }
                }
                rows.totalRow = row
            }
        default:
        }
    }
    rows.f = f
    rows.sheet = name
    rows.decoder = xml.NewDecoder(bytes.NewReader(f.readXML(name)))
    rows.decoder.CharsetReader = charset.NewReaderLabel
    return &rows, nil
}

I have create a spreadsheet file, there are different encoding on over 20 worksheets:

Encoding.xlsx

Worksheet	Encoding
Sheet1	utf8
Sheet2	windows-1250
Sheet3	windows-1251
Sheet4	windows-1252
Sheet5	windows-1253
Sheet6	windows-1254
Sheet7	windows-1255
Sheet8	windows-1256
Sheet9	windows-1257
Sheet10	windows-1258
Sheet11	big5
Sheet12	gbk
Sheet13	ISO-8859-3
Sheet14	ISO-8859-4
Sheet15	ISO-8859-5
Sheet16	ISO-8859-7
Sheet17	ISO-8859-9
Sheet18	ISO-8859-13
Sheet19	ISO-8859-15
Sheet20	euc-kr

Test the newly modified Row function:

package main

import (
    "fmt"

    "github.com/360EntSecGroup-Skylar/excelize"
)

func main() {
    f, err := excelize.OpenFile("./Encoding.xlsx")
    if err != nil {
        fmt.Println("Open file error:", err)
        return
    }

    for _, sheetName := range f.GetSheetMap() {
        rows, err := f.GetRows(sheetName)
        if err != nil {
            fmt.Println("GetRows error:", err)
            return
        }
        for _, row := range rows { 
            for _, colCell := range row {
                fmt.Print(colCell, "\t")
            }
            fmt.Println()
        }
    }
}

Output:

ελληνικά
Kağan
latviešu
Hello 常用國字標準字體表
nutraĵo
Résumé
Résumé
עִבְרִית
русский
ελληνικά
€1 is cheap
다음과 같은 조건을 따라야 합니다: 저작자표시
Gdańsk
Việt
Kalâdlit
Kağan
latviešu
русский
العربية
Hello 常用國字標準字體表

[monoflash]

I added the function that you requested, and deleted my custom function, also fixed some skipped returned error and fix tests.

[xuri]

Thanks @monoflash. I will add error return values to functions later, and unit tests for this PR.