From f1804ce13c5e7aab55815a0672e9f568415ad537 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Sat, 4 Mar 2023 11:30:11 +0100
Subject: [PATCH] Refactor

---
 cbconvert.go          | 30 +++++++++++++++---------------
 cmd/cbconvert/main.go |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cbconvert.go b/cbconvert.go
index aab279c..e05d137 100644
--- a/cbconvert.go
+++ b/cbconvert.go
@@ -1118,8 +1118,8 @@ func (c *Convertor) Files(args []string) ([]string, error) {
 	return files, nil
 }
 
-// ExtractCover extracts cover.
-func (c *Convertor) ExtractCover(fileName string, fileInfo os.FileInfo) error {
+// Cover extracts cover.
+func (c *Convertor) Cover(fileName string, fileInfo os.FileInfo) error {
 	c.CurrFile++
 
 	cover, err := c.coverImage(fileName, fileInfo)
@@ -1153,11 +1153,11 @@ func (c *Convertor) ExtractCover(fileName string, fileInfo os.FileInfo) error {
 	return nil
 }
 
-// ExtractThumbnail extracts thumbnail.
-func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
+// Thumbnail extracts thumbnail.
+func (c *Convertor) Thumbnail(fileName string, info os.FileInfo) error {
 	c.CurrFile++
 
-	cover, err := c.coverImage(filename, info)
+	cover, err := c.coverImage(fileName, info)
 	if err != nil {
 		return err
 	}
@@ -1181,16 +1181,16 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
 
-	var fname string
-	var furi string
+	var fName string
+	var fUri string
 
 	if c.Opts.Outfile == "" {
-		furi = "file://" + filename
-		fname = filepath.Join(c.Opts.Outdir, fmt.Sprintf("%x.png", md5.Sum([]byte(furi))))
+		fUri = "file://" + fileName
+		fName = filepath.Join(c.Opts.Outdir, fmt.Sprintf("%x.png", md5.Sum([]byte(fUri))))
 	} else {
 		abs, _ := filepath.Abs(c.Opts.Outfile)
-		furi = "file://" + abs
-		fname = abs
+		fUri = "file://" + abs
+		fName = abs
 	}
 
 	err = mw.SetImageFormat("PNG")
@@ -1201,11 +1201,11 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
 	if err != nil {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
-	err = mw.SetImageProperty("Description", "Thumbnail of "+furi)
+	err = mw.SetImageProperty("Description", "Thumbnail of "+fUri)
 	if err != nil {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
-	err = mw.SetImageProperty("Thumb::URI", furi)
+	err = mw.SetImageProperty("Thumb::URI", fUri)
 	if err != nil {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
@@ -1217,12 +1217,12 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
 	if err != nil {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
-	err = mw.SetImageProperty("Thumb::Mimetype", mime.TypeByExtension(filepath.Ext(filename)))
+	err = mw.SetImageProperty("Thumb::Mimetype", mime.TypeByExtension(filepath.Ext(fileName)))
 	if err != nil {
 		return fmt.Errorf("extractThumbnail: %w", err)
 	}
 
-	return mw.WriteImage(fname)
+	return mw.WriteImage(fName)
 }
 
 // Convert converts comic book.
diff --git a/cmd/cbconvert/main.go b/cmd/cbconvert/main.go
index 8fc6ae9..11c813d 100644
--- a/cmd/cbconvert/main.go
+++ b/cmd/cbconvert/main.go
@@ -90,14 +90,14 @@ func main() {
 		}
 
 		if opts.Cover {
-			err = conv.ExtractCover(file, stat)
+			err = conv.Cover(file, stat)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)
 			}
 			continue
 		} else if opts.Thumbnail {
-			err = conv.ExtractThumbnail(file, stat)
+			err = conv.Thumbnail(file, stat)
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)