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

Fix comic chapters, issue #50

Browse Source
This commit is contained in:
Milan Nikolic
2026-06-24 04:50:10 +02:00
parent 3c81595e08
commit b8d82e920c
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cbconvert_convert.go
+14 -9
View File
@@ -123,7 +123,7 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
if isImage(pathName) { if isImage(pathName) {
if c.Opts.NoConvert { if c.Opts.NoConvert {
if err = copyFile(bytes.NewReader(data), c.workPath(filepath.Base(pathName))); err != nil { if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
return fmt.Errorf("convertArchive: %w", err) return fmt.Errorf("convertArchive: %w", err)
} }
@@ -131,7 +131,7 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
} }
if cover == pathName && c.Opts.NoCover { if cover == pathName && c.Opts.NoCover {
if err = copyFile(bytes.NewReader(data), c.workPath(filepath.Base(pathName))); err != nil { if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
return fmt.Errorf("convertArchive: %w", err) return fmt.Errorf("convertArchive: %w", err)
} }
@@ -145,7 +145,7 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
} }
if c.Opts.NoRGB && !isGrayScale(img) { if c.Opts.NoRGB && !isGrayScale(img) {
if err = copyFile(bytes.NewReader(data), c.workPath(filepath.Base(pathName))); err != nil { if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
return fmt.Errorf("convertArchive: %w", err) return fmt.Errorf("convertArchive: %w", err)
} }
@@ -163,7 +163,7 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
} }
if c.prefix == "" && !c.Opts.NoNonImage { if c.prefix == "" && !c.Opts.NoNonImage {
if err = copyFile(bytes.NewReader(data), c.workPath(filepath.Base(pathName))); err != nil { if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
return fmt.Errorf("convertArchive: %w", err) return fmt.Errorf("convertArchive: %w", err)
} }
} }
@@ -206,13 +206,18 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
return fmt.Errorf("convertDirectory: %w", ctx.Err()) return fmt.Errorf("convertDirectory: %w", ctx.Err())
} }
rel, rerr := filepath.Rel(dirPath, img)
if rerr != nil {
rel = filepath.Base(img)
}
file, err := os.Open(img) file, err := os.Open(img)
if err != nil { if err != nil {
return fmt.Errorf("convertDirectory: %w", err) return fmt.Errorf("convertDirectory: %w", err)
} }
if isNonImage(img) && c.prefix == "" && !c.Opts.NoNonImage { if isNonImage(img) && c.prefix == "" && !c.Opts.NoNonImage {
if err = copyFile(file, c.workPath(filepath.Base(img))); err != nil { if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err) return fmt.Errorf("convertDirectory: %w", err)
} }
@@ -223,7 +228,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
continue continue
} else if isImage(img) { } else if isImage(img) {
if c.Opts.NoConvert { if c.Opts.NoConvert {
if err = copyFile(file, c.workPath(filepath.Base(img))); err != nil { if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err) return fmt.Errorf("convertDirectory: %w", err)
} }
@@ -241,7 +246,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
} }
if c.Opts.NoRGB && !isGrayScale(i) { if c.Opts.NoRGB && !isGrayScale(i) {
if err = copyFile(file, c.workPath(filepath.Base(img))); err != nil { if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
return fmt.Errorf("convertDirectory: %w", err) return fmt.Errorf("convertDirectory: %w", err)
} }
@@ -258,7 +263,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
if i != nil { if i != nil {
eg.Go(func() error { eg.Go(func() error {
return c.imageConvert(ctx, i, index, img) return c.imageConvert(ctx, i, index, rel)
}) })
} }
} }
@@ -296,7 +301,7 @@ func (c *Converter) imageConvert(ctx context.Context, img image.Image, index int
var fileName string var fileName string
if pathName != "" { if pathName != "" {
fileName = c.workPath(fmt.Sprintf("%s.%s", baseNoExt(pathName), ext)) fileName = c.workPath(fmt.Sprintf("%s.%s", flatName(strings.TrimSuffix(pathName, filepath.Ext(pathName))), ext))
} else { } else {
fileName = c.workPath(fmt.Sprintf("%03d.%s", index, ext)) fileName = c.workPath(fmt.Sprintf("%03d.%s", index, ext))
} }
cbconvert_func.go
+6
View File
@@ -123,6 +123,12 @@ func baseNoExt(filename string) string {
return strings.TrimSuffix(filepath.Base(filename), filepath.Ext(filename)) return strings.TrimSuffix(filepath.Base(filename), filepath.Ext(filename))
} }
// flatName flattens a path into a single collision-free name by replacing separators.
func flatName(name string) string {
name = strings.ReplaceAll(name, "\\", "/")
return strings.ReplaceAll(name, "/", "_")
}
// copyFile copies reader to file. // copyFile copies reader to file.
func copyFile(reader io.Reader, filename string) error { func copyFile(reader io.Reader, filename string) error {
err := os.MkdirAll(filepath.Dir(filename), 0755) err := os.MkdirAll(filepath.Dir(filename), 0755)