From eb6c0e77f0cdbb22ba365900d75bc32916be9494 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Sat, 8 Jul 2023 11:29:19 +0200 Subject: [PATCH 1/2] add gg deps --- go.mod | 3 ++- go.sum | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c6b4b29..7bf158b 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,14 @@ go 1.20 require ( github.com/beevik/etree v1.2.0 github.com/disintegration/gift v1.2.1 + github.com/fogleman/gg v1.3.0 github.com/gofrs/uuid v4.4.0+incompatible github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/nwaples/rardecode/v2 v2.0.0-beta.2 github.com/raff/pdfreader v0.0.0-20220308062436-033e8ac577f0 github.com/schollz/progressbar/v3 v3.13.1 github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e - golang.org/x/image v0.7.0 + golang.org/x/image v0.9.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index a38f8e7..bf5d1ce 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc= github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI= +github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8= +github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= @@ -43,8 +45,8 @@ github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkT github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw= -golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg= +golang.org/x/image v0.9.0 h1:QrzfX26snvCM20hIhBwuHI/ThTg18b/+kcKdXHvnR+g= +golang.org/x/image v0.9.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -76,7 +78,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= From fdca0caae76520064827eb3d4816df32b491ddd0 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Sat, 8 Jul 2023 11:32:22 +0200 Subject: [PATCH 2/2] record corrupted images and display it at the end --- internal/epub/epub.go | 18 ++++ internal/epub/image/epub_image.go | 1 + .../imageprocessor/epub_image_processor.go | 1 + .../epub_image_processor_loader.go | 96 ++++++++++++------- 4 files changed, 83 insertions(+), 33 deletions(-) diff --git a/internal/epub/epub.go b/internal/epub/epub.go index 98ecc5a..fa4154a 100644 --- a/internal/epub/epub.go +++ b/internal/epub/epub.go @@ -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 } diff --git a/internal/epub/image/epub_image.go b/internal/epub/image/epub_image.go index 046ce03..4b84595 100644 --- a/internal/epub/image/epub_image.go +++ b/internal/epub/image/epub_image.go @@ -23,6 +23,7 @@ type Image struct { Position string Format string OriginalAspectRatio float64 + Error error } // key name of the blank plage after the image diff --git a/internal/epub/imageprocessor/epub_image_processor.go b/internal/epub/imageprocessor/epub_image_processor.go index 308466a..ce728a4 100644 --- a/internal/epub/imageprocessor/epub_image_processor.go +++ b/internal/epub/imageprocessor/epub_image_processor.go @@ -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 { diff --git a/internal/epub/imageprocessor/epub_image_processor_loader.go b/internal/epub/imageprocessor/epub_image_processor_loader.go index 51f7e08..3a563a8 100644 --- a/internal/epub/imageprocessor/epub_image_processor_loader.go +++ b/internal/epub/imageprocessor/epub_image_processor_loader.go @@ -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,18 +147,14 @@ 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) + 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) @@ -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) - } - 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) + var f io.ReadCloser + f, err = job.F.Open() + if err == nil { + img, _, err = image.Decode(f) } 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) - } - img, _, err = image.Decode(f) - 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) } 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, } } }()