Compare commits

..

No commits in common. "e6051fda887e30ad4d41248a0a4623f57a776493" and "b71deb257aecb33f0b3482f07089bdf530741730" have entirely different histories.

11 changed files with 114 additions and 254 deletions

View File

@ -38,14 +38,12 @@ $ go install github.com/celogeek/go-comic-converter/v2
To force install a specific version: To force install a specific version:
``` ```
# specific version $ go install github.com/celogeek/go-comic-converter/v2@V2TAG
$ go install github.com/celogeek/go-comic-converter/v2@v2.4.0 ```
# main branch Example:
$ go install github.com/celogeek/go-comic-converter/v2@main ```
$ go install github.com/celogeek/go-comic-converter/v2@v2.0.6
# specific commit
$ go install github.com/celogeek/go-comic-converter/v2@141aeae
``` ```
Add GOPATH to your PATH Add GOPATH to your PATH
@ -60,12 +58,12 @@ You can check if a new version is available with:
$ go-comic-converter -version $ go-comic-converter -version
go-comic-converter go-comic-converter
Path : github.com/celogeek/go-comic-converter/v2 Path : github.com/celogeek/go-comic-converter/v2
Sum : h1:qOYGRpdT4t6fPksFHHrMmg+AvKSliNL6JfNWcvLGesU= Sum : h1:9xYksu1PlJ6QkAL/5U2ZbufEb1tavpdRcpTPPcAjiNs=
Version : v2.4.0 Version : v2.3.3
Available Version: v2.4.0 Available Version: v2.3.3
To install the latest version: To install the latest version:
$ go install github.com/celogeek/go-comic-converter/v2@v2.4.0 $ go install github.com/celogeek/go-comic-converter/v2@v2.3.3
``` ```
# Supported image files # Supported image files

View File

@ -16,7 +16,6 @@ import (
"reflect" "reflect"
"runtime" "runtime"
"strings" "strings"
"time"
"github.com/celogeek/go-comic-converter/v2/internal/converter/options" "github.com/celogeek/go-comic-converter/v2/internal/converter/options"
) )
@ -27,7 +26,6 @@ type Converter struct {
order []converterOrder order []converterOrder
isZeroValueErrs []error isZeroValueErrs []error
startAt time.Time
} }
// Create a new parser // Create a new parser
@ -38,7 +36,6 @@ func New() *Converter {
Options: options, Options: options,
Cmd: cmd, Cmd: cmd,
order: make([]converterOrder, 0), order: make([]converterOrder, 0),
startAt: time.Now(),
} }
var cmdOutput strings.Builder var cmdOutput strings.Builder
@ -302,15 +299,3 @@ func (c *Converter) Fatal(err error) {
fmt.Fprintf(os.Stderr, "\nError: %s\n", err) fmt.Fprintf(os.Stderr, "\nError: %s\n", err)
os.Exit(1) os.Exit(1)
} }
func (c *Converter) Stats() {
// Display elapse time and memory usage
var mem runtime.MemStats
runtime.ReadMemStats(&mem)
fmt.Fprintf(
os.Stderr,
"Completed in %s, Memory usage %d Mb\n",
time.Since(c.startAt).Round(time.Millisecond),
mem.Sys/1024/1024,
)
}

View File

@ -4,7 +4,6 @@ Tools to create EPUB from images.
package epub package epub
import ( import (
"archive/zip"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@ -35,9 +34,8 @@ type ePub struct {
} }
type epubPart struct { type epubPart struct {
Cover *epubimage.Image Cover *epubimageprocessor.LoadedImage
Images []*epubimage.Image LoadedImages epubimageprocessor.LoadedImages
Reader *zip.ReadCloser
} }
// initialize EPUB // initialize EPUB
@ -70,18 +68,19 @@ func (e *ePub) render(templateString string, data map[string]any) string {
} }
// write image to the zip // write image to the zip
func (e *ePub) writeImage(wz *epubzip.EPUBZip, img *epubimage.Image, zipImg *zip.File) error { func (e *ePub) writeImage(wz *epubzip.EPUBZip, img *epubimageprocessor.LoadedImage) error {
err := wz.WriteContent( err := wz.WriteContent(
img.EPUBPagePath(), fmt.Sprintf("OEBPS/%s", img.Image.PagePath()),
[]byte(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.Image.Id, img.Image.Part),
"ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.View.Width, e.Image.View.Height), "ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.View.Width, e.Image.View.Height),
"ImagePath": img.ImgPath(), "ImagePath": img.Image.ImgPath(),
"ImageStyle": img.ImgStyle(e.Image.View.Width, e.Image.View.Height, e.Image.Manga), "ImageStyle": img.Image.ImgStyle(e.Image.View.Width, e.Image.View.Height, e.Image.Manga),
})), })),
) )
if err == nil { if err == nil {
err = wz.Copy(zipImg) err = wz.WriteRaw(img.ZipImage)
} }
return err return err
@ -90,7 +89,7 @@ func (e *ePub) writeImage(wz *epubzip.EPUBZip, img *epubimage.Image, zipImg *zip
// write blank page // write blank page
func (e *ePub) writeBlank(wz *epubzip.EPUBZip, img *epubimage.Image) error { func (e *ePub) writeBlank(wz *epubzip.EPUBZip, img *epubimage.Image) error {
return wz.WriteContent( return wz.WriteContent(
img.EPUBSpacePath(), fmt.Sprintf("OEBPS/%s", img.SpacePath()),
[]byte(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.View.Width, e.Image.View.Height), "ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.View.Width, e.Image.View.Height),
@ -99,66 +98,61 @@ func (e *ePub) writeBlank(wz *epubzip.EPUBZip, img *epubimage.Image) error {
} }
// extract image and split it into part // extract image and split it into part
func (e *ePub) getParts() (parts []*epubPart, imgStorage *epubzip.EPUBZipStorageImageReader, err error) { func (e *ePub) getParts() ([]*epubPart, error) {
images, err := e.imageProcessor.Load() loadedImages, err := e.imageProcessor.Load()
if err != nil { if err != nil {
return nil, nil, err return nil, err
} }
// sort result by id and part // sort result by id and part
sort.Slice(images, func(i, j int) bool { sort.Slice(loadedImages, func(i, j int) bool {
if images[i].Id == images[j].Id { if loadedImages[i].Image.Id == loadedImages[j].Image.Id {
return images[i].Part < images[j].Part return loadedImages[i].Image.Part < loadedImages[j].Image.Part
} }
return images[i].Id < images[j].Id return loadedImages[i].Image.Id < loadedImages[j].Image.Id
}) })
parts = make([]*epubPart, 0) parts := make([]*epubPart, 0)
cover := images[0] cover := loadedImages[0]
if e.Image.HasCover { if e.Image.HasCover {
images = images[1:] loadedImages = loadedImages[1:]
} }
if e.Dry { if e.Dry {
parts = append(parts, &epubPart{ parts = append(parts, &epubPart{
Cover: cover, Cover: cover,
Images: images, LoadedImages: loadedImages,
}) })
return parts, nil, nil return parts, nil
}
imgStorage, err = epubzip.NewEPUBZipStorageImageReader(e.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 // compute size of the EPUB part and try to be as close as possible of the target
maxSize := uint64(e.LimitMb * 1024 * 1024) maxSize := uint64(e.LimitMb * 1024 * 1024)
xhtmlSize := uint64(1024) xhtmlSize := uint64(1024)
// descriptor files + title // descriptor files + title
baseSize := uint64(16*1024) + imgStorage.Size(cover.EPUBImgPath()) baseSize := uint64(16*1024) + cover.ZipImage.CompressedSize()
if e.Image.HasCover { if e.Image.HasCover {
baseSize += imgStorage.Size(cover.EPUBImgPath()) baseSize += cover.ZipImage.CompressedSize()
} }
currentSize := baseSize currentSize := baseSize
currentImages := make([]*epubimage.Image, 0) currentImages := make([]*epubimageprocessor.LoadedImage, 0)
part := 1 part := 1
for _, img := range images { for _, img := range loadedImages {
imgSize := imgStorage.Size(img.EPUBImgPath()) + xhtmlSize imgSize := img.ZipImage.CompressedSize() + xhtmlSize
if maxSize > 0 && len(currentImages) > 0 && currentSize+imgSize > maxSize { if maxSize > 0 && len(currentImages) > 0 && currentSize+imgSize > maxSize {
parts = append(parts, &epubPart{ parts = append(parts, &epubPart{
Cover: cover, Cover: cover,
Images: currentImages, LoadedImages: currentImages,
}) })
part += 1 part += 1
currentSize = baseSize currentSize = baseSize
if !e.Image.HasCover { if !e.Image.HasCover {
currentSize += imgStorage.Size(cover.EPUBImgPath()) currentSize += cover.ZipImage.CompressedSize()
} }
currentImages = make([]*epubimage.Image, 0) currentImages = make([]*epubimageprocessor.LoadedImage, 0)
} }
currentSize += imgSize currentSize += imgSize
currentImages = append(currentImages, img) currentImages = append(currentImages, img)
@ -166,11 +160,11 @@ func (e *ePub) getParts() (parts []*epubPart, imgStorage *epubzip.EPUBZipStorage
if len(currentImages) > 0 { if len(currentImages) > 0 {
parts = append(parts, &epubPart{ parts = append(parts, &epubPart{
Cover: cover, Cover: cover,
Images: currentImages, LoadedImages: currentImages,
}) })
} }
return parts, imgStorage, nil return parts, nil
} }
// create a tree from the directories. // create a tree from the directories.
@ -200,26 +194,22 @@ func (e *ePub) Write() error {
Content string Content string
} }
epubParts, imgStorage, err := e.getParts() epubParts, err := e.getParts()
if err != nil { if err != nil {
return err return err
} }
if e.Dry { if e.Dry {
p := epubParts[0] p := epubParts[0]
fmt.Fprintf(os.Stderr, "TOC:\n - %s\n%s\n", e.Title, e.getTree(p.Images, true)) fmt.Fprintf(os.Stderr, "TOC:\n - %s\n%s\n", e.Title, e.getTree(p.LoadedImages.Images(), true))
if e.DryVerbose { if e.DryVerbose {
if e.Image.HasCover { if e.Image.HasCover {
fmt.Fprintf(os.Stderr, "Cover:\n%s\n", e.getTree([]*epubimage.Image{p.Cover}, false)) fmt.Fprintf(os.Stderr, "Cover:\n%s\n", e.getTree([]*epubimage.Image{p.Cover.Image}, false))
} }
fmt.Fprintf(os.Stderr, "Files:\n%s\n", e.getTree(p.Images, false)) fmt.Fprintf(os.Stderr, "Files:\n%s\n", e.getTree(p.LoadedImages.Images(), false))
} }
return nil return nil
} }
defer func() {
imgStorage.Close()
imgStorage.Remove()
}()
totalParts := len(epubParts) totalParts := len(epubParts)
@ -230,7 +220,6 @@ func (e *ePub) Write() error {
TotalJob: 2, TotalJob: 2,
Quiet: e.Quiet, Quiet: e.Quiet,
}) })
for i, part := range epubParts { for i, part := range epubParts {
ext := filepath.Ext(e.Output) ext := filepath.Ext(e.Output)
suffix := "" suffix := ""
@ -262,12 +251,12 @@ func (e *ePub) Write() error {
Publisher: e.Publisher, Publisher: e.Publisher,
UpdatedAt: e.UpdatedAt, UpdatedAt: e.UpdatedAt,
ImageOptions: e.Image, ImageOptions: e.Image,
Cover: part.Cover, Cover: part.Cover.Image,
Images: part.Images, Images: part.LoadedImages.Images(),
Current: i + 1, Current: i + 1,
Total: totalParts, Total: totalParts,
})}, })},
{"OEBPS/toc.xhtml", epubtemplates.Toc(title, e.StripFirstDirectoryFromToc, part.Images)}, {"OEBPS/toc.xhtml", epubtemplates.Toc(title, e.StripFirstDirectoryFromToc, part.LoadedImages.Images())},
{"OEBPS/Text/style.css", e.render(epubtemplates.Style, map[string]any{ {"OEBPS/Text/style.css", e.render(epubtemplates.Style, map[string]any{
"PageWidth": e.Image.View.Width, "PageWidth": e.Image.View.Width,
"PageHeight": e.Image.View.Height, "PageHeight": e.Image.View.Height,
@ -280,7 +269,7 @@ func (e *ePub) Write() error {
"Title": title, "Title": title,
"ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.View.Width, e.Image.View.Height), "ViewPort": fmt.Sprintf("width=%d,height=%d", e.Image.View.Width, e.Image.View.Height),
"ImagePath": "Images/title.jpg", "ImagePath": "Images/title.jpg",
"ImageStyle": part.Cover.ImgStyle(e.Image.View.Width, e.Image.View.Height, e.Image.Manga), "ImageStyle": part.Cover.Image.ImgStyle(e.Image.View.Width, e.Image.View.Height, e.Image.Manga),
})}, })},
} }
@ -292,32 +281,27 @@ func (e *ePub) Write() error {
return err return err
} }
} }
coverTitle, err := e.imageProcessor.CoverTitleData(part.Cover.Raw, title) if err := wz.WriteRaw(e.imageProcessor.CoverTitleData(part.Cover.Image.Raw, title)); err != nil {
if err != nil {
return err
}
if err := wz.WriteRaw(coverTitle); err != nil {
return err return err
} }
// Cover exist or part > 1 // Cover exist or part > 1
// If no cover, part 2 and more will include the image as a cover // If no cover, part 2 and more will include the image as a cover
if e.Image.HasCover || i > 0 { if e.Image.HasCover || i > 0 {
if err := e.writeImage(wz, part.Cover, imgStorage.Get(part.Cover.EPUBImgPath())); err != nil { if err := e.writeImage(wz, part.Cover); err != nil {
return err return err
} }
} }
lastImage := part.Images[len(part.Images)-1] lastImage := part.LoadedImages[len(part.LoadedImages)-1]
for _, img := range part.Images { for _, img := range part.LoadedImages {
if err := e.writeImage(wz, img, imgStorage.Get(img.EPUBImgPath())); err != nil { if err := e.writeImage(wz, img); err != nil {
return err return err
} }
// Double Page or Last Image that is not a double page // Double Page or Last Image that is not a double page
if img.DoublePage || (img.Part == 0 && img == lastImage) { if img.Image.DoublePage || (img.Image.Part == 0 && img == lastImage) {
if err := e.writeBlank(wz, img); err != nil { if err := e.writeBlank(wz, img.Image); err != nil {
return err return err
} }
} }
@ -325,7 +309,6 @@ func (e *ePub) Write() error {
bar.Add(1) bar.Add(1)
} }
bar.Close() bar.Close()
fmt.Fprintln(os.Stderr)
return nil return nil
} }

View File

@ -31,11 +31,6 @@ func (i *Image) SpacePath() string {
return fmt.Sprintf("Text/%s.xhtml", i.SpaceKey()) return fmt.Sprintf("Text/%s.xhtml", i.SpaceKey())
} }
// path of the blank page into the EPUB
func (i *Image) EPUBSpacePath() string {
return fmt.Sprintf("OEBPS/%s", i.SpacePath())
}
// key for page // key for page
func (i *Image) PageKey() string { func (i *Image) PageKey() string {
return fmt.Sprintf("page_%d_p%d", i.Id, i.Part) return fmt.Sprintf("page_%d_p%d", i.Id, i.Part)
@ -46,11 +41,6 @@ func (i *Image) PagePath() string {
return fmt.Sprintf("Text/%s.xhtml", i.PageKey()) return fmt.Sprintf("Text/%s.xhtml", i.PageKey())
} }
// page path into the EPUB
func (i *Image) EPUBPagePath() string {
return fmt.Sprintf("OEBPS/%s", i.PagePath())
}
// key for image // key for image
func (i *Image) ImgKey() string { func (i *Image) ImgKey() string {
return fmt.Sprintf("img_%d_p%d", i.Id, i.Part) return fmt.Sprintf("img_%d_p%d", i.Id, i.Part)
@ -61,11 +51,6 @@ func (i *Image) ImgPath() string {
return fmt.Sprintf("Images/%s.jpg", i.ImgKey()) return fmt.Sprintf("Images/%s.jpg", i.ImgKey())
} }
// image path into the EPUB
func (i *Image) EPUBImgPath() string {
return fmt.Sprintf("OEBPS/%s", i.ImgPath())
}
// style to apply to the image. // style to apply to the image.
// //
// center by default. // center by default.

View File

@ -6,7 +6,6 @@ package epubimageprocessor
import ( import (
"fmt" "fmt"
"image" "image"
"os"
"sync" "sync"
epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image" epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image"
@ -17,6 +16,21 @@ import (
"github.com/disintegration/gift" "github.com/disintegration/gift"
) )
type LoadedImage struct {
Image *epubimage.Image
ZipImage *epubzip.ZipImage
}
type LoadedImages []*LoadedImage
func (l LoadedImages) Images() []*epubimage.Image {
res := make([]*epubimage.Image, len(l))
for i, v := range l {
res[i] = v.Image
}
return res
}
type EPUBImageProcessor struct { type EPUBImageProcessor struct {
*epuboptions.Options *epuboptions.Options
} }
@ -26,8 +40,9 @@ func New(o *epuboptions.Options) *EPUBImageProcessor {
} }
// extract and convert images // extract and convert images
func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) { func (e *EPUBImageProcessor) Load() (LoadedImages, error) {
images = make([]*epubimage.Image, 0) images := make(LoadedImages, 0)
imageCount, imageInput, err := e.load() imageCount, imageInput, err := e.load()
if err != nil { if err != nil {
return nil, err return nil, err
@ -36,17 +51,19 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
// dry run, skip convertion // dry run, skip convertion
if e.Dry { if e.Dry {
for img := range imageInput { for img := range imageInput {
images = append(images, &epubimage.Image{ images = append(images, &LoadedImage{
Image: &epubimage.Image{
Id: img.Id, Id: img.Id,
Path: img.Path, Path: img.Path,
Name: img.Name, Name: img.Name,
},
}) })
} }
return images, nil return images, nil
} }
imageOutput := make(chan *epubimage.Image) imageOutput := make(chan *LoadedImage)
// processing // processing
bar := epubprogress.New(epubprogress.Options{ bar := epubprogress.New(epubprogress.Options{
@ -58,12 +75,6 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
}) })
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
imgStorage, err := epubzip.NewEPUBZipStorageImageWriter(e.ImgStorage())
if err != nil {
bar.Close()
return nil, err
}
for i := 0; i < e.WorkersRatio(50); i++ { for i := 0; i < e.WorkersRatio(50); i++ {
wg.Add(1) wg.Add(1)
go func() { go func() {
@ -90,13 +101,10 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
Path: input.Path, Path: input.Path,
Name: input.Name, Name: input.Name,
} }
imageOutput <- &LoadedImage{
if err = imgStorage.Add(img.EPUBImgPath(), dst, e.Image.Quality); err != nil { Image: img,
bar.Close() ZipImage: epubzip.CompressImage(fmt.Sprintf("OEBPS/%s", img.ImgPath()), dst, e.Image.Quality),
fmt.Fprintf(os.Stderr, "error with %s: %s", input.Name, err)
os.Exit(1)
} }
imageOutput <- img
} }
} }
}() }()
@ -104,18 +112,17 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
go func() { go func() {
wg.Wait() wg.Wait()
imgStorage.Close()
close(imageOutput) close(imageOutput)
}() }()
for img := range imageOutput { for output := range imageOutput {
if img.Part == 0 { if output.Image.Part == 0 {
bar.Add(1) bar.Add(1)
} }
if e.Image.NoBlankImage && img.IsBlank { if e.Image.NoBlankImage && output.Image.IsBlank {
continue continue
} }
images = append(images, img) images = append(images, output)
} }
bar.Close() bar.Close()
@ -213,7 +220,7 @@ func (e *EPUBImageProcessor) transformImage(src image.Image, srcId int) []image.
} }
// create a title page with the cover // create a title page with the cover
func (e *EPUBImageProcessor) CoverTitleData(img image.Image, title string) (*epubzip.ZipImage, error) { func (e *EPUBImageProcessor) CoverTitleData(img image.Image, title string) *epubzip.ZipImage {
// Create a blur version of the cover // Create a blur version of the cover
g := gift.New(epubimagefilters.CoverTitle(title)) g := gift.New(epubimagefilters.CoverTitle(title))
dst := image.NewGray(g.Bounds(img.Bounds())) dst := image.NewGray(g.Bounds(img.Bounds()))

View File

@ -85,7 +85,8 @@ func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err
}) })
if err != nil { if err != nil {
return fmt.Fprintln(os.Stderr, err)
os.Exit(1)
} }
totalImages = len(images) totalImages = len(images)

View File

@ -3,8 +3,6 @@ Options for EPUB creation.
*/ */
package epuboptions package epuboptions
import "fmt"
type Crop struct { type Crop struct {
Enabled bool Enabled bool
Left, Up, Right, Bottom int Left, Up, Right, Bottom int
@ -49,7 +47,3 @@ func (o *Options) WorkersRatio(pct int) (nbWorkers int) {
} }
return return
} }
func (o *Options) ImgStorage() string {
return fmt.Sprintf("%s.tmp", o.Output)
}

View File

@ -58,10 +58,6 @@ func (e *EPUBZip) WriteMagic() error {
return err return err
} }
func (e *EPUBZip) Copy(fz *zip.File) error {
return e.wz.Copy(fz)
}
// Write image. They are already compressed, so we write them down directly. // Write image. They are already compressed, so we write them down directly.
func (e *EPUBZip) WriteRaw(raw *ZipImage) error { func (e *EPUBZip) WriteRaw(raw *ZipImage) error {
m, err := e.wz.CreateRaw(raw.Header) m, err := e.wz.CreateRaw(raw.Header)

View File

@ -4,9 +4,11 @@ import (
"archive/zip" "archive/zip"
"bytes" "bytes"
"compress/flate" "compress/flate"
"fmt"
"hash/crc32" "hash/crc32"
"image" "image"
"image/jpeg" "image/jpeg"
"os"
"time" "time"
) )
@ -15,8 +17,18 @@ type ZipImage struct {
Data []byte Data []byte
} }
// compressed size of the image with the header
func (img *ZipImage) CompressedSize() uint64 {
return img.Header.CompressedSize64 + 30 + uint64(len(img.Header.Name))
}
func exitWithError(err error) {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
// create gzip encoded jpeg // create gzip encoded jpeg
func CompressImage(filename string, img image.Image, quality int) (*ZipImage, error) { func CompressImage(filename string, img image.Image, quality int) *ZipImage {
var ( var (
data, cdata bytes.Buffer data, cdata bytes.Buffer
err error err error
@ -24,22 +36,22 @@ func CompressImage(filename string, img image.Image, quality int) (*ZipImage, er
err = jpeg.Encode(&data, img, &jpeg.Options{Quality: quality}) err = jpeg.Encode(&data, img, &jpeg.Options{Quality: quality})
if err != nil { if err != nil {
return nil, err exitWithError(err)
} }
wcdata, err := flate.NewWriter(&cdata, flate.BestCompression) wcdata, err := flate.NewWriter(&cdata, flate.BestCompression)
if err != nil { if err != nil {
return nil, err exitWithError(err)
} }
_, err = wcdata.Write(data.Bytes()) _, err = wcdata.Write(data.Bytes())
if err != nil { if err != nil {
return nil, err exitWithError(err)
} }
err = wcdata.Close() err = wcdata.Close()
if err != nil { if err != nil {
return nil, err exitWithError(err)
} }
t := time.Now() t := time.Now()
@ -54,5 +66,5 @@ func CompressImage(filename string, img image.Image, quality int) (*ZipImage, er
ModifiedDate: uint16(t.Day() + int(t.Month())<<5 + (t.Year()-1980)<<9), ModifiedDate: uint16(t.Day() + int(t.Month())<<5 + (t.Year()-1980)<<9),
}, },
cdata.Bytes(), cdata.Bytes(),
}, nil }
} }

View File

@ -1,100 +0,0 @@
package epubzip
import (
"archive/zip"
"image"
"os"
"sync"
)
type EPUBZipStorageImageWriter struct {
fh *os.File
fz *zip.Writer
mut *sync.Mutex
}
func NewEPUBZipStorageImageWriter(filename string) (*EPUBZipStorageImageWriter, error) {
fh, err := os.Create(filename)
if err != nil {
return nil, err
}
fz := zip.NewWriter(fh)
return &EPUBZipStorageImageWriter{fh, fz, &sync.Mutex{}}, nil
}
func (e *EPUBZipStorageImageWriter) Close() error {
if err := e.fz.Close(); err != nil {
e.fh.Close()
return err
}
return e.fh.Close()
}
func (e *EPUBZipStorageImageWriter) Add(filename string, img image.Image, quality int) error {
zipImage, err := CompressImage(filename, img, quality)
if err != nil {
return err
}
e.mut.Lock()
defer e.mut.Unlock()
fh, err := e.fz.CreateRaw(zipImage.Header)
if err != nil {
return err
}
_, err = fh.Write(zipImage.Data)
if err != nil {
return err
}
return nil
}
type EPUBZipStorageImageReader struct {
filename string
fh *os.File
fz *zip.Reader
files map[string]*zip.File
}
func NewEPUBZipStorageImageReader(filename string) (*EPUBZipStorageImageReader, error) {
fh, err := os.Open(filename)
if err != nil {
return nil, err
}
s, err := fh.Stat()
if err != nil {
return nil, err
}
fz, err := zip.NewReader(fh, s.Size())
if err != nil {
return nil, err
}
files := map[string]*zip.File{}
for _, z := range fz.File {
files[z.Name] = z
}
return &EPUBZipStorageImageReader{filename, fh, fz, files}, nil
}
func (e *EPUBZipStorageImageReader) Get(filename string) *zip.File {
return e.files[filename]
}
func (e *EPUBZipStorageImageReader) Size(filename string) uint64 {
img := e.Get(filename)
if img != nil {
return img.CompressedSize64 + 30 + uint64(len(img.Name))
}
return 0
}
func (e *EPUBZipStorageImageReader) Close() error {
return e.fh.Close()
}
func (e *EPUBZipStorageImageReader) Remove() error {
return os.Remove(e.filename)
}

View File

@ -138,7 +138,6 @@ $ go install github.com/celogeek/go-comic-converter/v%d@%s
fmt.Fprintf(os.Stderr, "Error: %v\n", err) fmt.Fprintf(os.Stderr, "Error: %v\n", err)
os.Exit(1) os.Exit(1)
} }
if !cmd.Options.Dry {
cmd.Stats() os.Exit(0)
}
} }