xlsx

extract/aux.go

@@ -4,20 +4,21 @@ import (
 	"os"
 
 	log "github.com/sirupsen/logrus"
-	"github.com/tealeg/xlsx"
+	"github.com/xuri/excelize/v2"
 )
 
 func (e Extractor) ExtractAux(auxfile, xlsxfile string) error {
-	if err := createAuxXlxs(xlsxfile); err != nil {
+	os.Remove(xlsxfile)
+	if err := createAuxXlsx(xlsxfile); err != nil {
 		return err
 	}
 
-	wb, err := xlsx.OpenFile(xlsxfile)
+	f, err := excelize.OpenFile(xlsxfile)
 	if err != nil {
-		panic(err)
+		return err
 	}
 
-	sh := wb.Sheets[0]
+	defer f.Close()
 
 	data, err := os.ReadFile(auxfile)
 	if err != nil {
@@ -25,21 +26,23 @@ func (e Extractor) ExtractAux(auxfile, xlsxfile string) error {
 		return err
 	}
 
+	row := 2
+	col := 1
 	for i := 0; i < len(data); i += 24 + 128 + 512 {
-		row := sh.AddRow()
-
 		var head AuxFrameHead
 		head.Decode(data[i : i+24])
-		head.SaveXlsx(row)
+		l0, _ := head.SaveXlsx(f, col, row)
 
 		var box AuxFocalBox
 		box.Decode(data[i+24 : i+24+128])
-		box.SaveXlsx(row)
+		l1, _ := box.SaveXlsx(f, col+l0, row)
 
 		var plat AuxPlatform
 		plat.Decode(data[i+24+128 : i+24+128+512])
-		box.SaveXlsx(row)
+		plat.SaveXlsx(f, col+l0+l1, row)
+
+		row++
 	}
 
-	return nil
+	return f.Save()
 }