Finish writer

Author: lobre

.gitignore

@@ -8,6 +8,9 @@ rmapi
 # Test binary, build with `go test -c`
 *.test
 
+# Test artifacts
+test_writer.zip
+
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 

archive/reader_test.go

@@ -3,7 +3,7 @@ package archive
 import "testing"
 
 func TestOpenReader(t *testing.T) {
-	r, err := OpenReader("test.zip")
+	r, err := OpenReader("test_reader.zip")
 	if err != nil {
 		t.Error(err)
 	}

archive/test.zip archive/test_reader.zip

@@ -23,6 +23,11 @@ func NewWriter(w io.Writer, uuid string) *Writer {
 	return &Writer{archive, uuid}
 }
 
+// Close finishes writing the zip file.
+func (w *Writer) Close() error {
+	return w.zipw.Close()
+}
+
 // CreateContent is for writing a content file.
 func (w *Writer) CreateContent() (io.Writer, error) {
 	fn := fmt.Sprintf("%s.content", w.uuid)
@@ -47,26 +52,20 @@ func (w *Writer) CreateEpub() (io.Writer, error) {
 	return w.create(fn)
 }
 
-// CreatePage is for writing a page.
+// CreatePage is for writing a page data.
 // The argument idx serves for file names.
-// The functions returns two io.Writer.
-//  - The first one is for the data
-//  - The second is for metadata
-func (w *Writer) CreatePage(idx int) (io.Writer, io.Writer, error) {
-	data := fmt.Sprintf("%d.rm", idx)
-	metadata := fmt.Sprintf("%d-metadata.json", idx)
-
-	dataWriter, err := w.create(filepath.Join(w.uuid, "", data))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	metadataWriter, err := w.create(filepath.Join(w.uuid, "", metadata))
-	if err != nil {
-		return nil, nil, err
-	}
+func (w *Writer) CreatePage(idx int) (io.Writer, error) {
+	name := fmt.Sprintf("%d.rm", idx)
+	fn := filepath.Join(w.uuid, name)
+	return w.create(fn)
+}
 
-	return dataWriter, metadataWriter, nil
+// CreatePageMetadata is for writing a page metadata.
+// The argument idx serves for file names.
+func (w *Writer) CreatePageMetadata(idx int) (io.Writer, error) {
+	name := fmt.Sprintf("%d-metadata.json", idx)
+	fn := filepath.Join(w.uuid, name)
+	return w.create(fn)
 }
 
 // CreateThumbnail is for writing a thumbnail file.

archive/writer.go

@@ -0,0 +1,69 @@
+package archive
+
+import (
+	"io"
+	"os"
+	"strings"
+	"testing"
+)
+
+func TestWriter(t *testing.T) {
+	zipFile, err := os.Create("test_writer.zip")
+	if err != nil {
+		t.Error(err)
+	}
+	defer zipFile.Close()
+
+	archive := NewWriter(zipFile, "384327f5-133e-49c8-82ff-30aa19f3cfa4")
+	defer archive.Close()
+
+	// Content
+	contentWriter, err := archive.CreateContent()
+	if err != nil {
+		t.Error(err)
+	}
+	_, err = io.Copy(contentWriter, strings.NewReader("content"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Pagedata
+	pageDataWriter, err := archive.CreatePagedata()
+	if err != nil {
+		t.Error(err)
+	}
+	_, err = io.Copy(pageDataWriter, strings.NewReader("pagedata"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Thumbnail
+	thumbnailWriter, err := archive.CreateThumbnail(0)
+	if err != nil {
+		t.Error(err)
+	}
+	_, err = io.Copy(thumbnailWriter, strings.NewReader("thumbnail"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Page
+	pageWriter, err := archive.CreatePage(0)
+	if err != nil {
+		t.Error(err)
+	}
+	_, err = io.Copy(pageWriter, strings.NewReader("page data"))
+	if err != nil {
+		t.Error(err)
+	}
+
+	// Page metadata
+	pageMetadataWriter, err := archive.CreatePageMetadata(0)
+	if err != nil {
+		t.Error(err)
+	}
+	_, err = io.Copy(pageMetadataWriter, strings.NewReader("page metadata"))
+	if err != nil {
+		t.Error(err)
+	}
+}