celogeek/go-comic-converter
1
0
Fork 0
mirror of https://github.com/celogeek/go-comic-converter.git synced 2025-06-24 06:09:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

record corrupted images and display it at the end

Browse Source
This commit is contained in:
Celogeek 2023-07-08 11:32:22 +02:00
parent eb6c0e77f0
commit fdca0caae7
Signed by: celogeek
SSH Key Fingerprint: SHA256:DEDfxIK2nUWXbslbRkww3zsauDjhWHlTXar+ak4lDJ4
4 changed files with 83 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/epub/epub.go
View File

@ -453,5 +453,23 @@ func (e *ePub) Write() error {
bar.Close()
fmt.Fprintln(os.Stderr)
// display corrupted images
hasError := false
for pId, part := range epubParts {
if pId == 0 && e.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
}

1
internal/epub/image/epub_image.go
View File

@ -23,6 +23,7 @@ type Image struct {
Position string
Format string
OriginalAspectRatio float64
Error error
}
// key name of the blank plage after the image

1
internal/epub/imageprocessor/epub_image_processor.go
View File

@ -98,6 +98,7 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
Name: input.Name,
Format: e.Image.Format,
OriginalAspectRatio: float64(src.Bounds().Dy()) / float64(src.Bounds().Dx()),
Error: input.Error,
}
if err = imgStorage.Add(img.EPUBImgPath(), dst, e.Image.Quality); err != nil {

90
internal/epub/imageprocessor/epub_image_processor_loader.go
View File

@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"image"
"image/color"
_ "image/jpeg"
_ "image/png"
"io"
@ -16,9 +17,12 @@ import (
"strings"
"sync"
"golang.org/x/image/font/gofont/gomonobold"
_ "golang.org/x/image/webp"
"github.com/celogeek/go-comic-converter/v2/internal/sortpath"
"github.com/fogleman/gg"
"github.com/golang/freetype/truetype"
"github.com/nwaples/rardecode/v2"
pdfimage "github.com/raff/pdfreader/image"
"github.com/raff/pdfreader/pdfread"
@ -29,6 +33,7 @@ type tasks struct {
Image image.Image
Path string
Name string
Error error
}
var errNoImagesFound = errors.New("no images found")
@ -69,6 +74,29 @@ func (e *EPUBImageProcessor) load() (totalImages int, output chan *tasks, err er
}
}
func (e *EPUBImageProcessor) corruptedImage(path, name string) image.Image {
var w, h float64 = 1200, 1920
f, _ := truetype.Parse(gomonobold.TTF)
face := truetype.NewFace(f, &truetype.Options{Size: 64, DPI: 72})
txt := name
if path != "" {
txt += "\nin " + filepath.Clean(path)
}
txt += "\nis corrupted!"
g := gg.NewContext(int(w), int(h))
g.SetColor(color.White)
g.Clear()
g.SetColor(color.Black)
g.DrawRoundedRectangle(0, 0, w, h, 0.5)
g.SetLineWidth(6)
g.Stroke()
g.DrawRoundedRectangle(0, 0, 480, 640, 0.5)
g.SetFontFace(face)
g.DrawStringWrapped(txt, w/2, h/2, 0.5, 0.5, 640, 1.5, gg.AlignCenter)
return g.Image()
}
// load a directory of images
func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err error) {
images := make([]string, 0)
@ -119,19 +147,15 @@ func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err
defer wg.Done()
for job := range jobs {
var img image.Image
var err error
if !e.Dry {
f, err := os.Open(job.Path)
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Path, err)
os.Exit(1)
}
var f *os.File
f, err = os.Open(job.Path)
if err == nil {
img, _, err = image.Decode(f)
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Path, err)
os.Exit(1)
}
f.Close()
}
}
p, fn := filepath.Split(job.Path)
if p == input {
@ -139,11 +163,15 @@ func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err
} else {
p = p[len(input)+1:]
}
if err != nil {
img = e.corruptedImage(p, fn)
}
output <- &tasks{
Id: job.Id,
Image: img,
Path: p,
Name: fn,
Error: err,
}
}
}()
@ -211,26 +239,26 @@ func (e *EPUBImageProcessor) loadCbz() (totalImages int, output chan *tasks, err
defer wg.Done()
for job := range jobs {
var img image.Image
var err error
if !e.Dry {
f, err := job.F.Open()
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.F.Name, err)
os.Exit(1)
}
var f io.ReadCloser
f, err = job.F.Open()
if err == nil {
img, _, err = image.Decode(f)
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.F.Name, err)
os.Exit(1)
}
f.Close()
}
p, fn := filepath.Split(filepath.Clean(job.F.Name))
if err != nil {
img = e.corruptedImage(p, fn)
}
output <- &tasks{
Id: job.Id,
Image: img,
Path: p,
Name: fn,
Error: err,
}
}
}()
@ -330,26 +358,26 @@ func (e *EPUBImageProcessor) loadCbr() (totalImages int, output chan *tasks, err
defer wg.Done()
for job := range jobs {
var img image.Image
var err error
if !e.Dry {
f, err := job.Open()
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Name, err)
os.Exit(1)
}
var f io.ReadCloser
f, err = job.Open()
if err == nil {
img, _, err = image.Decode(f)
if err != nil {
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Name, err)
os.Exit(1)
}
f.Close()
}
p, fn := filepath.Split(filepath.Clean(job.Name))
if err != nil {
img = e.corruptedImage(p, fn)
}
output <- &tasks{
Id: job.Id,
Image: img,
Path: p,
Name: fn,
Error: err,
}
}
}()
@ -377,19 +405,21 @@ func (e *EPUBImageProcessor) loadPdf() (totalImages int, output chan *tasks, err
defer pdf.Close()
for i := 0; i < totalImages; i++ {
var img image.Image
var err error
if !e.Dry {
img, err = pdfimage.Extract(pdf, i+1)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
}
name := fmt.Sprintf(pageFmt, i+1)
if err != nil {
img = e.corruptedImage("", name)
}
output <- &tasks{
Id: i,
Image: img,
Path: "",
Name: fmt.Sprintf(pageFmt, i+1),
Name: name,
Error: err,
}
}
}()