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

combine print and exit 1 to fatal

Browse Source
This commit is contained in:
Celogeek 2024-05-18 14:54:49 +02:00
parent 0c8e54f0c4
commit 2755aae487
Signed by: celogeek
SSH Key Fingerprint: SHA256:njNJLzoLQdbV9PC6ehcruRb0QnEgxABoCYZ+0+aUIYc
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/pkg/converter/converter.go
View File

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

9
internal/pkg/epubimageprocessor/loader.go
View File

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

7
internal/pkg/epubimageprocessor/processor.go
View File

@ -5,7 +5,6 @@ import (
"image"
"image/color"
"image/draw"
"os"
"sync"
"github.com/disintegration/gift"
@ -84,8 +83,7 @@ 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.Printf("error with %s: %s", input.Name, err)
os.Exit(1)
utils.Fatalln("error with %s: %s", input.Name, err)
}
// do not keep raw image except for cover
if img.Id > 0 {
@ -105,8 +103,7 @@ 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.Printf("error with %s: %s", input.Name, err)
os.Exit(1)
utils.Fatalf("error with %s: %s", input.Name, err)
}
img.Raw = nil
imageOutput <- img

10
internal/pkg/utils/utils.go
View File

@ -10,10 +10,20 @@ 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)
}

9
main.go
View File

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