forked from unidoc/unioffice
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Decoding was getting fairly complicated, it seems cleaner to have something handle the relationships file and traversal and the document just be notified via callback when new files have been found.
- Loading branch information
Showing
7 changed files
with
399 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// Copyright 2017 Baliance. All rights reserved. | ||
// | ||
// Use of this source code is governed by the terms of the Affero GNU General | ||
// Public License version 3.0 as published by the Free Software Foundation and | ||
// appearing in the file LICENSE included in the packaging of this file. A | ||
// commercial license can be purchased by contacting [email protected]. | ||
|
||
package spreadsheet | ||
|
||
import ( | ||
"baliance.com/gooxml/common" | ||
sml "baliance.com/gooxml/schema/schemas.openxmlformats.org/spreadsheetml" | ||
"baliance.com/gooxml/zippkg" | ||
) | ||
|
||
// New constructs a new workbook. | ||
func New() *Workbook { | ||
wb := &Workbook{} | ||
wb.x = sml.NewWorkbook() | ||
|
||
wb.AppProperties = common.NewAppProperties() | ||
wb.CoreProperties = common.NewCoreProperties() | ||
wb.StyleSheet = NewStyleSheet() | ||
|
||
wb.Rels = common.NewRelationships() | ||
wb.wbRels = common.NewRelationships() | ||
wb.Rels.AddRelationship(zippkg.AppPropsFilename, common.ExtendedPropertiesType) | ||
wb.Rels.AddRelationship(zippkg.CorePropsFilename, common.CorePropertiesType) | ||
wb.Rels.AddRelationship("xl/workbook.xml", common.OfficeDocumentType) | ||
wb.wbRels.AddRelationship("styles.xml", common.StylesType) | ||
|
||
wb.ContentTypes = common.NewContentTypes() | ||
wb.ContentTypes.AddOverride("/xl/workbook.xml", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml") | ||
wb.ContentTypes.AddOverride("/xl/styles.xml", "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml") | ||
|
||
wb.SharedStrings = NewSharedStrings() | ||
wb.ContentTypes.AddOverride("/xl/sharedStrings.xml", common.SharedStringsContentType) | ||
wb.wbRels.AddRelationship("sharedStrings.xml", common.SharedStingsType) | ||
|
||
return wb | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
// Copyright 2017 Baliance. All rights reserved. | ||
// | ||
// Use of this source code is governed by the terms of the Affero GNU General | ||
// Public License version 3.0 as published by the Free Software Foundation and | ||
// appearing in the file LICENSE included in the packaging of this file. A | ||
// commercial license can be purchased by contacting [email protected]. | ||
|
||
package spreadsheet | ||
|
||
import ( | ||
"archive/zip" | ||
"fmt" | ||
"io" | ||
"io/ioutil" | ||
"os" | ||
|
||
"baliance.com/gooxml/zippkg" | ||
) | ||
|
||
// Read reads a workbook from an io.Reader(.xlsx). | ||
func Read(r io.ReaderAt, size int64) (*Workbook, error) { | ||
wb := New() | ||
td, err := ioutil.TempDir("", "gooxml-xlsx") | ||
if err != nil { | ||
return nil, err | ||
} | ||
wb.TmpPath = td | ||
|
||
zr, err := zip.NewReader(r, size) | ||
if err != nil { | ||
return nil, fmt.Errorf("parsing zip: %s", err) | ||
} | ||
|
||
files := []*zip.File{} | ||
files = append(files, zr.File...) | ||
decMap := zippkg.DecodeMap{} | ||
decMap.SetOnNewRelationshipFunc(wb.onNewRelationship) | ||
// we should discover all contents by starting with these two files | ||
decMap.AddTarget(zippkg.ContentTypesFilename, wb.ContentTypes.X()) | ||
decMap.AddTarget(zippkg.BaseRelsFilename, wb.Rels.X()) | ||
decMap.Decode(files) | ||
|
||
// etra files are things we don't handle yet, or files that happened to have | ||
// been in the zip before. We just round-trip them. | ||
for _, f := range files { | ||
if f == nil { | ||
continue | ||
} | ||
if err := wb.AddExtraFileFromZip(f); err != nil { | ||
return nil, err | ||
} | ||
} | ||
return wb, nil | ||
} | ||
|
||
// Open opens and reads a workbook from a file (.xlsx). | ||
func Open(filename string) (*Workbook, error) { | ||
f, err := os.Open(filename) | ||
if err != nil { | ||
return nil, fmt.Errorf("error opening %s: %s", filename, err) | ||
} | ||
defer f.Close() | ||
fi, err := os.Stat(filename) | ||
if err != nil { | ||
return nil, fmt.Errorf("error opening %s: %s", filename, err) | ||
} | ||
return Read(f, fi.Size()) | ||
} |
Oops, something went wrong.