internal/pkg/converter/converter.go

@@ -407,7 +407,8 @@ func (c *Converter) Validate() error {
 // Fatal Helper to show usage, err and exit 1
 func (c *Converter) Fatal(err error) {
 	c.Cmd.Usage()
-	utils.Fatalf("\nError: %s\n", err)
+	utils.Printf("\nError: %s\n", err)
+	os.Exit(1)
 }
 
 func (c *Converter) Stats() {

internal/pkg/epub/epub.go

@@ -214,7 +214,7 @@ func (e EPUB) getParts() (parts []epubPart, imgStorage epubzip.StorageImageReade
 
 	parts = make([]epubPart, 0)
 	cover := images[0]
-	if e.Image.HasCover || (cover.DoublePage && !e.Image.KeepDoublePageIfSplit) {
+	if e.Image.HasCover {
 		images = images[1:]
 	}
 

internal/pkg/epubimageprocessor/loader.go

@@ -319,7 +319,8 @@ func (e EPUBImageProcessor) loadCbr() (totalImages int, output chan task, err er
 		if isSolid && !e.Dry {
 			r, rerr := rardecode.OpenReader(e.Input)
 			if rerr != nil {
-				utils.Fatalf("\nerror processing image %s: %s\n", e.Input, rerr)
+				utils.Printf("\nerror processing image %s: %s\n", e.Input, rerr)
+				os.Exit(1)
 			}
 			defer func(r *rardecode.ReadCloser) {
 				_ = r.Close()
@@ -330,13 +331,15 @@ func (e EPUBImageProcessor) loadCbr() (totalImages int, output chan task, err er
 					if rerr == io.EOF {
 						break
 					}
-					utils.Fatalf("\nerror processing image %s: %s\n", f.Name, rerr)
+					utils.Printf("\nerror processing image %s: %s\n", f.Name, rerr)
+					os.Exit(1)
 				}
 				if i, ok := indexedNames[f.Name]; ok {
 					var b bytes.Buffer
 					_, rerr = io.Copy(&b, r)
 					if rerr != nil {
-						utils.Fatalf("\nerror processing image %s: %s\n", f.Name, rerr)
+						utils.Printf("\nerror processing image %s: %s\n", f.Name, rerr)
+						os.Exit(1)
 					}
 					jobs <- job{i, f.Name, func() (io.ReadCloser, error) {
 						return io.NopCloser(bytes.NewReader(b.Bytes())), nil

internal/pkg/epubimageprocessor/processor.go

@@ -5,6 +5,7 @@ import (
 	"image"
 	"image/color"
 	"image/draw"
+	"os"
 	"sync"
 
 	"github.com/disintegration/gift"
@@ -83,7 +84,8 @@ func (e EPUBImageProcessor) Load() (images []epubimage.EPUBImage, err error) {
 					e.EPUBOptions.Image.AutoSplitDoublePage && !e.EPUBOptions.Image.KeepDoublePageIfSplit) {
 					if err = imgStorage.Add(img.EPUBImgPath(), img.Raw, e.Image.Quality); err != nil {
 						_ = bar.Close()
-						utils.Fatalln("error with %s: %s", input.Name, err)
+						utils.Printf("error with %s: %s", input.Name, err)
+						os.Exit(1)
 					}
 					// do not keep raw image except for cover
 					if img.Id > 0 {
@@ -103,7 +105,8 @@ func (e EPUBImageProcessor) Load() (images []epubimage.EPUBImage, err error) {
 					img = e.transformImage(input, i+1, b)
 					if err = imgStorage.Add(img.EPUBImgPath(), img.Raw, e.Image.Quality); err != nil {
 						_ = bar.Close()
-						utils.Fatalf("error with %s: %s", input.Name, err)
+						utils.Printf("error with %s: %s", input.Name, err)
+						os.Exit(1)
 					}
 					img.Raw = nil
 					imageOutput <- img

internal/pkg/utils/utils.go

@@ -10,20 +10,10 @@ func Printf(format string, a ...interface{}) {
 	_, _ = fmt.Fprintf(os.Stderr, format, a...)
 }
 
-func Fatalf(format string, args ...interface{}) {
-	Printf(format, args...)
-	os.Exit(1)
-}
-
 func Println(a ...interface{}) {
 	_, _ = fmt.Fprintln(os.Stderr, a...)
 }
 
-func Fatalln(a ...interface{}) {
-	Println(a...)
-	os.Exit(1)
-}
-
 func IntToString(i int) string {
 	return strconv.FormatInt(int64(i), 10)
 }

main.go

@@ -46,7 +46,8 @@ func main() {
 func version() {
 	bi, ok := debug.ReadBuildInfo()
 	if !ok {
-		utils.Fatalln("failed to fetch current version")
+		utils.Println("failed to fetch current version")
+		os.Exit(1)
 	}
 
 	githubTag := &latest.GithubTag{
@@ -55,7 +56,8 @@ func version() {
 	}
 	v, err := githubTag.Fetch()
 	if err != nil || len(v.Versions) < 1 {
-		utils.Fatalln("failed to fetch the latest version")
+		utils.Println("failed to fetch the latest version")
+		os.Exit(1)
 	}
 	latestVersion := v.Versions[0]
 
@@ -182,7 +184,8 @@ func generate(cmd *converter.Converter) {
 			AppleBookCompatibility: cmd.Options.AppleBookCompatibility,
 		},
 	}).Write(); err != nil {
-		utils.Fatalf("Error: %v\n", err)
+		utils.Printf("Error: %v\n", err)
+		os.Exit(1)
 	}
 	if !cmd.Options.Dry {
 		cmd.Stats()