Merge pull request #10 from qmuntal/content-type

Hard-code xml and rels content type as defaults

Author: qmuntal

.travis.yml

@@ -4,9 +4,14 @@ language: go
 go_import_path: github.com/qmuntal/opc
 
 go:
-  - 1.12.x
   - 1.13.x
   - 1.14.x
+  - 1.15.x
+
+os:
+  - linux
+  - windows
+  - osx
 
 env:
   - GO111MODULE=on

writer.go

@@ -38,7 +38,16 @@ type Writer struct {
 
 // NewWriter returns a new Writer writing an OPC file to w.
 func NewWriter(w io.Writer) *Writer {
-	return &Writer{p: newPackage(), w: zip.NewWriter(w), rnd: rand.New(rand.NewSource(42))}
+	return &Writer{p: &pkg{
+		parts: make(map[string]*Part, 0),
+		contentTypes: contentTypes{
+			defaults: map[string]string{
+				"xml":  "application/xml",
+				"rels": relationshipContentType,
+			},
+			overrides: map[string]string{},
+		},
+	}, w: zip.NewWriter(w), rnd: rand.New(rand.NewSource(42))}
 }
 
 // Flush flushes any buffered data to the underlying writer.
@@ -78,8 +87,7 @@ func (w *Writer) Close() error {
 // This returns a Writer to which the file contents should be written.
 // The file's contents must be written to the io.Writer before the next call to Create, CreatePart, or Close.
 func (w *Writer) Create(name, contentType string) (io.Writer, error) {
-	part := &Part{Name: name, ContentType: contentType}
-	return w.add(part, CompressionNormal)
+	return w.CreatePart(&Part{Name: name, ContentType: contentType}, CompressionNone)
 }
 
 // CreatePart adds a file to the OPC archive using the provided part.
@@ -113,7 +121,7 @@ func (w *Writer) createCoreProperties() error {
 
 func (w *Writer) createContentTypes() error {
 	// ISO/IEC 29500-2 M3.10
-	cw, err := w.addToPackage(&Part{Name: contentTypesName, ContentType: "text/xml"}, CompressionNormal)
+	cw, err := w.addToPackage(&Part{Name: contentTypesName, ContentType: "application/xml"}, CompressionNormal)
 	if err != nil {
 		return err
 	}

writer_test.go

@@ -118,8 +118,8 @@ func TestWriter_Create(t *testing.T) {
 		args    args
 		wantErr bool
 	}{
+		{"base", NewWriter(&bytes.Buffer{}), args{"/a.xml", "application/xml"}, false},
 		{"nameErr", NewWriter(&bytes.Buffer{}), args{"a.xml", "a/b"}, true},
-		{"base", NewWriter(&bytes.Buffer{}), args{"/a.xml", "a/b"}, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {