Merge pull request #555 from tealeg/remove-stream-file-builder

Remove stream file builder

Author: tealeg

cell.go

@@ -479,28 +479,3 @@ func (c *Cell) FormattedValue() (string, error) {
 func (c *Cell) SetDataValidation(dd *xlsxDataValidation) {
 	c.DataValidation = dd
 }
-
-// StreamingCellMetadata represents anything attributable to a cell
-// except for the cell data itself. For example, it is used
-// in StreamFileBuilder.AddSheetWithDefaultColumnMetadata to
-// associate default attributes for cells in a particular column
-type StreamingCellMetadata struct {
-	cellType    CellType
-	streamStyle StreamStyle
-}
-
-var (
-	DefaultStringStreamingCellMetadata  StreamingCellMetadata
-	DefaultNumericStreamingCellMetadata StreamingCellMetadata
-	DefaultDecimalStreamingCellMetadata StreamingCellMetadata
-	DefaultIntegerStreamingCellMetadata StreamingCellMetadata
-	DefaultDateStreamingCellMetadata    StreamingCellMetadata
-)
-
-func MakeStreamingCellMetadata(cellType CellType, streamStyle StreamStyle) StreamingCellMetadata {
-	return StreamingCellMetadata{cellType, streamStyle}
-}
-
-func (cm StreamingCellMetadata) Ptr() *StreamingCellMetadata {
-	return &cm
-}

file.go

@@ -463,7 +463,8 @@ func (f *File) MarshallParts(zipWriter *zip.Writer) error {
 			Name:    sheet.Name,
 			SheetId: sheetId,
 			Id:      rId,
-			State:   "visible"}
+			State:   sheet.getState()}
+
 		w, err := zipWriter.Create(partName)
 		if err != nil {
 			return wrap(err)

file_test.go

@@ -896,7 +896,6 @@ func TestFile(t *testing.T) {
 		c.Assert(len(parts), qt.Equals, 13)
 	})
 
-
 	csRunO(c, "TestMarshalFileWithHiddenSheet", func(c *qt.C, option FileOption) {
 		var f *File
 		f = NewFile(option)
@@ -905,16 +904,21 @@ func TestFile(t *testing.T) {
 		cell1 := row1.AddCell()
 		cell1.SetString("A cell!")
 		sheetHidden, _ := f.AddSheet("SomeHiddenSheet")
-		sheetHidden.Hidden=true
+		sheetHidden.Hidden = true
 		row2 := sheetHidden.AddRow()
 		cell2 := row2.AddCell()
 		cell2.SetString("A cell!")
-		parts, err := f.MarshallParts()
+
+		path := filepath.Join(c.Mkdir(), "test.xlsx")
+		err := f.Save(path)
 		c.Assert(err, qt.IsNil)
-		c.Assert(len(parts), qt.Equals, 11)
-		expectedWorkbook := `<?xml version="1.0" encoding="UTF-8"?>
-<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><fileVersion appName="Go XLSX"></fileVersion><workbookPr showObjects="all" date1904="false"></workbookPr><workbookProtection></workbookProtection><bookViews><workbookView showHorizontalScroll="true" showVerticalScroll="true" showSheetTabs="true" tabRatio="204" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"></workbookView></bookViews><sheets><sheet name="MySheet" sheetId="1" r:id="rId1" state="visible"></sheet><sheet name="SomeHiddenSheet" sheetId="2" r:id="rId2" state="hidden"></sheet></sheets><definedNames></definedNames><calcPr iterateCount="100" refMode="A1" iterateDelta="0.001"></calcPr></workbook>`
-		c.Assert(parts["xl/workbook.xml"], qt.Equals, expectedWorkbook)
+
+		xlsxFile, err := OpenFile(path, option)
+		c.Assert(err, qt.IsNil)
+
+		s, ok := xlsxFile.Sheet["SomeHiddenSheet"]
+		c.Assert(ok, qt.Equals, true)
+		c.Assert(s.Hidden, qt.Equals, true)
 	})
 
 	// We can save a File as a valid XLSX file at a given path.

go.mod

@@ -1,6 +1,6 @@
-module github.com/tealeg/xlsx/v2
+module github.com/tealeg/xlsx/v3
 
-go 1.12
+go 1.14
 
 require (
 	github.com/frankban/quicktest v1.5.0

lib.go

@@ -240,7 +240,6 @@ func getMaxMinFromDimensionRef(ref string) (minx, miny, maxx, maxy int, err erro
 // calculateMaxMinFromWorkSheet works out the dimensions of a spreadsheet
 // that doesn't have a DimensionRef set.  The only case currently
 // known where this is true is with XLSX exported from Google Docs.
-// This is also true for XLSX files created through the streaming APIs.
 func calculateMaxMinFromWorksheet(worksheet *xlsxWorksheet) (minx, miny, maxx, maxy int, err error) {
 	// Note, this method could be very slow for large spreadsheets.
 	var x, y int

sheet.go

@@ -13,21 +13,20 @@ import (
 // Sheet is a high level structure intended to provide user access to
 // the contents of a particular sheet within an XLSX file.
 type Sheet struct {
-	Name             string
-	File             *File
-	Cols             *ColStore
-	MaxRow           int
-	MaxCol           int
-	Hidden           bool
-	Selected         bool
-	SheetViews       []SheetView
-	SheetFormat      SheetFormat
-	AutoFilter       *AutoFilter
-	Relations        []Relation
-	DataValidations  []*xlsxDataValidation
-	cellStore        CellStore
-	streamedRowCount int
-	currentRow       *Row
+	Name            string
+	File            *File
+	Cols            *ColStore
+	MaxRow          int
+	MaxCol          int
+	Hidden          bool
+	Selected        bool
+	SheetViews      []SheetView
+	SheetFormat     SheetFormat
+	AutoFilter      *AutoFilter
+	Relations       []Relation
+	DataValidations []*xlsxDataValidation
+	cellStore       CellStore
+	currentRow      *Row
 }
 
 // NewSheet constructs a Sheet with the default CellStore and returns
@@ -58,6 +57,13 @@ func (s *Sheet) Close() {
 	s.cellStore = nil
 }
 
+func (s *Sheet) getState() string {
+	if s.Hidden {
+		return "hidden"
+	}
+	return "visible"
+}
+
 type SheetView struct {
 	Pane *Pane
 }