celogeek/go-comic-converter
1
0
Fork 0
mirror of https://github.com/celogeek/go-comic-converter.git synced 2025-05-25 08:12:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

specify type for write file

Browse Source
This commit is contained in:
Celogeek 2023-04-25 22:10:35 +02:00
parent 8a1eeb400d
commit d0d9af7f9b
Signed by: celogeek
SSH Key Fingerprint: SHA256:njNJLzoLQdbV9PC6ehcruRb0QnEgxABoCYZ+0+aUIYc
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/epub/epub.go
View File

@ -77,12 +77,12 @@ func (e *ePub) render(templateString string, data any) string {
func (e *ePub) writeImage(wz *epubzip.EpubZip, img *epubimage.Image) error { func (e *ePub) writeImage(wz *epubzip.EpubZip, img *epubimage.Image) error {
err := wz.WriteFile( err := wz.WriteFile(
fmt.Sprintf("OEBPS/%s", img.TextPath()), fmt.Sprintf("OEBPS/%s", img.TextPath()),
e.render(epubtemplates.Text, map[string]any{ []byte(e.render(epubtemplates.Text, map[string]any{
"Title": fmt.Sprintf("Image %d Part %d", img.Id, img.Part), "Title": fmt.Sprintf("Image %d Part %d", img.Id, img.Part),
"ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.ViewWidth, e.Image.ViewHeight), "ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.ViewWidth, e.Image.ViewHeight),
"ImagePath": img.ImgPath(), "ImagePath": img.ImgPath(),
"ImageStyle": img.ImgStyle(e.Image.ViewWidth, e.Image.ViewHeight, e.Image.Manga), "ImageStyle": img.ImgStyle(e.Image.ViewWidth, e.Image.ViewHeight, e.Image.Manga),
}), })),
) )
if err == nil { if err == nil {
@ -95,10 +95,10 @@ func (e *ePub) writeImage(wz *epubzip.EpubZip, img *epubimage.Image) error {
func (e *ePub) writeBlank(wz *epubzip.EpubZip, img *epubimage.Image) error { func (e *ePub) writeBlank(wz *epubzip.EpubZip, img *epubimage.Image) error {
return wz.WriteFile( return wz.WriteFile(
fmt.Sprintf("OEBPS/Text/%d_sp.xhtml", img.Id), fmt.Sprintf("OEBPS/Text/%d_sp.xhtml", img.Id),
e.render(epubtemplates.Blank, map[string]any{ []byte(e.render(epubtemplates.Blank, map[string]any{
"Title": fmt.Sprintf("Blank Page %d", img.Id), "Title": fmt.Sprintf("Blank Page %d", img.Id),
"ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.ViewWidth, e.Image.ViewHeight), "ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.ViewWidth, e.Image.ViewHeight),
}), })),
) )
} }
@ -200,7 +200,7 @@ func (e *ePub) getTree(images []*epubimage.Image, skip_files bool) string {
func (e *ePub) Write() error { func (e *ePub) Write() error {
type zipContent struct { type zipContent struct {
Name string Name string
Content any Content string
} }
epubParts, err := e.getParts() epubParts, err := e.getParts()
@ -280,8 +280,8 @@ func (e *ePub) Write() error {
if err = wz.WriteMagic(); err != nil { if err = wz.WriteMagic(); err != nil {
return err return err
} }
for _, content := range content { for _, c := range content {
if err := wz.WriteFile(content.Name, content.Content); err != nil { if err := wz.WriteFile(c.Name, []byte(c.Content)); err != nil {
return err return err
} }
} }

13
internal/epub/zip/epub_zip.go
View File

@ -2,7 +2,6 @@ package epubzip
import ( import (
"archive/zip" "archive/zip"
"fmt"
"os" "os"
"time" "time"
@ -61,17 +60,7 @@ func (e *EpubZip) WriteImage(image *epubimagedata.ImageData) error {
return err return err
} }
func (e *EpubZip) WriteFile(file string, data any) error { func (e *EpubZip) WriteFile(file string, content []byte) error {
var content []byte
switch b := data.(type) {
case string:
content = []byte(b)
case []byte:
content = b
default:
return fmt.Errorf("support string of []byte")
}
m, err := e.wz.CreateHeader(&zip.FileHeader{ m, err := e.wz.CreateHeader(&zip.FileHeader{
Name: file, Name: file,
Modified: time.Now(), Modified: time.Now(),