update main script

internal/epub/epub.go

@@ -0,0 +1,482 @@
+/*
+Tools to create EPUB from images.
+*/
+package epub
+
+import (
+	"archive/zip"
+	"fmt"
+	"math"
+	"os"
+	"path/filepath"
+	"regexp"
+	"sort"
+	"strings"
+	"text/template"
+	"time"
+
+	"github.com/celogeek/go-comic-converter/v2/internal/epubimage"
+	"github.com/celogeek/go-comic-converter/v2/internal/epubimageprocessor"
+	"github.com/celogeek/go-comic-converter/v2/internal/epubprogress"
+	"github.com/celogeek/go-comic-converter/v2/internal/epubtemplates"
+	"github.com/celogeek/go-comic-converter/v2/internal/epubtree"
+	"github.com/celogeek/go-comic-converter/v2/internal/epubzip"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
+	"github.com/gofrs/uuid"
+)
+
+type ePub struct {
+	options *epuboptions.EPUBOptions
+
+	uid       string
+	publisher string
+	updatedAt string
+
+	templateProcessor *template.Template
+	imageProcessor    *epubimageprocessor.EPUBImageProcessor
+}
+
+type epubPart struct {
+	Cover  *epubimage.EPUBImage
+	Images []*epubimage.EPUBImage
+	Reader *zip.ReadCloser
+}
+
+// initialize EPUB
+func New(options *epuboptions.EPUBOptions) *ePub {
+	uid := uuid.Must(uuid.NewV4())
+	tmpl := template.New("parser")
+	tmpl.Funcs(template.FuncMap{
+		"mod":  func(i, j int) bool { return i%j == 0 },
+		"zoom": func(s int, z float32) int { return int(float32(s) * z) },
+	})
+
+	return &ePub{
+		options:           options,
+		uid:               uid.String(),
+		publisher:         "GO Comic Converter",
+		updatedAt:         time.Now().UTC().Format("2006-01-02T15:04:05Z"),
+		templateProcessor: tmpl,
+		imageProcessor:    epubimageprocessor.New(options),
+	}
+}
+
+// render templates
+func (e *ePub) render(templateString string, data map[string]any) string {
+	var result strings.Builder
+	tmpl := template.Must(e.templateProcessor.Parse(templateString))
+	if err := tmpl.Execute(&result, data); err != nil {
+		panic(err)
+	}
+	return regexp.MustCompile("\n+").ReplaceAllString(result.String(), "\n")
+}
+
+// write image to the zip
+func (e *ePub) writeImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, zipImg *zip.File) error {
+	err := wz.WriteContent(
+		img.EPUBPagePath(),
+		[]byte(e.render(epubtemplates.Text, map[string]any{
+			"Title":      fmt.Sprintf("Image %d Part %d", img.Id, img.Part),
+			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
+			"ImagePath":  img.ImgPath(),
+			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, ""),
+		})),
+	)
+	if err == nil {
+		err = wz.Copy(zipImg)
+	}
+
+	return err
+}
+
+// write blank page
+func (e *ePub) writeBlank(wz *epubzip.EPUBZip, img *epubimage.EPUBImage) error {
+	return wz.WriteContent(
+		img.EPUBSpacePath(),
+		[]byte(e.render(epubtemplates.Blank, map[string]any{
+			"Title":    fmt.Sprintf("Blank Page %d", img.Id),
+			"ViewPort": fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
+		})),
+	)
+}
+
+// write title image
+func (e *ePub) writeCoverImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, part, totalParts int) error {
+	title := "Cover"
+	text := ""
+	if totalParts > 1 {
+		text = fmt.Sprintf("%d / %d", part, totalParts)
+		title = fmt.Sprintf("%s %s", title, text)
+	}
+
+	if err := wz.WriteContent(
+		"OEBPS/Text/cover.xhtml",
+		[]byte(e.render(epubtemplates.Text, map[string]any{
+			"Title":      title,
+			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
+			"ImagePath":  fmt.Sprintf("Images/cover.%s", e.options.Image.Format),
+			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, ""),
+		})),
+	); err != nil {
+		return err
+	}
+
+	coverTitle, err := e.imageProcessor.CoverTitleData(&epubimageprocessor.CoverTitleDataOptions{
+		Src:         img.Raw,
+		Name:        "cover",
+		Text:        text,
+		Align:       "bottom",
+		PctWidth:    50,
+		PctMargin:   50,
+		MaxFontSize: 96,
+		BorderSize:  8,
+	})
+
+	if err != nil {
+		return err
+	}
+
+	if err := wz.WriteRaw(coverTitle); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// write title image
+func (e *ePub) writeTitleImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, title string) error {
+	titleAlign := ""
+	if !e.options.Image.View.PortraitOnly {
+		if e.options.Image.Manga {
+			titleAlign = "right:0"
+		} else {
+			titleAlign = "left:0"
+		}
+	}
+
+	if !e.options.Image.View.PortraitOnly {
+		if err := wz.WriteContent(
+			"OEBPS/Text/space_title.xhtml",
+			[]byte(e.render(epubtemplates.Blank, map[string]any{
+				"Title":    "Blank Page Title",
+				"ViewPort": fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
+			})),
+		); err != nil {
+			return err
+		}
+	}
+
+	if err := wz.WriteContent(
+		"OEBPS/Text/title.xhtml",
+		[]byte(e.render(epubtemplates.Text, map[string]any{
+			"Title":      title,
+			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
+			"ImagePath":  fmt.Sprintf("Images/title.%s", e.options.Image.Format),
+			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, titleAlign),
+		})),
+	); err != nil {
+		return err
+	}
+
+	coverTitle, err := e.imageProcessor.CoverTitleData(&epubimageprocessor.CoverTitleDataOptions{
+		Src:         img.Raw,
+		Name:        "title",
+		Text:        title,
+		Align:       "center",
+		PctWidth:    100,
+		PctMargin:   100,
+		MaxFontSize: 64,
+		BorderSize:  4,
+	})
+	if err != nil {
+		return err
+	}
+
+	if err := wz.WriteRaw(coverTitle); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// extract image and split it into part
+func (e *ePub) getParts() (parts []*epubPart, imgStorage *epubzip.EPUBZipImageReader, err error) {
+	images, err := e.imageProcessor.Load()
+
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// sort result by id and part
+	sort.Slice(images, func(i, j int) bool {
+		if images[i].Id == images[j].Id {
+			return images[i].Part < images[j].Part
+		}
+		return images[i].Id < images[j].Id
+	})
+
+	parts = make([]*epubPart, 0)
+	cover := images[0]
+	if e.options.Image.HasCover {
+		images = images[1:]
+	}
+
+	if e.options.Dry {
+		parts = append(parts, &epubPart{
+			Cover:  cover,
+			Images: images,
+		})
+		return parts, nil, nil
+	}
+
+	imgStorage, err = epubzip.NewImageReader(e.options.Temp())
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// compute size of the EPUB part and try to be as close as possible of the target
+	maxSize := uint64(e.options.LimitMb * 1024 * 1024)
+	xhtmlSize := uint64(1024)
+	// descriptor files + title + cover
+	baseSize := uint64(128*1024) + imgStorage.Size(cover.EPUBImgPath())*2
+
+	currentSize := baseSize
+	currentImages := make([]*epubimage.EPUBImage, 0)
+	part := 1
+
+	for _, img := range images {
+		imgSize := imgStorage.Size(img.EPUBImgPath()) + xhtmlSize
+		if maxSize > 0 && len(currentImages) > 0 && currentSize+imgSize > maxSize {
+			parts = append(parts, &epubPart{
+				Cover:  cover,
+				Images: currentImages,
+			})
+			part += 1
+			currentSize = baseSize
+			currentImages = make([]*epubimage.EPUBImage, 0)
+		}
+		currentSize += imgSize
+		currentImages = append(currentImages, img)
+	}
+	if len(currentImages) > 0 {
+		parts = append(parts, &epubPart{
+			Cover:  cover,
+			Images: currentImages,
+		})
+	}
+
+	return parts, imgStorage, nil
+}
+
+// create a tree from the directories.
+//
+// this is used to simulate the toc.
+func (e *ePub) getTree(images []*epubimage.EPUBImage, skip_files bool) string {
+	t := epubtree.New()
+	for _, img := range images {
+		if skip_files {
+			t.Add(img.Path)
+		} else {
+			t.Add(filepath.Join(img.Path, img.Name))
+		}
+	}
+	c := t.Root()
+	if skip_files && e.options.StripFirstDirectoryFromToc && len(c.Children) == 1 {
+		c = c.Children[0]
+	}
+
+	return c.WriteString("")
+}
+
+func (e *ePub) computeAspectRatio(epubParts []*epubPart) float64 {
+	var (
+		bestAspectRatio      float64
+		bestAspectRatioCount int
+		aspectRatio          = map[float64]int{}
+	)
+
+	trunc := func(v float64) float64 {
+		return float64(math.Round(v*10000)) / 10000
+	}
+
+	for _, p := range epubParts {
+		aspectRatio[trunc(p.Cover.OriginalAspectRatio)]++
+		for _, i := range p.Images {
+			aspectRatio[trunc(i.OriginalAspectRatio)]++
+		}
+	}
+
+	for k, v := range aspectRatio {
+		if v > bestAspectRatioCount {
+			bestAspectRatio, bestAspectRatioCount = k, v
+		}
+	}
+
+	return bestAspectRatio
+}
+
+func (e *ePub) computeViewPort(epubParts []*epubPart) {
+	if e.options.Image.View.AspectRatio == -1 {
+		return //keep device size
+	}
+
+	// readjusting view port
+	bestAspectRatio := e.options.Image.View.AspectRatio
+	if bestAspectRatio == 0 {
+		bestAspectRatio = e.computeAspectRatio(epubParts)
+	}
+
+	viewWidth, viewHeight := int(float64(e.options.Image.View.Height)/bestAspectRatio), int(float64(e.options.Image.View.Width)*bestAspectRatio)
+	if viewWidth > e.options.Image.View.Width {
+		e.options.Image.View.Height = viewHeight
+	} else {
+		e.options.Image.View.Width = viewWidth
+	}
+}
+
+// create the zip
+func (e *ePub) Write() error {
+	type zipContent struct {
+		Name    string
+		Content string
+	}
+
+	epubParts, imgStorage, err := e.getParts()
+	if err != nil {
+		return err
+	}
+
+	if e.options.Dry {
+		p := epubParts[0]
+		fmt.Fprintf(os.Stderr, "TOC:\n  - %s\n%s\n", e.options.Title, e.getTree(p.Images, true))
+		if e.options.DryVerbose {
+			if e.options.Image.HasCover {
+				fmt.Fprintf(os.Stderr, "Cover:\n%s\n", e.getTree([]*epubimage.EPUBImage{p.Cover}, false))
+			}
+			fmt.Fprintf(os.Stderr, "Files:\n%s\n", e.getTree(p.Images, false))
+		}
+		return nil
+	}
+	defer func() {
+		imgStorage.Close()
+		imgStorage.Remove()
+	}()
+
+	totalParts := len(epubParts)
+
+	bar := epubprogress.New(epubprogress.Options{
+		Max:         totalParts,
+		Description: "Writing Part",
+		CurrentJob:  2,
+		TotalJob:    2,
+		Quiet:       e.options.Quiet,
+		Json:        e.options.Json,
+	})
+
+	e.computeViewPort(epubParts)
+	hasTitlePage := e.options.TitlePage == 1 || (e.options.TitlePage == 2 && totalParts > 1)
+	for i, part := range epubParts {
+		ext := filepath.Ext(e.options.Output)
+		suffix := ""
+		if totalParts > 1 {
+			fmtLen := len(fmt.Sprint(totalParts))
+			fmtPart := fmt.Sprintf(" Part %%0%dd of %%0%dd", fmtLen, fmtLen)
+			suffix = fmt.Sprintf(fmtPart, i+1, totalParts)
+		}
+
+		path := fmt.Sprintf("%s%s%s", e.options.Output[0:len(e.options.Output)-len(ext)], suffix, ext)
+		wz, err := epubzip.New(path)
+		if err != nil {
+			return err
+		}
+		defer wz.Close()
+
+		title := e.options.Title
+		if totalParts > 1 {
+			title = fmt.Sprintf("%s [%d/%d]", title, i+1, totalParts)
+		}
+
+		content := []zipContent{
+			{"META-INF/container.xml", epubtemplates.Container},
+			{"META-INF/com.apple.ibooks.display-options.xml", epubtemplates.AppleBooks},
+			{"OEBPS/content.opf", epubtemplates.Content(&epubtemplates.ContentOptions{
+				Title:        title,
+				HasTitlePage: hasTitlePage,
+				UID:          e.uid,
+				Author:       e.options.Author,
+				Publisher:    e.publisher,
+				UpdatedAt:    e.updatedAt,
+				ImageOptions: e.options.Image,
+				Cover:        part.Cover,
+				Images:       part.Images,
+				Current:      i + 1,
+				Total:        totalParts,
+			})},
+			{"OEBPS/toc.xhtml", epubtemplates.Toc(title, hasTitlePage, e.options.StripFirstDirectoryFromToc, part.Images)},
+			{"OEBPS/Text/style.css", e.render(epubtemplates.Style, map[string]any{
+				"View": e.options.Image.View,
+			})},
+		}
+
+		if err = wz.WriteMagic(); err != nil {
+			return err
+		}
+		for _, c := range content {
+			if err := wz.WriteContent(c.Name, []byte(c.Content)); err != nil {
+				return err
+			}
+		}
+
+		if err = e.writeCoverImage(wz, part.Cover, i+1, totalParts); err != nil {
+			return err
+		}
+
+		if hasTitlePage {
+			if err = e.writeTitleImage(wz, part.Cover, title); err != nil {
+				return err
+			}
+		}
+
+		lastImage := part.Images[len(part.Images)-1]
+		for _, img := range part.Images {
+			if err := e.writeImage(wz, img, imgStorage.Get(img.EPUBImgPath())); err != nil {
+				return err
+			}
+
+			// Double Page or Last Image that is not a double page
+			if !e.options.Image.View.PortraitOnly &&
+				(img.DoublePage ||
+					(!e.options.Image.KeepDoublePageIfSplitted && img.Part == 1) ||
+					(img.Part == 0 && img == lastImage)) {
+				if err := e.writeBlank(wz, img); err != nil {
+					return err
+				}
+			}
+		}
+		bar.Add(1)
+	}
+	bar.Close()
+	if !e.options.Json {
+		fmt.Fprintln(os.Stderr)
+	}
+
+	// display corrupted images
+	hasError := false
+	for pId, part := range epubParts {
+		if pId == 0 && e.options.Image.HasCover && part.Cover.Error != nil {
+			hasError = true
+			fmt.Fprintf(os.Stderr, "Error on image %s: %v\n", filepath.Join(part.Cover.Path, part.Cover.Name), part.Cover.Error)
+		}
+		for _, img := range part.Images {
+			if img.Part == 0 && img.Error != nil {
+				hasError = true
+				fmt.Fprintf(os.Stderr, "Error on image %s: %v\n", filepath.Join(img.Path, img.Name), img.Error)
+			}
+		}
+	}
+	if hasError {
+		fmt.Fprintln(os.Stderr)
+	}
+
+	return nil
+}

internal/epubimageprocessor/epubimageprocessor.go

@@ -61,7 +61,7 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.EPUBImage, err error) {
 	})
 	wg := &sync.WaitGroup{}
 
-	imgStorage, err := epubzip.NewImageWriter(e.options.ImgStorage(), e.options.Image.Format)
+	imgStorage, err := epubzip.NewImageWriter(e.options.Temp(), e.options.Image.Format)
 	if err != nil {
 		bar.Close()
 		return nil, err

main.go

@@ -106,8 +106,7 @@ $ go install github.com/celogeek/go-comic-converter/v%d@%s
 	}
 
 	profile := cmd.Options.GetProfile()
-
+	options := &epuboptions.EPUBOptions{
-	if err := epub.New(&epuboptions.EPUBOptions{
 		Input:                      cmd.Options.Input,
 		Output:                     cmd.Options.Output,
 		LimitMb:                    cmd.Options.LimitMb,
@@ -122,7 +121,13 @@ $ go install github.com/celogeek/go-comic-converter/v%d@%s
 		Quiet:                      cmd.Options.Quiet,
 		Json:                       cmd.Options.Json,
 		Image: &epuboptions.Image{
-			Crop:                     &epuboptions.Crop{Enabled: cmd.Options.Crop, Left: cmd.Options.CropRatioLeft, Up: cmd.Options.CropRatioUp, Right: cmd.Options.CropRatioRight, Bottom: cmd.Options.CropRatioBottom},
+			Crop: &epuboptions.Crop{
+				Enabled: cmd.Options.Crop,
+				Left:    cmd.Options.CropRatioLeft,
+				Up:      cmd.Options.CropRatioUp,
+				Right:   cmd.Options.CropRatioRight,
+				Bottom:  cmd.Options.CropRatioBottom,
+			},
 			Quality:                  cmd.Options.Quality,
 			Brightness:               cmd.Options.Brightness,
 			Contrast:                 cmd.Options.Contrast,
@@ -133,14 +138,25 @@ $ go install github.com/celogeek/go-comic-converter/v%d@%s
 			NoBlankImage:             cmd.Options.NoBlankImage,
 			Manga:                    cmd.Options.Manga,
 			HasCover:                 cmd.Options.HasCover,
-			View:                     &epuboptions.View{Width: profile.Width, Height: profile.Height, AspectRatio: cmd.Options.AspectRatio, PortraitOnly: cmd.Options.PortraitOnly, Color: epuboptions.Color{Foreground: cmd.Options.ForegroundColor, Background: cmd.Options.BackgroundColor}},
+			View: &epuboptions.View{
-			GrayScale:                cmd.Options.Grayscale,
+				Width:        profile.Width,
-			GrayScaleMode:            cmd.Options.GrayscaleMode,
+				Height:       profile.Height,
-			Resize:                   !cmd.Options.NoResize,
+				AspectRatio:  cmd.Options.AspectRatio,
-			Format:                   cmd.Options.Format,
+				PortraitOnly: cmd.Options.PortraitOnly,
-			AppleBookCompatibility:   cmd.Options.AppleBookCompatibility,
+				Color: epuboptions.Color{
+					Foreground: cmd.Options.ForegroundColor,
+					Background: cmd.Options.BackgroundColor,
+				},
+			},
+			GrayScale:              cmd.Options.Grayscale,
+			GrayScaleMode:          cmd.Options.GrayscaleMode,
+			Resize:                 !cmd.Options.NoResize,
+			Format:                 cmd.Options.Format,
+			AppleBookCompatibility: cmd.Options.AppleBookCompatibility,
 		},
-	}).Write(); err != nil {
+	}
+
+	if err := epub.Generate(options); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}

pkg/epub/epub.go

@@ -1,482 +1,10 @@
-/*
-Tools to create EPUB from images.
-*/
 package epub
 
 import (
-	"archive/zip"
+	"github.com/celogeek/go-comic-converter/v2/internal/epub"
-	"fmt"
-	"math"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/celogeek/go-comic-converter/v2/internal/epubimage"
-	"github.com/celogeek/go-comic-converter/v2/internal/epubimageprocessor"
-	"github.com/celogeek/go-comic-converter/v2/internal/epubprogress"
-	"github.com/celogeek/go-comic-converter/v2/internal/epubtemplates"
-	"github.com/celogeek/go-comic-converter/v2/internal/epubtree"
-	"github.com/celogeek/go-comic-converter/v2/internal/epubzip"
 	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
-	"github.com/gofrs/uuid"
 )
 
-type ePub struct {
+func Generate(options *epuboptions.EPUBOptions) error {
-	options *epuboptions.EPUBOptions
+	return epub.New(options).Write()
-
-	uid       string
-	publisher string
-	updatedAt string
-
-	templateProcessor *template.Template
-	imageProcessor    *epubimageprocessor.EPUBImageProcessor
-}
-
-type epubPart struct {
-	Cover  *epubimage.EPUBImage
-	Images []*epubimage.EPUBImage
-	Reader *zip.ReadCloser
-}
-
-// initialize EPUB
-func New(options *epuboptions.EPUBOptions) *ePub {
-	uid := uuid.Must(uuid.NewV4())
-	tmpl := template.New("parser")
-	tmpl.Funcs(template.FuncMap{
-		"mod":  func(i, j int) bool { return i%j == 0 },
-		"zoom": func(s int, z float32) int { return int(float32(s) * z) },
-	})
-
-	return &ePub{
-		options:           options,
-		uid:               uid.String(),
-		publisher:         "GO Comic Converter",
-		updatedAt:         time.Now().UTC().Format("2006-01-02T15:04:05Z"),
-		templateProcessor: tmpl,
-		imageProcessor:    epubimageprocessor.New(options),
-	}
-}
-
-// render templates
-func (e *ePub) render(templateString string, data map[string]any) string {
-	var result strings.Builder
-	tmpl := template.Must(e.templateProcessor.Parse(templateString))
-	if err := tmpl.Execute(&result, data); err != nil {
-		panic(err)
-	}
-	return regexp.MustCompile("\n+").ReplaceAllString(result.String(), "\n")
-}
-
-// write image to the zip
-func (e *ePub) writeImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, zipImg *zip.File) error {
-	err := wz.WriteContent(
-		img.EPUBPagePath(),
-		[]byte(e.render(epubtemplates.Text, map[string]any{
-			"Title":      fmt.Sprintf("Image %d Part %d", img.Id, img.Part),
-			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
-			"ImagePath":  img.ImgPath(),
-			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, ""),
-		})),
-	)
-	if err == nil {
-		err = wz.Copy(zipImg)
-	}
-
-	return err
-}
-
-// write blank page
-func (e *ePub) writeBlank(wz *epubzip.EPUBZip, img *epubimage.EPUBImage) error {
-	return wz.WriteContent(
-		img.EPUBSpacePath(),
-		[]byte(e.render(epubtemplates.Blank, map[string]any{
-			"Title":    fmt.Sprintf("Blank Page %d", img.Id),
-			"ViewPort": fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
-		})),
-	)
-}
-
-// write title image
-func (e *ePub) writeCoverImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, part, totalParts int) error {
-	title := "Cover"
-	text := ""
-	if totalParts > 1 {
-		text = fmt.Sprintf("%d / %d", part, totalParts)
-		title = fmt.Sprintf("%s %s", title, text)
-	}
-
-	if err := wz.WriteContent(
-		"OEBPS/Text/cover.xhtml",
-		[]byte(e.render(epubtemplates.Text, map[string]any{
-			"Title":      title,
-			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
-			"ImagePath":  fmt.Sprintf("Images/cover.%s", e.options.Image.Format),
-			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, ""),
-		})),
-	); err != nil {
-		return err
-	}
-
-	coverTitle, err := e.imageProcessor.CoverTitleData(&epubimageprocessor.CoverTitleDataOptions{
-		Src:         img.Raw,
-		Name:        "cover",
-		Text:        text,
-		Align:       "bottom",
-		PctWidth:    50,
-		PctMargin:   50,
-		MaxFontSize: 96,
-		BorderSize:  8,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	if err := wz.WriteRaw(coverTitle); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// write title image
-func (e *ePub) writeTitleImage(wz *epubzip.EPUBZip, img *epubimage.EPUBImage, title string) error {
-	titleAlign := ""
-	if !e.options.Image.View.PortraitOnly {
-		if e.options.Image.Manga {
-			titleAlign = "right:0"
-		} else {
-			titleAlign = "left:0"
-		}
-	}
-
-	if !e.options.Image.View.PortraitOnly {
-		if err := wz.WriteContent(
-			"OEBPS/Text/space_title.xhtml",
-			[]byte(e.render(epubtemplates.Blank, map[string]any{
-				"Title":    "Blank Page Title",
-				"ViewPort": fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
-			})),
-		); err != nil {
-			return err
-		}
-	}
-
-	if err := wz.WriteContent(
-		"OEBPS/Text/title.xhtml",
-		[]byte(e.render(epubtemplates.Text, map[string]any{
-			"Title":      title,
-			"ViewPort":   fmt.Sprintf("width=%d,height=%d", e.options.Image.View.Width, e.options.Image.View.Height),
-			"ImagePath":  fmt.Sprintf("Images/title.%s", e.options.Image.Format),
-			"ImageStyle": img.ImgStyle(e.options.Image.View.Width, e.options.Image.View.Height, titleAlign),
-		})),
-	); err != nil {
-		return err
-	}
-
-	coverTitle, err := e.imageProcessor.CoverTitleData(&epubimageprocessor.CoverTitleDataOptions{
-		Src:         img.Raw,
-		Name:        "title",
-		Text:        title,
-		Align:       "center",
-		PctWidth:    100,
-		PctMargin:   100,
-		MaxFontSize: 64,
-		BorderSize:  4,
-	})
-	if err != nil {
-		return err
-	}
-
-	if err := wz.WriteRaw(coverTitle); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// extract image and split it into part
-func (e *ePub) getParts() (parts []*epubPart, imgStorage *epubzip.EPUBZipImageReader, err error) {
-	images, err := e.imageProcessor.Load()
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// sort result by id and part
-	sort.Slice(images, func(i, j int) bool {
-		if images[i].Id == images[j].Id {
-			return images[i].Part < images[j].Part
-		}
-		return images[i].Id < images[j].Id
-	})
-
-	parts = make([]*epubPart, 0)
-	cover := images[0]
-	if e.options.Image.HasCover {
-		images = images[1:]
-	}
-
-	if e.options.Dry {
-		parts = append(parts, &epubPart{
-			Cover:  cover,
-			Images: images,
-		})
-		return parts, nil, nil
-	}
-
-	imgStorage, err = epubzip.NewImageReader(e.options.ImgStorage())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// compute size of the EPUB part and try to be as close as possible of the target
-	maxSize := uint64(e.options.LimitMb * 1024 * 1024)
-	xhtmlSize := uint64(1024)
-	// descriptor files + title + cover
-	baseSize := uint64(128*1024) + imgStorage.Size(cover.EPUBImgPath())*2
-
-	currentSize := baseSize
-	currentImages := make([]*epubimage.EPUBImage, 0)
-	part := 1
-
-	for _, img := range images {
-		imgSize := imgStorage.Size(img.EPUBImgPath()) + xhtmlSize
-		if maxSize > 0 && len(currentImages) > 0 && currentSize+imgSize > maxSize {
-			parts = append(parts, &epubPart{
-				Cover:  cover,
-				Images: currentImages,
-			})
-			part += 1
-			currentSize = baseSize
-			currentImages = make([]*epubimage.EPUBImage, 0)
-		}
-		currentSize += imgSize
-		currentImages = append(currentImages, img)
-	}
-	if len(currentImages) > 0 {
-		parts = append(parts, &epubPart{
-			Cover:  cover,
-			Images: currentImages,
-		})
-	}
-
-	return parts, imgStorage, nil
-}
-
-// create a tree from the directories.
-//
-// this is used to simulate the toc.
-func (e *ePub) getTree(images []*epubimage.EPUBImage, skip_files bool) string {
-	t := epubtree.New()
-	for _, img := range images {
-		if skip_files {
-			t.Add(img.Path)
-		} else {
-			t.Add(filepath.Join(img.Path, img.Name))
-		}
-	}
-	c := t.Root()
-	if skip_files && e.options.StripFirstDirectoryFromToc && len(c.Children) == 1 {
-		c = c.Children[0]
-	}
-
-	return c.WriteString("")
-}
-
-func (e *ePub) computeAspectRatio(epubParts []*epubPart) float64 {
-	var (
-		bestAspectRatio      float64
-		bestAspectRatioCount int
-		aspectRatio          = map[float64]int{}
-	)
-
-	trunc := func(v float64) float64 {
-		return float64(math.Round(v*10000)) / 10000
-	}
-
-	for _, p := range epubParts {
-		aspectRatio[trunc(p.Cover.OriginalAspectRatio)]++
-		for _, i := range p.Images {
-			aspectRatio[trunc(i.OriginalAspectRatio)]++
-		}
-	}
-
-	for k, v := range aspectRatio {
-		if v > bestAspectRatioCount {
-			bestAspectRatio, bestAspectRatioCount = k, v
-		}
-	}
-
-	return bestAspectRatio
-}
-
-func (e *ePub) computeViewPort(epubParts []*epubPart) {
-	if e.options.Image.View.AspectRatio == -1 {
-		return //keep device size
-	}
-
-	// readjusting view port
-	bestAspectRatio := e.options.Image.View.AspectRatio
-	if bestAspectRatio == 0 {
-		bestAspectRatio = e.computeAspectRatio(epubParts)
-	}
-
-	viewWidth, viewHeight := int(float64(e.options.Image.View.Height)/bestAspectRatio), int(float64(e.options.Image.View.Width)*bestAspectRatio)
-	if viewWidth > e.options.Image.View.Width {
-		e.options.Image.View.Height = viewHeight
-	} else {
-		e.options.Image.View.Width = viewWidth
-	}
-}
-
-// create the zip
-func (e *ePub) Write() error {
-	type zipContent struct {
-		Name    string
-		Content string
-	}
-
-	epubParts, imgStorage, err := e.getParts()
-	if err != nil {
-		return err
-	}
-
-	if e.options.Dry {
-		p := epubParts[0]
-		fmt.Fprintf(os.Stderr, "TOC:\n  - %s\n%s\n", e.options.Title, e.getTree(p.Images, true))
-		if e.options.DryVerbose {
-			if e.options.Image.HasCover {
-				fmt.Fprintf(os.Stderr, "Cover:\n%s\n", e.getTree([]*epubimage.EPUBImage{p.Cover}, false))
-			}
-			fmt.Fprintf(os.Stderr, "Files:\n%s\n", e.getTree(p.Images, false))
-		}
-		return nil
-	}
-	defer func() {
-		imgStorage.Close()
-		imgStorage.Remove()
-	}()
-
-	totalParts := len(epubParts)
-
-	bar := epubprogress.New(epubprogress.Options{
-		Max:         totalParts,
-		Description: "Writing Part",
-		CurrentJob:  2,
-		TotalJob:    2,
-		Quiet:       e.options.Quiet,
-		Json:        e.options.Json,
-	})
-
-	e.computeViewPort(epubParts)
-	hasTitlePage := e.options.TitlePage == 1 || (e.options.TitlePage == 2 && totalParts > 1)
-	for i, part := range epubParts {
-		ext := filepath.Ext(e.options.Output)
-		suffix := ""
-		if totalParts > 1 {
-			fmtLen := len(fmt.Sprint(totalParts))
-			fmtPart := fmt.Sprintf(" Part %%0%dd of %%0%dd", fmtLen, fmtLen)
-			suffix = fmt.Sprintf(fmtPart, i+1, totalParts)
-		}
-
-		path := fmt.Sprintf("%s%s%s", e.options.Output[0:len(e.options.Output)-len(ext)], suffix, ext)
-		wz, err := epubzip.New(path)
-		if err != nil {
-			return err
-		}
-		defer wz.Close()
-
-		title := e.options.Title
-		if totalParts > 1 {
-			title = fmt.Sprintf("%s [%d/%d]", title, i+1, totalParts)
-		}
-
-		content := []zipContent{
-			{"META-INF/container.xml", epubtemplates.Container},
-			{"META-INF/com.apple.ibooks.display-options.xml", epubtemplates.AppleBooks},
-			{"OEBPS/content.opf", epubtemplates.Content(&epubtemplates.ContentOptions{
-				Title:        title,
-				HasTitlePage: hasTitlePage,
-				UID:          e.uid,
-				Author:       e.options.Author,
-				Publisher:    e.publisher,
-				UpdatedAt:    e.updatedAt,
-				ImageOptions: e.options.Image,
-				Cover:        part.Cover,
-				Images:       part.Images,
-				Current:      i + 1,
-				Total:        totalParts,
-			})},
-			{"OEBPS/toc.xhtml", epubtemplates.Toc(title, hasTitlePage, e.options.StripFirstDirectoryFromToc, part.Images)},
-			{"OEBPS/Text/style.css", e.render(epubtemplates.Style, map[string]any{
-				"View": e.options.Image.View,
-			})},
-		}
-
-		if err = wz.WriteMagic(); err != nil {
-			return err
-		}
-		for _, c := range content {
-			if err := wz.WriteContent(c.Name, []byte(c.Content)); err != nil {
-				return err
-			}
-		}
-
-		if err = e.writeCoverImage(wz, part.Cover, i+1, totalParts); err != nil {
-			return err
-		}
-
-		if hasTitlePage {
-			if err = e.writeTitleImage(wz, part.Cover, title); err != nil {
-				return err
-			}
-		}
-
-		lastImage := part.Images[len(part.Images)-1]
-		for _, img := range part.Images {
-			if err := e.writeImage(wz, img, imgStorage.Get(img.EPUBImgPath())); err != nil {
-				return err
-			}
-
-			// Double Page or Last Image that is not a double page
-			if !e.options.Image.View.PortraitOnly &&
-				(img.DoublePage ||
-					(!e.options.Image.KeepDoublePageIfSplitted && img.Part == 1) ||
-					(img.Part == 0 && img == lastImage)) {
-				if err := e.writeBlank(wz, img); err != nil {
-					return err
-				}
-			}
-		}
-		bar.Add(1)
-	}
-	bar.Close()
-	if !e.options.Json {
-		fmt.Fprintln(os.Stderr)
-	}
-
-	// display corrupted images
-	hasError := false
-	for pId, part := range epubParts {
-		if pId == 0 && e.options.Image.HasCover && part.Cover.Error != nil {
-			hasError = true
-			fmt.Fprintf(os.Stderr, "Error on image %s: %v\n", filepath.Join(part.Cover.Path, part.Cover.Name), part.Cover.Error)
-		}
-		for _, img := range part.Images {
-			if img.Part == 0 && img.Error != nil {
-				hasError = true
-				fmt.Fprintf(os.Stderr, "Error on image %s: %v\n", filepath.Join(img.Path, img.Name), img.Error)
-			}
-		}
-	}
-	if hasError {
-		fmt.Fprintln(os.Stderr)
-	}
-
-	return nil
 }

pkg/epuboptions/epuboptions.go

@@ -66,6 +66,6 @@ func (o *EPUBOptions) WorkersRatio(pct int) (nbWorkers int) {
 	return
 }
 
-func (o *EPUBOptions) ImgStorage() string {
+func (o *EPUBOptions) Temp() string {
 	return fmt.Sprintf("%s.tmp", o.Output)
 }