Handle no-convert for directories, issue #9

This commit is contained in:
Milan Nikolic
2023-01-12 08:44:00 +01:00
parent 2b2788ed6e
commit 04d2dd79d5

View File

@@ -469,7 +469,7 @@ func (c *Convertor) convertDirectory(dirPath string) error {
if c.isNonImage(img) && !c.Opts.NoNonImage { if c.isNonImage(img) && !c.Opts.NoNonImage {
err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))) err = c.copyFile(file, filepath.Join(c.Workdir, filepath.Base(img)))
if err != nil { if err != nil {
return fmt.Errorf("convertArchive: %w", err) return fmt.Errorf("convertDirectory: %w", err)
} }
err = file.Close() err = file.Close()
@@ -479,6 +479,14 @@ func (c *Convertor) convertDirectory(dirPath string) error {
continue continue
} else if c.isImage(img) { } 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) i, err := c.decodeImage(file, img)
if err != nil { if err != nil {