elie/cbconvert
1
0
Fork 0
mirror of https://github.com/gen2brain/cbconvert synced 2025-10-14 10:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Milan Nikolic
2023-03-04 11:30:11 +01:00
parent a74034d669
commit f1804ce13c
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cbconvert.go
View File

@@ -1118,8 +1118,8 @@ func (c *Convertor) Files(args []string) ([]string, error) {
return files, nil return files, nil
} }
// ExtractCover extracts cover. // Cover extracts cover.
func (c *Convertor) ExtractCover(fileName string, fileInfo os.FileInfo) error { func (c *Convertor) Cover(fileName string, fileInfo os.FileInfo) error {
c.CurrFile++ c.CurrFile++
cover, err := c.coverImage(fileName, fileInfo) cover, err := c.coverImage(fileName, fileInfo)
@@ -1153,11 +1153,11 @@ func (c *Convertor) ExtractCover(fileName string, fileInfo os.FileInfo) error {
return nil return nil
} }
// ExtractThumbnail extracts thumbnail. // Thumbnail extracts thumbnail.
func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error { func (c *Convertor) Thumbnail(fileName string, info os.FileInfo) error {
c.CurrFile++ c.CurrFile++
cover, err := c.coverImage(filename, info) cover, err := c.coverImage(fileName, info)
if err != nil { if err != nil {
return err return err
} }
@@ -1181,16 +1181,16 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
return fmt.Errorf("extractThumbnail: %w", err) return fmt.Errorf("extractThumbnail: %w", err)
} }
var fname string var fName string
var furi string var fUri string
if c.Opts.Outfile == "" { if c.Opts.Outfile == "" {
furi = "file://" + filename fUri = "file://" + fileName
fname = filepath.Join(c.Opts.Outdir, fmt.Sprintf("%x.png", md5.Sum([]byte(furi)))) fName = filepath.Join(c.Opts.Outdir, fmt.Sprintf("%x.png", md5.Sum([]byte(fUri))))
} else { } else {
abs, _ := filepath.Abs(c.Opts.Outfile) abs, _ := filepath.Abs(c.Opts.Outfile)
furi = "file://" + abs fUri = "file://" + abs
fname = abs fName = abs
} }
err = mw.SetImageFormat("PNG") err = mw.SetImageFormat("PNG")
@@ -1201,11 +1201,11 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
if err != nil { if err != nil {
return fmt.Errorf("extractThumbnail: %w", err) return fmt.Errorf("extractThumbnail: %w", err)
} }
err = mw.SetImageProperty("Description", "Thumbnail of "+furi) err = mw.SetImageProperty("Description", "Thumbnail of "+fUri)
if err != nil { if err != nil {
return fmt.Errorf("extractThumbnail: %w", err) return fmt.Errorf("extractThumbnail: %w", err)
} }
err = mw.SetImageProperty("Thumb::URI", furi) err = mw.SetImageProperty("Thumb::URI", fUri)
if err != nil { if err != nil {
return fmt.Errorf("extractThumbnail: %w", err) return fmt.Errorf("extractThumbnail: %w", err)
} }
@@ -1217,12 +1217,12 @@ func (c *Convertor) ExtractThumbnail(filename string, info os.FileInfo) error {
if err != nil { if err != nil {
return fmt.Errorf("extractThumbnail: %w", err) 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 { if err != nil {
return fmt.Errorf("extractThumbnail: %w", err) return fmt.Errorf("extractThumbnail: %w", err)
} }
return mw.WriteImage(fname) return mw.WriteImage(fName)
} }
// Convert converts comic book. // Convert converts comic book.

4
cmd/cbconvert/main.go
View File

@@ -90,14 +90,14 @@ func main() {
} }
if opts.Cover { if opts.Cover {
err = conv.ExtractCover(file, stat) err = conv.Cover(file, stat)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
continue continue
} else if opts.Thumbnail { } else if opts.Thumbnail {
err = conv.ExtractThumbnail(file, stat) err = conv.Thumbnail(file, stat)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)