mirror of
https://github.com/celogeek/go-comic-converter.git
synced 2025-06-24 14:19:56 +02:00
record corrupted images and display it at the end
This commit is contained in:
parent
eb6c0e77f0
commit
fdca0caae7
@ -453,5 +453,23 @@ func (e *ePub) Write() error {
|
|||||||
bar.Close()
|
bar.Close()
|
||||||
fmt.Fprintln(os.Stderr)
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@ type Image struct {
|
|||||||
Position string
|
Position string
|
||||||
Format string
|
Format string
|
||||||
OriginalAspectRatio float64
|
OriginalAspectRatio float64
|
||||||
|
Error error
|
||||||
}
|
}
|
||||||
|
|
||||||
// key name of the blank plage after the image
|
// key name of the blank plage after the image
|
||||||
|
@ -98,6 +98,7 @@ func (e *EPUBImageProcessor) Load() (images []*epubimage.Image, err error) {
|
|||||||
Name: input.Name,
|
Name: input.Name,
|
||||||
Format: e.Image.Format,
|
Format: e.Image.Format,
|
||||||
OriginalAspectRatio: float64(src.Bounds().Dy()) / float64(src.Bounds().Dx()),
|
OriginalAspectRatio: float64(src.Bounds().Dy()) / float64(src.Bounds().Dx()),
|
||||||
|
Error: input.Error,
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = imgStorage.Add(img.EPUBImgPath(), dst, e.Image.Quality); err != nil {
|
if err = imgStorage.Add(img.EPUBImgPath(), dst, e.Image.Quality); err != nil {
|
||||||
|
@ -6,6 +6,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image"
|
"image"
|
||||||
|
"image/color"
|
||||||
_ "image/jpeg"
|
_ "image/jpeg"
|
||||||
_ "image/png"
|
_ "image/png"
|
||||||
"io"
|
"io"
|
||||||
@ -16,9 +17,12 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"golang.org/x/image/font/gofont/gomonobold"
|
||||||
_ "golang.org/x/image/webp"
|
_ "golang.org/x/image/webp"
|
||||||
|
|
||||||
"github.com/celogeek/go-comic-converter/v2/internal/sortpath"
|
"github.com/celogeek/go-comic-converter/v2/internal/sortpath"
|
||||||
|
"github.com/fogleman/gg"
|
||||||
|
"github.com/golang/freetype/truetype"
|
||||||
"github.com/nwaples/rardecode/v2"
|
"github.com/nwaples/rardecode/v2"
|
||||||
pdfimage "github.com/raff/pdfreader/image"
|
pdfimage "github.com/raff/pdfreader/image"
|
||||||
"github.com/raff/pdfreader/pdfread"
|
"github.com/raff/pdfreader/pdfread"
|
||||||
@ -29,6 +33,7 @@ type tasks struct {
|
|||||||
Image image.Image
|
Image image.Image
|
||||||
Path string
|
Path string
|
||||||
Name string
|
Name string
|
||||||
|
Error error
|
||||||
}
|
}
|
||||||
|
|
||||||
var errNoImagesFound = errors.New("no images found")
|
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
|
// load a directory of images
|
||||||
func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err error) {
|
func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err error) {
|
||||||
images := make([]string, 0)
|
images := make([]string, 0)
|
||||||
@ -119,18 +147,14 @@ func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err
|
|||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
for job := range jobs {
|
for job := range jobs {
|
||||||
var img image.Image
|
var img image.Image
|
||||||
|
var err error
|
||||||
if !e.Dry {
|
if !e.Dry {
|
||||||
f, err := os.Open(job.Path)
|
var f *os.File
|
||||||
if err != nil {
|
f, err = os.Open(job.Path)
|
||||||
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Path, err)
|
if err == nil {
|
||||||
os.Exit(1)
|
img, _, err = image.Decode(f)
|
||||||
|
f.Close()
|
||||||
}
|
}
|
||||||
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)
|
p, fn := filepath.Split(job.Path)
|
||||||
@ -139,11 +163,15 @@ func (e *EPUBImageProcessor) loadDir() (totalImages int, output chan *tasks, err
|
|||||||
} else {
|
} else {
|
||||||
p = p[len(input)+1:]
|
p = p[len(input)+1:]
|
||||||
}
|
}
|
||||||
|
if err != nil {
|
||||||
|
img = e.corruptedImage(p, fn)
|
||||||
|
}
|
||||||
output <- &tasks{
|
output <- &tasks{
|
||||||
Id: job.Id,
|
Id: job.Id,
|
||||||
Image: img,
|
Image: img,
|
||||||
Path: p,
|
Path: p,
|
||||||
Name: fn,
|
Name: fn,
|
||||||
|
Error: err,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
@ -211,26 +239,26 @@ func (e *EPUBImageProcessor) loadCbz() (totalImages int, output chan *tasks, err
|
|||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
for job := range jobs {
|
for job := range jobs {
|
||||||
var img image.Image
|
var img image.Image
|
||||||
|
var err error
|
||||||
if !e.Dry {
|
if !e.Dry {
|
||||||
f, err := job.F.Open()
|
var f io.ReadCloser
|
||||||
if err != nil {
|
f, err = job.F.Open()
|
||||||
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.F.Name, err)
|
if err == nil {
|
||||||
os.Exit(1)
|
img, _, err = image.Decode(f)
|
||||||
}
|
|
||||||
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()
|
f.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
p, fn := filepath.Split(filepath.Clean(job.F.Name))
|
p, fn := filepath.Split(filepath.Clean(job.F.Name))
|
||||||
|
if err != nil {
|
||||||
|
img = e.corruptedImage(p, fn)
|
||||||
|
}
|
||||||
output <- &tasks{
|
output <- &tasks{
|
||||||
Id: job.Id,
|
Id: job.Id,
|
||||||
Image: img,
|
Image: img,
|
||||||
Path: p,
|
Path: p,
|
||||||
Name: fn,
|
Name: fn,
|
||||||
|
Error: err,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
@ -330,26 +358,26 @@ func (e *EPUBImageProcessor) loadCbr() (totalImages int, output chan *tasks, err
|
|||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
for job := range jobs {
|
for job := range jobs {
|
||||||
var img image.Image
|
var img image.Image
|
||||||
|
var err error
|
||||||
if !e.Dry {
|
if !e.Dry {
|
||||||
f, err := job.Open()
|
var f io.ReadCloser
|
||||||
if err != nil {
|
f, err = job.Open()
|
||||||
fmt.Fprintf(os.Stderr, "\nerror processing image %s: %s\n", job.Name, err)
|
if err == nil {
|
||||||
os.Exit(1)
|
img, _, err = image.Decode(f)
|
||||||
}
|
|
||||||
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()
|
f.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
p, fn := filepath.Split(filepath.Clean(job.Name))
|
p, fn := filepath.Split(filepath.Clean(job.Name))
|
||||||
|
if err != nil {
|
||||||
|
img = e.corruptedImage(p, fn)
|
||||||
|
}
|
||||||
output <- &tasks{
|
output <- &tasks{
|
||||||
Id: job.Id,
|
Id: job.Id,
|
||||||
Image: img,
|
Image: img,
|
||||||
Path: p,
|
Path: p,
|
||||||
Name: fn,
|
Name: fn,
|
||||||
|
Error: err,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
@ -377,19 +405,21 @@ func (e *EPUBImageProcessor) loadPdf() (totalImages int, output chan *tasks, err
|
|||||||
defer pdf.Close()
|
defer pdf.Close()
|
||||||
for i := 0; i < totalImages; i++ {
|
for i := 0; i < totalImages; i++ {
|
||||||
var img image.Image
|
var img image.Image
|
||||||
|
var err error
|
||||||
if !e.Dry {
|
if !e.Dry {
|
||||||
img, err = pdfimage.Extract(pdf, i+1)
|
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{
|
output <- &tasks{
|
||||||
Id: i,
|
Id: i,
|
||||||
Image: img,
|
Image: img,
|
||||||
Path: "",
|
Path: "",
|
||||||
Name: fmt.Sprintf(pageFmt, i+1),
|
Name: name,
|
||||||
|
Error: err,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user