From 04d2dd79d59cfd9231f1225037a060442c0a3d62 Mon Sep 17 00:00:00 2001 From: Milan Nikolic Date: Thu, 12 Jan 2023 08:44:00 +0100 Subject: [PATCH] Handle no-convert for directories, issue #9 --- cbconvert.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cbconvert.go b/cbconvert.go index 45d1fd0..5be79a9 100644 --- a/cbconvert.go +++ b/cbconvert.go @@ -469,7 +469,7 @@ func (c *Convertor) convertDirectory(dirPath string) error { if c.isNonImage(img) && !c.Opts.NoNonImage { err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))) if err != nil { - return fmt.Errorf("convertArchive: %w", err) + return fmt.Errorf("convertDirectory: %w", err) } err = file.Close() @@ -479,6 +479,14 @@ func (c *Convertor) convertDirectory(dirPath string) error { continue } else if c.isImage(img) { + if c.Opts.NoConvert { + err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))) + if err != nil { + return fmt.Errorf("convertDirectory: %w", err) + } + + continue + } i, err := c.decodeImage(file, img) if err != nil {