elie/cbconvert
1
0
Fork 0
mirror of https://github.com/gen2brain/cbconvert synced 2026-09-04 04:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Copy non-image files out of a directory too

Browse Source
This commit is contained in:
Milan Nikolic
2026-08-25 12:05:24 +02:00
parent 365ee2cdf9
commit 5d87cd59b6
2 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cbconvert_convert.go
+14 -8
View File
@@ -187,7 +187,7 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
// convertDirectory converts directory to CBZ.
func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error {
contents, err := imagesFromPath(dirPath)
contents, err := filesFromPath(dirPath)
if err != nil {
return fmt.Errorf("convertDirectory: %w", err)
}
@@ -215,13 +215,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
}
defer file.Close()
if isNonImage(img) && c.prefix == "" && !c.Opts.NoNonImage {
if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err)
}
return nil
} else if isImage(img) {
if isImage(img) {
if c.Opts.NoConvert {
if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err)
@@ -249,6 +243,18 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
return c.imageConvert(ctx, i, index, rel)
})
}
return nil
}
if filepath.Ext(img) == ".DS_Store" || strings.Contains(img, "__MACOSX") {
return nil
}
if c.prefix == "" && !c.Opts.NoNonImage {
if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err)
}
}
return nil