celogeek/go-comic-converter
1
0
Fork 0
mirror of https://github.com/celogeek/go-comic-converter.git synced 2025-05-25 16:22:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve error if failed to read image

Browse Source
This commit is contained in:
Celogeek 2023-04-07 18:23:53 +02:00
parent a3d6e43b83
commit 05a936947a
Signed by: celogeek
SSH Key Fingerprint: SHA256:njNJLzoLQdbV9PC6ehcruRb0QnEgxABoCYZ+0+aUIYc
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
internal/epub/image_processing.go
View File

@ -34,8 +34,9 @@ type Image struct {
} }
type imageTask struct { type imageTask struct {
Id int Id int
Reader io.ReadCloser Reader io.ReadCloser
Filename string
} }
func colorIsBlank(c color.Color) bool { func colorIsBlank(c color.Color) bool {
@ -123,6 +124,7 @@ func LoadImages(path string, options *ImageOptions) ([]*Image, error) {
imageOutput := make(chan *Image) imageOutput := make(chan *Image)
// processing // processing
bar := NewBar(imageCount, "Processing", 1, 2)
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
for i := 0; i < options.Workers; i++ { for i := 0; i < options.Workers; i++ {
@ -134,7 +136,9 @@ func LoadImages(path string, options *ImageOptions) ([]*Image, error) {
// Decode image // Decode image
src, _, err := image.Decode(img.Reader) src, _, err := image.Decode(img.Reader)
if err != nil { if err != nil {
panic(err) bar.Clear()
fmt.Fprintf(os.Stderr, "error processing image %s: %s\n", img.Filename, err)
os.Exit(1)
} }
if options.Crop { if options.Crop {
@ -193,7 +197,6 @@ func LoadImages(path string, options *ImageOptions) ([]*Image, error) {
close(imageOutput) close(imageOutput)
}() }()
bar := NewBar(imageCount, "Processing", 1, 2)
for image := range imageOutput { for image := range imageOutput {
if !(options.NoBlankPage && image.Width == 1 && image.Height == 1) { if !(options.NoBlankPage && image.Width == 1 && image.Height == 1) {
images = append(images, image) images = append(images, image)
@ -261,8 +264,9 @@ func loadDir(input string) (int, chan *imageTask, error) {
os.Exit(1) os.Exit(1)
} }
output <- &imageTask{ output <- &imageTask{
Id: i, Id: i,
Reader: f, Reader: f,
Filename: img,
} }
} }
}() }()
@ -300,8 +304,9 @@ func loadCbz(input string) (int, chan *imageTask, error) {
os.Exit(1) os.Exit(1)
} }
output <- &imageTask{ output <- &imageTask{
Id: i, Id: i,
Reader: f, Reader: f,
Filename: img.Name,
} }
} }
}() }()
@ -367,8 +372,9 @@ func loadCbr(input string) (int, chan *imageTask, error) {
io.Copy(b, r) io.Copy(b, r)
output <- &imageTask{ output <- &imageTask{
Id: idx, Id: idx,
Reader: io.NopCloser(b), Reader: io.NopCloser(b),
Filename: f.Name,
} }
} }
} }
@ -401,8 +407,9 @@ func loadPdf(input string) (int, chan *imageTask, error) {
} }
output <- &imageTask{ output <- &imageTask{
Id: i, Id: i,
Reader: io.NopCloser(b), Reader: io.NopCloser(b),
Filename: fmt.Sprintf("page %d", i+1),
} }
} }
}() }()