From 0ee44ed40b3e9458168f7290a3e1772846c2c642 Mon Sep 17 00:00:00 2001
From: celogeek <65178+celogeek@users.noreply.github.com>
Date: Tue, 27 Dec 2022 15:27:19 +0100
Subject: [PATCH] write buffer

---
 internal/epub/core.go            | 17 +++++++++++------
 internal/image-converter/core.go |  7 ++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/internal/epub/core.go b/internal/epub/core.go
index d666284..5d6ab87 100644
--- a/internal/epub/core.go
+++ b/internal/epub/core.go
@@ -3,6 +3,7 @@ package epub
 import (
 	"archive/zip"
 	"fmt"
+	"io"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -22,7 +23,7 @@ import (
 
 type ImageDetails struct {
 	*Images
-	Data   string
+	Data   io.Reader
 	Width  int
 	Height int
 }
@@ -98,7 +99,11 @@ func (e *EPub) SetCrop(c bool) *EPub {
 	return e
 }
 
-func (e *EPub) WriteFile(wz *zip.Writer, file, content string) error {
+func (e *EPub) WriteString(wz *zip.Writer, file string, content string) error {
+	return e.WriteBuffer(wz, file, strings.NewReader(content))
+}
+
+func (e *EPub) WriteBuffer(wz *zip.Writer, file string, content io.Reader) error {
 	m, err := wz.CreateHeader(&zip.FileHeader{
 		Name:     file,
 		Modified: time.Now(),
@@ -106,7 +111,7 @@ func (e *EPub) WriteFile(wz *zip.Writer, file, content string) error {
 	if err != nil {
 		return err
 	}
-	_, err = m.Write([]byte(content))
+	_, err = io.Copy(m, content)
 	return err
 }
 
@@ -220,7 +225,7 @@ func (e *EPub) Write() error {
 	wz := zip.NewWriter(w)
 	defer wz.Close()
 	for _, content := range zipContent {
-		if err := e.WriteFile(wz, content[0], content[1]); err != nil {
+		if err := e.WriteString(wz, content[0], content[1]); err != nil {
 			return err
 		}
 	}
@@ -230,10 +235,10 @@ func (e *EPub) Write() error {
 	for img := range e.ProcessingImages() {
 		text := fmt.Sprintf("OEBPS/Text/%s.xhtml", img.Title)
 		image := fmt.Sprintf("OEBPS/Images/%s.jpg", img.Title)
-		if err := e.WriteFile(wz, text, e.Render(TEMPLATE_TEXT, img)); err != nil {
+		if err := e.WriteString(wz, text, e.Render(TEMPLATE_TEXT, img)); err != nil {
 			return err
 		}
-		if err := e.WriteFile(wz, image, img.Data); err != nil {
+		if err := e.WriteBuffer(wz, image, img.Data); err != nil {
 			return err
 		}
 		bar.Add(1)
diff --git a/internal/image-converter/core.go b/internal/image-converter/core.go
index 0411b29..c2dd526 100644
--- a/internal/image-converter/core.go
+++ b/internal/image-converter/core.go
@@ -5,6 +5,7 @@ import (
 	"image"
 	"image/color"
 	"image/jpeg"
+	"io"
 	"os"
 
 	"golang.org/x/image/draw"
@@ -116,13 +117,13 @@ func Resize(img *image.Gray, w, h int) *image.Gray {
 	return newImg
 }
 
-func Get(img *image.Gray, quality int) string {
+func Get(img *image.Gray, quality int) io.Reader {
 	b := bytes.NewBuffer([]byte{})
 	err := jpeg.Encode(b, img, &jpeg.Options{Quality: quality})
 	if err != nil {
 		panic(err)
 	}
-	return string(b.Bytes())
+	return b
 }
 
 func Save(img *image.Gray, output string, quality int) {
@@ -142,7 +143,7 @@ func Save(img *image.Gray, output string, quality int) {
 	}
 }
 
-func Convert(path string, crop bool, w, h int, quality int) (string, int, int) {
+func Convert(path string, crop bool, w, h int, quality int) (io.Reader, int, int) {
 	img := Load(path)
 	if crop {
 		img = CropMarging(img)