DRAFT: Handle and return more errors

README.md

@@ -43,7 +43,11 @@ import (
 )
 
 func main() {
- f := excelize.NewFile()
+ f, err := excelize.NewFile()
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
  // Create a new sheet.
  index := f.NewSheet("Sheet2")
  // Set value of a cell.
@@ -126,7 +130,11 @@ func main() {
  "B1": "Apple", "C1": "Orange", "D1": "Pear"}
  values := map[string]int{
  "B2": 2, "C2": 3, "D2": 3, "B3": 5, "C3": 2, "D3": 4, "B4": 6, "C4": 7, "D4": 8}
- f := excelize.NewFile()
+ f, err := excelize.NewFile()
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
  for k, v := range categories {
  f.SetCellValue("Sheet1", k, v)
  }

README_zh.md

@@ -43,7 +43,11 @@ import (
 )
 
 func main() {
- f := excelize.NewFile()
+ f, err := excelize.NewFile()
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
  // 创建一个工作表
  index := f.NewSheet("Sheet2")
  // 设置单元格的值
@@ -126,7 +130,11 @@ func main() {
  "B1": "Apple", "C1": "Orange", "D1": "Pear"}
  values := map[string]int{
  "B2": 2, "C2": 3, "D2": 3, "B3": 5, "C3": 2, "D3": 4, "B4": 6, "C4": 7, "D4": 8}
- f := excelize.NewFile()
+ f, err := excelize.NewFile()
+ if err != nil {
+ fmt.Println(err)
+ return
+ }
  for k, v := range categories {
  f.SetCellValue("Sheet1", k, v)
  }

adjust_test.go

@@ -7,7 +7,8 @@ import (
 )
 
 func TestAdjustMergeCells(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  // testing adjustAutoFilter with illegal cell coordinates.
  assert.EqualError(t, f.adjustMergeCells(&xlsxWorksheet{
  MergeCells: &xlsxMergeCells{
@@ -264,15 +265,17 @@ func TestAdjustMergeCells(t *testing.T) {
  assert.Equal(t, 0, len(c.ws.MergeCells.Cells), c.label)
  }
 
- f = NewFile()
+ f, err = NewFile()
+ assert.NoError(t, err)
  p1, p2 := f.adjustMergeCellsHelper(2, 1, 0, 0)
  assert.Equal(t, 1, p1)
  assert.Equal(t, 2, p2)
  f.deleteMergeCell(nil, -1)
 }
 
 func TestAdjustAutoFilter(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  assert.NoError(t, f.adjustAutoFilter(&xlsxWorksheet{
  SheetData: xlsxSheetData{
  Row: []xlsxRow{{Hidden: true, R: 2}},
@@ -295,7 +298,8 @@ func TestAdjustAutoFilter(t *testing.T) {
 }
 
 func TestAdjustHelper(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.NewSheet("Sheet2")
  f.Sheet.Store("xl/worksheets/sheet1.xml", &xlsxWorksheet{
  MergeCells: &xlsxMergeCells{Cells: []*xlsxMergeCell{{Ref: "A:B1"}}},
@@ -311,7 +315,8 @@ func TestAdjustHelper(t *testing.T) {
 }
 
 func TestAdjustCalcChain(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.CalcChain = &xlsxCalcChain{
  C: []xlsxCalcChainC{
  {R: "B2", I: 2}, {R: "B2", I: 1},

calc_test.go

@@ -11,7 +11,10 @@ import (
 )
 
 func prepareCalcData(cellData [][]interface{}) *File {
- f := NewFile()
+ f, err := NewFile()
+ if err != nil {
+ return nil
+ }
  for r, row := range cellData {
  for c, value := range row {
  cell, _ := CoordinatesToCellName(c+1, r+1)
@@ -4673,7 +4676,9 @@ func TestCalcDatabase(t *testing.T) {
 }
 
 func TestCalcFORMULATEXT(t *testing.T) {
- f, formulaText := NewFile(), "=SUM(B1:C1)"
+ f, err := NewFile()
+ assert.NoError(t, err)
+ formulaText := "=SUM(B1:C1)"
  assert.NoError(t, f.SetCellFormula("Sheet1", "A1", formulaText))
  for _, formula := range []string{"=FORMULATEXT(A1)", "=FORMULATEXT(A:A)", "=FORMULATEXT(A1:B1)"} {
  assert.NoError(t, f.SetCellFormula("Sheet1", "D1", formula), formula)
@@ -4918,7 +4923,8 @@ func TestCalcIRR(t *testing.T) {
 }
 
 func TestCalcMAXMINIFS(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  for cell, row := range map[string][]interface{}{
  "A1": {1, -math.MaxFloat64 - 1},
  "A2": {2, -math.MaxFloat64 - 2},
@@ -5202,7 +5208,8 @@ func TestCalcXNPV(t *testing.T) {
 }
 
 func TestCalcMATCH(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  for cell, row := range map[string][]interface{}{
  "A1": {"cccc", 7, 4, 16},
  "A2": {"dddd", 2, 6, 11},
@@ -5244,7 +5251,8 @@ func TestCalcMATCH(t *testing.T) {
 }
 
 func TestCalcISFORMULA(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  assert.NoError(t, f.SetCellFormula("Sheet1", "B1", "=ISFORMULA(A1)"))
  for _, formula := range []string{"=NA()", "=SUM(A1:A3)"} {
  assert.NoError(t, f.SetCellFormula("Sheet1", "A1", formula))
@@ -5384,7 +5392,8 @@ func TestCalcSLOP(t *testing.T) {
 }
 
 func TestCalcSHEET(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.NewSheet("Sheet2")
  formulaList := map[string]string{
  "=SHEET(\"Sheet2\")": "2",
@@ -5400,7 +5409,8 @@ func TestCalcSHEET(t *testing.T) {
 }
 
 func TestCalcSHEETS(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.NewSheet("Sheet2")
  formulaList := map[string]string{
  "=SHEETS(Sheet1!A1:B1)": "1",
@@ -5629,7 +5639,8 @@ func TestCalcNETWORKDAYSandWORKDAY(t *testing.T) {
 }
 
 func TestCalcZTEST(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  assert.NoError(t, f.SetSheetRow("Sheet1", "A1", &[]int{4, 5, 2, 5, 8, 9, 3, 2, 3, 8, 9, 5}))
  formulaList := map[string]string{
  "=Z.TEST(A1:L1,5)": "0.371103278558538",
@@ -5700,7 +5711,8 @@ func TestCalcBetainvProbIterator(t *testing.T) {
 }
 
 func TestNestedFunctionsWithOperators(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  formulaList := map[string]string{
  `=LEN("KEEP")`: "4",
  `=LEN("REMOVEKEEP") - LEN("REMOVE")`: "4",

calcchain.go

@@ -14,33 +14,42 @@ package excelize
 import (
  "bytes"
  "encoding/xml"
+ "fmt"
  "io"
- "log"
 )
 
-// calcChainReader provides a function to get the pointer to the structure
+// NewCalcChainReader provides a function to get the pointer to the structure
 // after deserialization of xl/calcChain.xml.
-func (f *File) calcChainReader() *xlsxCalcChain {
+func (f *File) NewCalcChainReader() (*xlsxCalcChain, error) {
  var err error
 
  if f.CalcChain == nil {
  f.CalcChain = new(xlsxCalcChain)
  if err = f.xmlNewDecoder(bytes.NewReader(namespaceStrictToTransitional(f.readXML(defaultXMLPathCalcChain)))).
  Decode(f.CalcChain); err != nil && err != io.EOF {
- log.Printf("xml decode error: %s", err)
+ return f.CalcChain, fmt.Errorf("xml decode error: %w", err)
  }
  }
 
+ return f.CalcChain, nil
+}
+
+// calcChainReader provides a function to get the CalcChain.
+func (f *File) calcChainReader() *xlsxCalcChain {
  return f.CalcChain
 }
 
 // calcChainWriter provides a function to save xl/calcChain.xml after
 // serialize structure.
-func (f *File) calcChainWriter() {
+func (f *File) calcChainWriter() error {
  if f.CalcChain != nil && f.CalcChain.C != nil {
- output, _ := xml.Marshal(f.CalcChain)
+ output, err := xml.Marshal(f.CalcChain)
+ if err != nil {
+ return err
+ }
  f.saveFileList(defaultXMLPathCalcChain, output)
  }
+ return nil
 }
 
 // deleteCalcChain provides a function to remove cell reference on the
@@ -52,10 +61,13 @@ func (f *File) deleteCalcChain(index int, axis string) {
  return !((c.I == index && c.R == axis) || (c.I == index && axis == ""))
  })
  }
- if len(calc.C) == 0 {
+ if calc == nil || len(calc.C) == 0 {
  f.CalcChain = nil
  f.Pkg.Delete(defaultXMLPathCalcChain)
  content := f.contentTypesReader()
+ if content == nil {
+ return
+ }
  content.Lock()
  defer content.Unlock()
  for k, v := range content.Overrides {

calcchain_test.go

@@ -1,16 +1,21 @@
 package excelize
 
-import "testing"
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
 
 func TestCalcChainReader(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.CalcChain = nil
  f.Pkg.Store(defaultXMLPathCalcChain, MacintoshCyrillicCharset)
- f.calcChainReader()
 }
 
 func TestDeleteCalcChain(t *testing.T) {
- f := NewFile()
+ f, err := NewFile()
+ assert.NoError(t, err)
  f.CalcChain = &xlsxCalcChain{C: []xlsxCalcChainC{}}
  f.ContentTypes.Overrides = append(f.ContentTypes.Overrides, xlsxOverride{
  PartName: "/xl/calcChain.xml",