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

Merge pull request #22 from kianmeng/fix-typo

Browse Source 
Fix typo, convertor -> converter
This commit is contained in:
Milan Nikolic
2023-11-16 07:43:27 +01:00
committed by GitHub
parent 4fc3209b4e dd9000cfea
commit c32019615d
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
cbconvert.go
View File

@@ -132,8 +132,8 @@ type Options struct {
LevelsOutMax int LevelsOutMax int
} }
// Convertor type. // Converter type.
type Convertor struct { type Converter struct {
// Options struct // Options struct
Opts Options Opts Options
// Current working directory // Current working directory
@@ -186,16 +186,16 @@ func NewOptions() Options {
return o return o
} }
// New returns new convertor. // New returns new converter.
func New(o Options) *Convertor { func New(o Options) *Converter {
c := &Convertor{} c := &Converter{}
c.Opts = o c.Opts = o
return c return c
} }
// convertDocument converts PDF/EPUB document to CBZ. // convertDocument converts PDF/EPUB document to CBZ.
func (c *Convertor) convertDocument(ctx context.Context, fileName string) error { func (c *Converter) convertDocument(ctx context.Context, fileName string) error {
var err error var err error
c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc") c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
@@ -248,7 +248,7 @@ func (c *Convertor) convertDocument(ctx context.Context, fileName string) error
} }
// convertArchive converts archive to CBZ. // convertArchive converts archive to CBZ.
func (c *Convertor) convertArchive(ctx context.Context, fileName string) error { func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
var err error var err error
c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc") c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
@@ -358,7 +358,7 @@ func (c *Convertor) convertArchive(ctx context.Context, fileName string) error {
} }
// convertDirectory converts directory to CBZ. // convertDirectory converts directory to CBZ.
func (c *Convertor) convertDirectory(ctx context.Context, dirPath string) error { func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error {
var err error var err error
c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc") c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
@@ -466,7 +466,7 @@ func (c *Convertor) convertDirectory(ctx context.Context, dirPath string) error
} }
// imageConvert converts image.Image. // imageConvert converts image.Image.
func (c *Convertor) imageConvert(ctx context.Context, img image.Image, index int, pathName string) error { func (c *Converter) imageConvert(ctx context.Context, img image.Image, index int, pathName string) error {
err := ctx.Err() err := ctx.Err()
if err != nil { if err != nil {
return fmt.Errorf("imageConvert: %w", err) return fmt.Errorf("imageConvert: %w", err)
@@ -515,7 +515,7 @@ func (c *Convertor) imageConvert(ctx context.Context, img image.Image, index int
} }
// imageTransform transforms image (resize, rotate, brightness, contrast). // imageTransform transforms image (resize, rotate, brightness, contrast).
func (c *Convertor) imageTransform(img image.Image) image.Image { func (c *Converter) imageTransform(img image.Image) image.Image {
var i = img var i = img
if c.Opts.Width > 0 || c.Opts.Height > 0 { if c.Opts.Width > 0 || c.Opts.Height > 0 {
@@ -553,7 +553,7 @@ func (c *Convertor) imageTransform(img image.Image) image.Image {
} }
// imageLevel applies a Photoshop-like levels operation on an image. // imageLevel applies a Photoshop-like levels operation on an image.
func (c *Convertor) imageLevel(img image.Image) (image.Image, error) { func (c *Converter) imageLevel(img image.Image) (image.Image, error) {
mw := imagick.NewMagickWand() mw := imagick.NewMagickWand()
defer mw.Destroy() defer mw.Destroy()
@@ -595,7 +595,7 @@ func (c *Convertor) imageLevel(img image.Image) (image.Image, error) {
} }
// imageDecode decodes image from reader. // imageDecode decodes image from reader.
func (c *Convertor) imageDecode(reader io.Reader) (image.Image, error) { func (c *Converter) imageDecode(reader io.Reader) (image.Image, error) {
img, _, err := image.Decode(reader) img, _, err := image.Decode(reader)
if err != nil { if err != nil {
return img, fmt.Errorf("imageDecode: %w", err) return img, fmt.Errorf("imageDecode: %w", err)
@@ -605,7 +605,7 @@ func (c *Convertor) imageDecode(reader io.Reader) (image.Image, error) {
} }
// imDecode decodes image from reader (ImageMagick). // imDecode decodes image from reader (ImageMagick).
func (c *Convertor) imDecode(reader io.Reader, fileName string) (image.Image, error) { func (c *Converter) imDecode(reader io.Reader, fileName string) (image.Image, error) {
mw := imagick.NewMagickWand() mw := imagick.NewMagickWand()
defer mw.Destroy() defer mw.Destroy()
@@ -644,7 +644,7 @@ func (c *Convertor) imDecode(reader io.Reader, fileName string) (image.Image, er
} }
// imageEncode encodes image to file. // imageEncode encodes image to file.
func (c *Convertor) imageEncode(img image.Image, w io.Writer) error { func (c *Converter) imageEncode(img image.Image, w io.Writer) error {
var err error var err error
switch c.Opts.Format { switch c.Opts.Format {
@@ -666,7 +666,7 @@ func (c *Convertor) imageEncode(img image.Image, w io.Writer) error {
} }
// imEncode encodes image to file (ImageMagick). // imEncode encodes image to file (ImageMagick).
func (c *Convertor) imEncode(i image.Image, w io.Writer) error { func (c *Converter) imEncode(i image.Image, w io.Writer) error {
mw := imagick.NewMagickWand() mw := imagick.NewMagickWand()
defer mw.Destroy() defer mw.Destroy()
@@ -742,7 +742,7 @@ func (c *Convertor) imEncode(i image.Image, w io.Writer) error {
} }
// coverArchive extracts cover from archive. // coverArchive extracts cover from archive.
func (c *Convertor) coverArchive(fileName string) (image.Image, error) { func (c *Converter) coverArchive(fileName string) (image.Image, error) {
var images []string var images []string
contents, err := c.archiveList(fileName) contents, err := c.archiveList(fileName)
@@ -787,7 +787,7 @@ func (c *Convertor) coverArchive(fileName string) (image.Image, error) {
} }
// coverDocument extracts cover from document. // coverDocument extracts cover from document.
func (c *Convertor) coverDocument(fileName string) (image.Image, error) { func (c *Converter) coverDocument(fileName string) (image.Image, error) {
doc, err := fitz.New(fileName) doc, err := fitz.New(fileName)
if err != nil { if err != nil {
return nil, fmt.Errorf("coverDocument: %w", err) return nil, fmt.Errorf("coverDocument: %w", err)
@@ -803,7 +803,7 @@ func (c *Convertor) coverDocument(fileName string) (image.Image, error) {
} }
// coverDirectory extracts cover from directory. // coverDirectory extracts cover from directory.
func (c *Convertor) coverDirectory(dir string) (image.Image, error) { func (c *Converter) coverDirectory(dir string) (image.Image, error) {
contents, err := imagesFromPath(dir) contents, err := imagesFromPath(dir)
if err != nil { if err != nil {
return nil, fmt.Errorf("coverDirectory: %w", err) return nil, fmt.Errorf("coverDirectory: %w", err)
@@ -837,7 +837,7 @@ func (c *Convertor) coverDirectory(dir string) (image.Image, error) {
} }
// coverName returns the filename that is the most likely to be the cover. // coverName returns the filename that is the most likely to be the cover.
func (c *Convertor) coverName(images []string) string { func (c *Converter) coverName(images []string) string {
if len(images) == 0 { if len(images) == 0 {
return "" return ""
} }
@@ -868,7 +868,7 @@ func (c *Convertor) coverName(images []string) string {
} }
// coverImage returns cover as image.Image. // coverImage returns cover as image.Image.
func (c *Convertor) coverImage(fileName string, fileInfo os.FileInfo) (image.Image, error) { func (c *Converter) coverImage(fileName string, fileInfo os.FileInfo) (image.Image, error) {
var err error var err error
var cover image.Image var cover image.Image
@@ -893,24 +893,24 @@ func (c *Convertor) coverImage(fileName string, fileInfo os.FileInfo) (image.Ima
} }
// Initialize inits ImageMagick. // Initialize inits ImageMagick.
func (c *Convertor) Initialize() { func (c *Converter) Initialize() {
imagick.Initialize() imagick.Initialize()
} }
// Terminate terminates ImageMagick. // Terminate terminates ImageMagick.
func (c *Convertor) Terminate() { func (c *Converter) Terminate() {
imagick.Terminate() imagick.Terminate()
} }
// Cancel cancels the operation. // Cancel cancels the operation.
func (c *Convertor) Cancel() { func (c *Converter) Cancel() {
if c.OnCancel != nil { if c.OnCancel != nil {
c.OnCancel() c.OnCancel()
} }
} }
// Files returns list of found comic files. // Files returns list of found comic files.
func (c *Convertor) Files(args []string) ([]File, error) { func (c *Converter) Files(args []string) ([]File, error) {
var files []File var files []File
toFile := func(fp string, f os.FileInfo) File { toFile := func(fp string, f os.FileInfo) File {
@@ -1017,7 +1017,7 @@ func (c *Convertor) Files(args []string) ([]File, error) {
} }
// Cover extracts cover. // Cover extracts cover.
func (c *Convertor) Cover(fileName string, fileInfo os.FileInfo) error { func (c *Converter) Cover(fileName string, fileInfo os.FileInfo) error {
c.CurrFile++ c.CurrFile++
cover, err := c.coverImage(fileName, fileInfo) cover, err := c.coverImage(fileName, fileInfo)
@@ -1066,7 +1066,7 @@ func (c *Convertor) Cover(fileName string, fileInfo os.FileInfo) error {
} }
// Thumbnail extracts thumbnail. // Thumbnail extracts thumbnail.
func (c *Convertor) Thumbnail(fileName string, fileInfo os.FileInfo) error { func (c *Converter) Thumbnail(fileName string, fileInfo os.FileInfo) error {
c.CurrFile++ c.CurrFile++
cover, err := c.coverImage(fileName, fileInfo) cover, err := c.coverImage(fileName, fileInfo)
@@ -1142,7 +1142,7 @@ func (c *Convertor) Thumbnail(fileName string, fileInfo os.FileInfo) error {
} }
// Meta manipulates with CBZ metadata. // Meta manipulates with CBZ metadata.
func (c *Convertor) Meta(fileName string) (any, error) { func (c *Converter) Meta(fileName string) (any, error) {
c.CurrFile++ c.CurrFile++
switch { switch {
@@ -1189,7 +1189,7 @@ func (c *Convertor) Meta(fileName string) (any, error) {
} }
// Preview returns image preview. // Preview returns image preview.
func (c *Convertor) Preview(fileName string, fileInfo os.FileInfo, width, height int) (Image, error) { func (c *Converter) Preview(fileName string, fileInfo os.FileInfo, width, height int) (Image, error) {
var img Image var img Image
i, err := c.coverImage(fileName, fileInfo) i, err := c.coverImage(fileName, fileInfo)
@@ -1250,7 +1250,7 @@ func (c *Convertor) Preview(fileName string, fileInfo os.FileInfo, width, height
} }
// Convert converts comic book. // Convert converts comic book.
func (c *Convertor) Convert(fileName string, fileInfo os.FileInfo) error { func (c *Converter) Convert(fileName string, fileInfo os.FileInfo) error {
c.CurrFile++ c.CurrFile++
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())

16
cbconvert_arch.go
View File

@@ -12,7 +12,7 @@ import (
) )
// archiveSave saves workdir to CBZ archive. // archiveSave saves workdir to CBZ archive.
func (c *Convertor) archiveSave(fileName string) error { func (c *Converter) archiveSave(fileName string) error {
if c.Opts.Archive == "zip" { if c.Opts.Archive == "zip" {
return c.archiveSaveZip(fileName) return c.archiveSaveZip(fileName)
} else if c.Opts.Archive == "tar" { } else if c.Opts.Archive == "tar" {
@@ -23,7 +23,7 @@ func (c *Convertor) archiveSave(fileName string) error {
} }
// archiveSaveZip saves workdir to CBZ archive. // archiveSaveZip saves workdir to CBZ archive.
func (c *Convertor) archiveSaveZip(fileName string) error { func (c *Converter) archiveSaveZip(fileName string) error {
if c.OnCompress != nil { if c.OnCompress != nil {
c.OnCompress() c.OnCompress()
} }
@@ -97,7 +97,7 @@ func (c *Convertor) archiveSaveZip(fileName string) error {
} }
// archiveSaveTar saves workdir to CBT archive. // archiveSaveTar saves workdir to CBT archive.
func (c *Convertor) archiveSaveTar(fileName string) error { func (c *Converter) archiveSaveTar(fileName string) error {
if c.OnCompress != nil { if c.OnCompress != nil {
c.OnCompress() c.OnCompress()
} }
@@ -170,7 +170,7 @@ func (c *Convertor) archiveSaveTar(fileName string) error {
} }
// archiveList lists contents of archive. // archiveList lists contents of archive.
func (c *Convertor) archiveList(fileName string) ([]string, error) { func (c *Converter) archiveList(fileName string) ([]string, error) {
var contents []string var contents []string
archive, err := unarr.NewArchive(fileName) archive, err := unarr.NewArchive(fileName)
@@ -188,7 +188,7 @@ func (c *Convertor) archiveList(fileName string) ([]string, error) {
} }
// archiveComment returns ZIP comment. // archiveComment returns ZIP comment.
func (c *Convertor) archiveComment(fileName string) (string, error) { func (c *Converter) archiveComment(fileName string) (string, error) {
zr, err := zip.OpenReader(fileName) zr, err := zip.OpenReader(fileName)
if err != nil { if err != nil {
return "", fmt.Errorf("archiveComment: %w", err) return "", fmt.Errorf("archiveComment: %w", err)
@@ -199,7 +199,7 @@ func (c *Convertor) archiveComment(fileName string) (string, error) {
} }
// archiveSetComment sets ZIP comment. // archiveSetComment sets ZIP comment.
func (c *Convertor) archiveSetComment(fileName, commentBody string) error { func (c *Converter) archiveSetComment(fileName, commentBody string) error {
zr, err := zip.OpenReader(fileName) zr, err := zip.OpenReader(fileName)
if err != nil { if err != nil {
return fmt.Errorf("archiveSetComment: %w", err) return fmt.Errorf("archiveSetComment: %w", err)
@@ -263,7 +263,7 @@ func (c *Convertor) archiveSetComment(fileName, commentBody string) error {
} }
// archiveFileAdd adds file to archive. // archiveFileAdd adds file to archive.
func (c *Convertor) archiveFileAdd(fileName, newFileName string) error { func (c *Converter) archiveFileAdd(fileName, newFileName string) error {
zr, err := zip.OpenReader(fileName) zr, err := zip.OpenReader(fileName)
if err != nil { if err != nil {
return fmt.Errorf("archiveFileAdd: %w", err) return fmt.Errorf("archiveFileAdd: %w", err)
@@ -353,7 +353,7 @@ func (c *Convertor) archiveFileAdd(fileName, newFileName string) error {
} }
// archiveFileRemove removes files from archive. // archiveFileRemove removes files from archive.
func (c *Convertor) archiveFileRemove(fileName, pattern string) error { func (c *Converter) archiveFileRemove(fileName, pattern string) error {
zr, err := zip.OpenReader(fileName) zr, err := zip.OpenReader(fileName)
if err != nil { if err != nil {
return fmt.Errorf("archiveFileRemove: %w", err) return fmt.Errorf("archiveFileRemove: %w", err)

14
cmd/cbconvert-gui/main.go
View File

@@ -680,7 +680,7 @@ func status() iup.Ihandle {
SetCallback("POSTMESSAGE_CB", iup.PostMessageFunc(func(ih iup.Ihandle, s string, i int, p any) int { SetCallback("POSTMESSAGE_CB", iup.PostMessageFunc(func(ih iup.Ihandle, s string, i int, p any) int {
switch s { switch s {
case "convert": case "convert":
conv := p.(*cbconvert.Convertor) conv := p.(*cbconvert.Converter)
ih.SetAttributes("VALUE=0, VISIBLE=YES") ih.SetAttributes("VALUE=0, VISIBLE=YES")
ih.SetAttribute("MAX", conv.Ncontents) ih.SetAttribute("MAX", conv.Ncontents)
@@ -694,7 +694,7 @@ func status() iup.Ihandle {
iup.Refresh(iup.GetHandle("StatusBar")) iup.Refresh(iup.GetHandle("StatusBar"))
case "start": case "start":
conv := p.(*cbconvert.Convertor) conv := p.(*cbconvert.Converter)
ih.SetAttributes("VALUE=0, VISIBLE=YES") ih.SetAttributes("VALUE=0, VISIBLE=YES")
ih.SetAttribute("MAX", conv.Nfiles) ih.SetAttribute("MAX", conv.Nfiles)
@@ -704,13 +704,13 @@ func status() iup.Ihandle {
iup.GetHandle("LabelStatus2").SetAttributes("VISIBLE=YES") iup.GetHandle("LabelStatus2").SetAttributes("VISIBLE=YES")
case "progress": case "progress":
conv := p.(*cbconvert.Convertor) conv := p.(*cbconvert.Converter)
ih.SetAttribute("VALUE", conv.CurrContent) ih.SetAttribute("VALUE", conv.CurrContent)
iup.GetHandle("LabelStatus2").SetAttribute("TITLE", fmt.Sprintf("(%03d/%03d)", conv.CurrContent, conv.Ncontents)) iup.GetHandle("LabelStatus2").SetAttribute("TITLE", fmt.Sprintf("(%03d/%03d)", conv.CurrContent, conv.Ncontents))
iup.Refresh(iup.GetHandle("StatusBar")) iup.Refresh(iup.GetHandle("StatusBar"))
case "progress2": case "progress2":
conv := p.(*cbconvert.Convertor) conv := p.(*cbconvert.Converter)
ih.SetAttribute("VALUE", conv.CurrFile) ih.SetAttribute("VALUE", conv.CurrFile)
iup.GetHandle("LabelStatus2").SetAttribute("TITLE", fmt.Sprintf("(%03d/%03d)", conv.CurrFile, conv.Nfiles)) iup.GetHandle("LabelStatus2").SetAttribute("TITLE", fmt.Sprintf("(%03d/%03d)", conv.CurrFile, conv.Nfiles))
@@ -857,7 +857,7 @@ func onThumbnail(ih iup.Ihandle) int {
iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv) iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv)
go func(c *cbconvert.Convertor) { go func(c *cbconvert.Converter) {
c.Initialize() c.Initialize()
defer c.Terminate() defer c.Terminate()
@@ -903,7 +903,7 @@ func onCover(ih iup.Ihandle) int {
iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv) iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv)
go func(c *cbconvert.Convertor) { go func(c *cbconvert.Converter) {
c.Initialize() c.Initialize()
defer c.Terminate() defer c.Terminate()
@@ -952,7 +952,7 @@ func onConvert(ih iup.Ihandle) int {
return iup.DEFAULT return iup.DEFAULT
})) }))
go func(c *cbconvert.Convertor) { go func(c *cbconvert.Converter) {
c.Initialize() c.Initialize()
defer c.Terminate() defer c.Terminate()