Update modules

README.md

@@ -26,23 +26,6 @@ Download the latest binaries from the [releases](https://github.com/gen2brain/cb
 
 Linux Flatpak is available at [Flathub](https://flathub.org/apps/io.github.gen2brain.cbconvert).
 
-### Compile
-
-You must have `CGO_ENABLED=1`. Note that `Go` will disable cgo when cross-compiling.
-
-Install to `GOBIN` (you can point `GOBIN` to e.g. `/usr/local/bin` or `~/.local/bin`):
-
-`go install github.com/gen2brain/cbconvert/cmd/cbconvert@latest`
-
-For GUI app, check [IUP](https://github.com/gen2brain/iup-go) requirements, and then install:
-
-`go install github.com/gen2brain/cbconvert/cmd/cbconvert-gui@latest`
-
-### Build tags
-
-* `extlib` - use external `libmupdf` and `libunarr` libraries
-* `pkgconfig` - enable pkg-config (used with `extlib`)
-
 ### Using cbconvert in file managers to generate FreeDesktop thumbnails
 
 Copy/install `cbconvert` cli binary to your `PATH`, create file `~/.local/share/thumbnailers/cbconvert.thumbnailer`
@@ -56,117 +39,115 @@ This is what it looks like in the `PCManFM` file manager:
 ### Using command line app
 
 ```
-Usage: cbconvert <command> [<flags>] [file1 dir1 ... fileOrDirN]
+    Usage: cbconvert <command> [<flags>] [file1 dir1 ... fileOrDirN]
 
 
-Commands:
+    Commands:
 
-  convert
+      convert
-    	Convert archive or document
+            Convert archive or document
 
-    --width
+        --width
-    	Image width (default "0")
+            Image width (default "0")
-    --height
+        --height
-    	Image height (default "0")
+            Image height (default "0")
-    --fit
+        --fit
-    	Best fit for required width and height (default "false")
+            Best fit for required width and height (default "false")
-    --format
+        --format
-    	Image format, valid values are jpeg, png, tiff, bmp, webp, avif, jxl (default "jpeg")
+            Image format, valid values are jpeg, png, tiff, bmp, webp, avif, jxl (default "jpeg")
-    --archive
+        --archive
-    	Archive format, valid values are zip, tar (default "zip")
+            Archive format, valid values are zip, tar (default "zip")
-    --quality
+        --quality
-    	Image quality (default "75")
+            Image quality (default "75")
-    --filter
+        --filter
-    	0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
+            0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
-    --no-cover
+        --no-cover
-    	Do not convert the cover image (default "false")
+            Do not convert the cover image (default "false")
-    --no-rgb
+        --no-rgb
-    	Do not convert images that have RGB colorspace (default "false")
+            Do not convert images that have RGB colorspace (default "false")
-    --no-nonimage
+        --no-nonimage
-    	Remove non-image files from the archive (default "false")
+            Remove non-image files from the archive (default "false")
-    --no-convert
+        --no-convert
-    	Do not transform or convert images (default "false")
+            Do not transform or convert images (default "false")
-    --grayscale
+        --grayscale
-    	Convert images to grayscale (monochromatic) (default "false")
+            Convert images to grayscale (monochromatic) (default "false")
-    --rotate
+        --rotate
-    	Rotate images, valid values are 0, 90, 180, 270 (default "0")
+            Rotate images, valid values are 0, 90, 180, 270 (default "0")
-    --brightness
+        --brightness
-    	Adjust the brightness of the images, must be in the range (-100, 100) (default "0")
+            Adjust the brightness of the images, must be in the range (-100, 100) (default "0")
-    --contrast
+        --contrast
-    	Adjust the contrast of the images, must be in the range (-100, 100) (default "0")
+            Adjust the contrast of the images, must be in the range (-100, 100) (default "0")
-    --suffix
+        --suffix
-    	Add suffix to file basename (default "")
+            Add suffix to file basename (default "")
-    --outdir
+        --outdir
-    	Output directory (default ".")
+            Output directory (default ".")
-    --size
+        --size
-    	Process only files larger than size (in MB) (default "0")
+            Process only files larger than size (in MB) (default "0")
-    --recursive
+        --recursive
-    	Process subdirectories recursively (default "false")
+            Process subdirectories recursively (default "false")
-    --quiet
+        --quiet
-    	Hide console output (default "false")
+            Hide console output (default "false")
 
-  cover
+      cover
-    	Extract cover
+            Extract cover
 
-    --width
+        --width
-    	Image width (default "0")
+            Image width (default "0")
-    --height
+        --height
-    	Image height (default "0")
+            Image height (default "0")
-    --fit
+        --fit
-    	Best fit for required width and height (default "false")
+            Best fit for required width and height (default "false")
-    --format
+        --format
-    	Image format, valid values are jpeg, png, tiff, bmp, webp, avif (default "jpeg")
+            Image format, valid values are jpeg, png, tiff, bmp, webp, avif, jxl (default "jpeg")
-    --quality
+        --quality
-    	Image quality (default "75")
+            Image quality (default "75")
-    --filter
+        --filter
-    	0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
+            0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
-    --outdir
+        --outdir
-    	Output directory (default ".")
+            Output directory (default ".")
-    --size
+        --size
-    	Process only files larger than size (in MB) (default "0")
+            Process only files larger than size (in MB) (default "0")
-    --recursive
+        --recursive
-    	Process subdirectories recursively (default "false")
+            Process subdirectories recursively (default "false")
-    --quiet
+        --quiet
-    	Hide console output (default "false")
+            Hide console output (default "false")
 
-  thumbnail
+      thumbnail
-    	Extract cover thumbnail (freedesktop spec.)
+            Extract cover thumbnail (freedesktop spec.)
 
-    --width
+        --width
-    	Image width (default "0")
+            Image width (default "0")
-    --height
+        --height
-    	Image height (default "0")
+            Image height (default "0")
-    --fit
+        --fit
-    	Best fit for required width and height (default "false")
+            Best fit for required width and height (default "false")
-    --filter
+        --filter
-    	0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
+            0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos (default "2")
-    --outdir
+        --outdir
-    	Output directory (default ".")
+            Output directory (default ".")
-    --outfile
+        --outfile
-    	Output file (default "")
+            Output file (default "")
-    --size
+        --size
-    	Process only files larger than size (in MB) (default "0")
+            Process only files larger than size (in MB) (default "0")
-    --recursive
+        --recursive
-    	Process subdirectories recursively (default "false")
+            Process subdirectories recursively (default "false")
-    --quiet
+        --quiet
-    	Hide console output (default "false")
+            Hide console output (default "false")
 
-  meta
+      meta
-    	CBZ metadata
+            CBZ metadata
 
-    --cover
+        --cover
-    	Print cover name (default "false")
+            Print cover name (default "false")
-    --comment
+        --comment
-    	Print zip comment (default "false")
+            Print zip comment (default "false")
-    --comment-body
+        --comment-body
-    	Set zip comment (default "")
+            Set zip comment (default "")
-    --file-add
+        --file-add
-    	Add file to archive (default "")
+            Add file to archive (default "")
-    --file-remove
+        --file-remove
-    	Remove file from archive (glob pattern, i.e. *.xml) (default "")
+            Remove file(s) from archive (glob pattern, i.e. *.xml) (default "")
 
-  version
-    	Print version
 ```
 
 ### Examples
@@ -199,3 +180,19 @@ This table maps quality settings for JPEG to the respective AVIF and WEBP qualit
 | AVIF quality | 48 | 51 | 56 | 64 |
 | WEBP quality | 55 | 64 | 72 | 82 |
 
+### Compile
+
+You must have `CGO_ENABLED=1`. Note that `Go` will disable cgo when cross-compiling.
+
+Install to `GOBIN` (you can point `GOBIN` to e.g. `/usr/local/bin` or `~/.local/bin`):
+
+`go install github.com/gen2brain/cbconvert/cmd/cbconvert@latest`
+
+For GUI app, check [IUP](https://github.com/gen2brain/iup-go) requirements, and then install:
+
+`go install github.com/gen2brain/cbconvert/cmd/cbconvert-gui@latest`
+
+### Build tags
+
+* `extlib` - use external `libmupdf` and `libunarr` libraries
+* `pkgconfig` - enable pkg-config (used with `extlib`)

cbconvert.go

@@ -25,12 +25,6 @@ type Options struct {
 	Archive string
 	// JPEG image quality
 	Quality int
-	// Encoder speed/effort, format-specific: webp method 0-6, avif speed 0-10, jxl effort 1-10; -1 uses the format default
-	Effort int
-	// Combine all inputs into a single archive
-	Combine bool
-	// Lossless enables lossless compression (webp, avif, jxl), ignores quality
-	Lossless bool
 	// Image width
 	Width int
 	// Image height
@@ -91,11 +85,9 @@ type Converter struct {
 	Opts Options
 	// Current working directory
 	Workdir string
-	// Page name prefix, set per input when combining
-	prefix string
 	// Number of files
 	Nfiles int
-	// Index of the current file
+	// Index of current file
 	CurrFile int
 	// Number of contents in archive/document
 	Ncontents int
@@ -133,7 +125,6 @@ func NewOptions() Options {
 	o.Format = "jpeg"
 	o.Archive = "zip"
 	o.Quality = 75
-	o.Effort = -1
 	o.Filter = 2
 
 	return o
@@ -495,7 +486,7 @@ func (c *Converter) Preview(fileName string, fileInfo os.FileInfo, width, height
 	return img, nil
 }
 
-// Convert converts a comic book.
+// Convert converts comic book.
 func (c *Converter) Convert(fileName string, fileInfo os.FileInfo) error {
 	c.CurrFile++
 
@@ -503,13 +494,6 @@ func (c *Converter) Convert(fileName string, fileInfo os.FileInfo) error {
 	defer cancel()
 
 	c.OnCancel = cancel
-	c.prefix = ""
-
-	var err error
-	c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
-	if err != nil {
-		return fmt.Errorf("%s: %w", fileName, err)
-	}
 
 	switch {
 	case fileInfo.IsDir():
@@ -534,52 +518,3 @@ func (c *Converter) Convert(fileName string, fileInfo os.FileInfo) error {
 
 	return nil
 }
-
-// Combine merges multiple comic books into a single archive.
-func (c *Converter) Combine(files []File) error {
-	if len(files) == 0 {
-		return nil
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	c.OnCancel = cancel
-
-	var err error
-	c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
-	if err != nil {
-		return fmt.Errorf("Combine: %w", err)
-	}
-
-	for i, file := range files {
-		c.CurrFile++
-		c.prefix = fmt.Sprintf("%04d_", i+1)
-
-		switch {
-		case file.Stat.IsDir():
-			err = c.convertDirectory(ctx, file.Path)
-		case isDocument(file.Path):
-			err = c.convertDocument(ctx, file.Path)
-		case isArchive(file.Path):
-			err = c.convertArchive(ctx, file.Path)
-		}
-
-		if err != nil {
-			return fmt.Errorf("%s: %w", file.Path, err)
-		}
-	}
-
-	out := c.Opts.OutFile
-	if out == "" {
-		out = baseNoExt(files[0].Path) + "-combined"
-	}
-
-	if err := c.archiveSave(out); err != nil {
-		return fmt.Errorf("Combine: %w", err)
-	}
-
-	c.OnCancel = nil
-
-	return nil
-}

cbconvert_archive.go

@@ -3,15 +3,13 @@ package cbconvert
 import (
 	"archive/tar"
 	"archive/zip"
-	"context"
 	"fmt"
 	"io"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/mholt/archives"
+	"github.com/gen2brain/go-unarr"
 )
 
 // archiveSave saves workdir to CBZ archive.
@@ -174,70 +172,17 @@ func (c *Converter) archiveSaveTar(fileName string) error {
 	return nil
 }
 
-// archiveOpen identifies the archive and returns its extractor and a reader positioned at the start.
-func archiveOpen(ctx context.Context, fileName string) (io.ReadCloser, archives.Extractor, io.Reader, error) {
-	file, err := os.Open(fileName)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	format, input, err := archives.Identify(ctx, fileName, file)
-	if err != nil {
-		file.Close()
-		return nil, nil, nil, err
-	}
-
-	ex, ok := format.(archives.Extractor)
-	if !ok {
-		file.Close()
-		return nil, nil, nil, fmt.Errorf("%s: unsupported archive format", fileName)
-	}
-
-	return file, ex, input, nil
-}
-
-// FileType returns the detected archive container, document extension, or "DIR".
-func FileType(path string) string {
-	if isArchive(path) {
-		file, err := os.Open(path)
-		if err == nil {
-			defer file.Close()
-
-			format, _, err := archives.Identify(context.Background(), path, file)
-			if err == nil {
-				return strings.ToUpper(strings.TrimPrefix(format.Extension(), "."))
-			}
-		}
-	}
-
-	if info, err := os.Stat(path); err == nil && info.IsDir() {
-		return "DIR"
-	}
-
-	return strings.ToUpper(strings.TrimPrefix(filepath.Ext(path), "."))
-}
-
 // archiveList lists contents of archive.
 func (c *Converter) archiveList(fileName string) ([]string, error) {
 	var contents []string
 
-	ctx := context.Background()
+	archive, err := unarr.NewArchive(fileName)
-
-	file, ex, input, err := archiveOpen(ctx, fileName)
 	if err != nil {
 		return contents, fmt.Errorf("archiveList: %w", err)
 	}
-	defer file.Close()
+	defer archive.Close()
 
-	err = ex.Extract(ctx, input, func(ctx context.Context, f archives.FileInfo) error {
+	contents, err = archive.List()
-		if f.IsDir() {
-			return nil
-		}
-
-		contents = append(contents, f.NameInArchive)
-
-		return nil
-	})
 	if err != nil {
 		return contents, fmt.Errorf("archiveList: %w", err)
 	}
@@ -245,43 +190,6 @@ func (c *Converter) archiveList(fileName string) ([]string, error) {
 	return contents, nil
 }
 
-// archiveFile returns the contents of a single named file from the archive.
-func (c *Converter) archiveFile(fileName, name string) ([]byte, error) {
-	var data []byte
-
-	ctx := context.Background()
-
-	file, ex, input, err := archiveOpen(ctx, fileName)
-	if err != nil {
-		return nil, fmt.Errorf("archiveFile: %w", err)
-	}
-	defer file.Close()
-
-	err = ex.Extract(ctx, input, func(ctx context.Context, f archives.FileInfo) error {
-		if f.NameInArchive != name {
-			return nil
-		}
-
-		rc, err := f.Open()
-		if err != nil {
-			return err
-		}
-		defer rc.Close()
-
-		data, err = io.ReadAll(rc)
-		if err != nil {
-			return err
-		}
-
-		return fs.SkipAll
-	})
-	if err != nil {
-		return nil, fmt.Errorf("archiveFile: %w", err)
-	}
-
-	return data, nil
-}
-
 // archiveComment returns ZIP comment.
 func (c *Converter) archiveComment(fileName string) (string, error) {
 	zr, err := zip.OpenReader(fileName)
@@ -357,7 +265,7 @@ func (c *Converter) archiveSetComment(fileName, commentBody string) error {
 	return nil
 }
 
-// archiveFileAdd adds a file to the archive.
+// archiveFileAdd adds file to archive.
 func (c *Converter) archiveFileAdd(fileName, newFileName string) error {
 	zr, err := zip.OpenReader(fileName)
 	if err != nil {

cbconvert_convert.go

@@ -3,6 +3,7 @@ package cbconvert
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"image"
 	"image/png"
@@ -15,17 +16,24 @@ import (
 
 	"github.com/gen2brain/avif"
 	"github.com/gen2brain/go-fitz"
+	"github.com/gen2brain/go-unarr"
 	"github.com/gen2brain/jpegli"
 	"github.com/gen2brain/jpegxl"
 	"github.com/gen2brain/webp"
 	"github.com/jsummers/gobmp"
-	"github.com/mholt/archives"
 	"golang.org/x/image/tiff"
 	"golang.org/x/sync/errgroup"
 )
 
 // convertDocument converts PDF/EPUB document to CBZ.
 func (c *Converter) convertDocument(ctx context.Context, fileName string) error {
+	var err error
+
+	c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
+	if err != nil {
+		return fmt.Errorf("convertDocument: %w", err)
+	}
+
 	doc, err := fitz.New(fileName)
 	if err != nil {
 		return fmt.Errorf("convertDocument: %w", err)
@@ -70,6 +78,13 @@ func (c *Converter) convertDocument(ctx context.Context, fileName string) error
 
 // convertArchive converts archive to CBZ.
 func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
+	var err error
+
+	c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
+	if err != nil {
+		return fmt.Errorf("convertArchive: %w", err)
+	}
+
 	contents, err := c.archiveList(fileName)
 	if err != nil {
 		return fmt.Errorf("convertArchive: %w", err)
@@ -86,56 +101,51 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
 
 	cover := c.coverName(images)
 
-	eg, ctx := errgroup.WithContext(ctx)
+	archive, err := unarr.NewArchive(fileName)
-	eg.SetLimit(runtime.NumCPU() + 1)
-
-	file, ex, input, err := archiveOpen(ctx, fileName)
 	if err != nil {
 		return fmt.Errorf("convertArchive: %w", err)
 	}
-	defer file.Close()
+	defer archive.Close()
 
-	err = ex.Extract(ctx, input, func(ctx context.Context, f archives.FileInfo) error {
+	eg, ctx := errgroup.WithContext(ctx)
-		if err := ctx.Err(); err != nil {
+	eg.SetLimit(runtime.NumCPU() + 1)
-			return err
+
+	for {
+		if ctx.Err() != nil {
+			return fmt.Errorf("convertArchive: %w", ctx.Err())
 		}
 
-		if f.IsDir() {
+		err := archive.Entry()
-			return nil
+		if err != nil {
+			if errors.Is(err, io.EOF) {
+				break
+			}
+
+			return fmt.Errorf("convertArchive: %w", err)
 		}
 
-		pathName := f.NameInArchive
+		data, err := archive.ReadAll()
-
-		rc, err := f.Open()
 		if err != nil {
 			return fmt.Errorf("convertArchive: %w", err)
 		}
 
-		data, err := io.ReadAll(rc)
+		pathName := archive.Name()
-		if err != nil {
-			rc.Close()
-			return fmt.Errorf("convertArchive: %w", err)
-		}
-
-		if err = rc.Close(); err != nil {
-			return fmt.Errorf("convertArchive: %w", err)
-		}
 
 		if isImage(pathName) {
 			if c.Opts.NoConvert {
-				if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
 					return fmt.Errorf("convertArchive: %w", err)
 				}
 
-				return nil
+				continue
 			}
 
 			if cover == pathName && c.Opts.NoCover {
-				if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
 					return fmt.Errorf("convertArchive: %w", err)
 				}
 
-				return nil
+				continue
 			}
 
 			var img image.Image
@@ -145,11 +155,11 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
 			}
 
 			if c.Opts.NoRGB && !isGrayScale(img) {
-				if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
 					return fmt.Errorf("convertArchive: %w", err)
 				}
 
-				return nil
+				continue
 			}
 
 			if img != nil {
@@ -159,23 +169,18 @@ func (c *Converter) convertArchive(ctx context.Context, fileName string) error {
 			}
 		} else {
 			if filepath.Ext(pathName) == ".DS_Store" || strings.Contains(pathName, "__MACOSX") {
-				return nil
+				continue
 			}
 
-			if c.prefix == "" && !c.Opts.NoNonImage {
+			if !c.Opts.NoNonImage {
-				if err = copyFile(bytes.NewReader(data), c.workPath(flatName(pathName))); err != nil {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
 					return fmt.Errorf("convertArchive: %w", err)
 				}
 			}
 		}
-
-		return nil
-	})
-
-	if werr := eg.Wait(); werr != nil {
-		return fmt.Errorf("convertArchive: %w", werr)
 	}
 
+	err = eg.Wait()
 	if err != nil {
 		return fmt.Errorf("convertArchive: %w", err)
 	}
@@ -185,6 +190,13 @@ 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 {
+	var err error
+
+	c.Workdir, err = os.MkdirTemp(os.TempDir(), "cbc")
+	if err != nil {
+		return fmt.Errorf("convertDirectory: %w", err)
+	}
+
 	contents, err := imagesFromPath(dirPath)
 	if err != nil {
 		return fmt.Errorf("convertDirectory: %w", err)
@@ -206,18 +218,13 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
 			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)
 		if err != nil {
 			return fmt.Errorf("convertDirectory: %w", err)
 		}
 
-		if isNonImage(img) && c.prefix == "" && !c.Opts.NoNonImage {
+		if isNonImage(img) && !c.Opts.NoNonImage {
-			if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
+			if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
 				return fmt.Errorf("convertDirectory: %w", err)
 			}
 
@@ -228,7 +235,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
 			continue
 		} else if isImage(img) {
 			if c.Opts.NoConvert {
-				if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
+				if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
 					return fmt.Errorf("convertDirectory: %w", err)
 				}
 
@@ -246,7 +253,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
 			}
 
 			if c.Opts.NoRGB && !isGrayScale(i) {
-				if err = copyFile(file, c.workPath(flatName(rel))); err != nil {
+				if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
 					return fmt.Errorf("convertDirectory: %w", err)
 				}
 
@@ -263,7 +270,7 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
 
 			if i != nil {
 				eg.Go(func() error {
-					return c.imageConvert(ctx, i, index, rel)
+					return c.imageConvert(ctx, i, index, img)
 				})
 			}
 		}
@@ -277,11 +284,6 @@ func (c *Converter) convertDirectory(ctx context.Context, dirPath string) error
 	return nil
 }
 
-// workPath returns the path of name inside the workdir, with the combine prefix applied.
-func (c *Converter) workPath(name string) string {
-	return filepath.Join(c.Workdir, c.prefix+name)
-}
-
 // imageConvert converts image.Image.
 func (c *Converter) imageConvert(ctx context.Context, img image.Image, index int, pathName string) error {
 	err := ctx.Err()
@@ -301,9 +303,9 @@ func (c *Converter) imageConvert(ctx context.Context, img image.Image, index int
 
 	var fileName string
 	if pathName != "" {
-		fileName = c.workPath(fmt.Sprintf("%s.%s", flatName(strings.TrimSuffix(pathName, filepath.Ext(pathName))), ext))
+		fileName = filepath.Join(c.Workdir, fmt.Sprintf("%s.%s", baseNoExt(pathName), ext))
 	} else {
-		fileName = c.workPath(fmt.Sprintf("%03d.%s", index, ext))
+		fileName = filepath.Join(c.Workdir, fmt.Sprintf("%03d.%s", index, ext))
 	}
 
 	img = c.imageTransform(img)
@@ -387,23 +389,11 @@ func (c *Converter) imageEncode(img image.Image, w io.Writer) error {
 		opts.DCTMethod = jpegli.DefaultDCTMethod
 		err = jpegli.Encode(w, img, opts)
 	case "webp":
-		method := webp.DefaultMethod
+		err = webp.Encode(w, img, webp.Options{Quality: c.Opts.Quality, Method: webp.DefaultMethod})
-		if c.Opts.Effort >= 0 {
-			method = min(max(c.Opts.Effort, 0), 6)
-		}
-		err = webp.Encode(w, img, webp.Options{Quality: c.Opts.Quality, Method: method, Lossless: c.Opts.Lossless})
 	case "avif":
-		speed := avif.DefaultSpeed
+		err = avif.Encode(w, img, avif.Options{Quality: c.Opts.Quality, Speed: avif.DefaultSpeed})
-		if c.Opts.Effort >= 0 {
-			speed = min(max(c.Opts.Effort, 0), 10)
-		}
-		err = avif.Encode(w, img, avif.Options{Quality: c.Opts.Quality, Speed: speed, Lossless: c.Opts.Lossless})
 	case "jxl":
-		effort := jpegxl.DefaultEffort
+		err = jpegxl.Encode(w, img, jpegxl.Options{Quality: c.Opts.Quality, Effort: jpegxl.DefaultEffort})
-		if c.Opts.Effort >= 0 {
-			effort = min(max(c.Opts.Effort, 1), 10)
-		}
-		err = jpegxl.Encode(w, img, jpegxl.Options{Quality: c.Opts.Quality, Effort: effort, Lossless: c.Opts.Lossless})
 	case "bmp":
 		opts := &gobmp.EncoderOptions{}
 		opts.SupportTransparency(false)

cbconvert_cover.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/fvbommel/sortorder"
 	"github.com/gen2brain/go-fitz"
+	"github.com/gen2brain/go-unarr"
 )
 
 // coverArchive extracts cover from archive.
@@ -30,7 +31,17 @@ func (c *Converter) coverArchive(fileName string) (image.Image, error) {
 
 	cover := c.coverName(images)
 
-	data, err := c.archiveFile(fileName, cover)
+	archive, err := unarr.NewArchive(fileName)
+	if err != nil {
+		return nil, fmt.Errorf("coverArchive: %w", err)
+	}
+	defer archive.Close()
+
+	if err = archive.EntryFor(cover); err != nil {
+		return nil, fmt.Errorf("coverArchive: %w", err)
+	}
+
+	data, err := archive.ReadAll()
 	if err != nil {
 		return nil, fmt.Errorf("coverArchive: %w", err)
 	}

cbconvert_func.go

@@ -59,7 +59,7 @@ func imagesFromSlice(files []string) []string {
 	return images
 }
 
-// isArchive checks if a file is archive.
+// isArchive checks if file is archive.
 func isArchive(f string) bool {
 	var types = []string{".rar", ".zip", ".7z", ".tar", ".cbr", ".cbz", ".cb7", ".cbt"}
 	for _, t := range types {
@@ -123,12 +123,6 @@ func baseNoExt(filename string) string {
 	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.
 func copyFile(reader io.Reader, filename string) error {
 	err := os.MkdirAll(filepath.Dir(filename), 0755)

cbconvert_image.go

@@ -22,7 +22,7 @@ const (
 	mitchellNetravali
 	// CatmullRom is a sharp bicubic filter.
 	catmullRom
-	// Gaussian is a blurring filter, which uses gaussian function, useful for noise removal.
+	// Gaussian is a blurring filter that uses gaussian function, useful for noise removal.
 	gaussian
 	// Lanczos is a high-quality resampling filter, it's slower than cubic filters.
 	lanczos
@@ -124,7 +124,7 @@ func imageToGray(src image.Image) *image.Gray {
 	return dst
 }
 
-// isGrayScale checks if the image is grayscale.
+// isGrayScale checks if image is grayscale.
 func isGrayScale(img image.Image) bool {
 	model := img.ColorModel()
 	if model == color.GrayModel || model == color.Gray16Model {
@@ -135,29 +135,29 @@ func isGrayScale(img image.Image) bool {
 }
 
 var colors16 = []color.Color{
-	color.RGBA{A: 255},
+	color.RGBA{0, 0, 0, 255},
-	color.RGBA{R: 17, G: 17, B: 17, A: 255},
+	color.RGBA{17, 17, 17, 255},
-	color.RGBA{R: 34, G: 34, B: 34, A: 255},
+	color.RGBA{34, 34, 34, 255},
-	color.RGBA{R: 51, G: 51, B: 51, A: 255},
+	color.RGBA{51, 51, 51, 255},
-	color.RGBA{R: 68, G: 68, B: 68, A: 255},
+	color.RGBA{68, 68, 68, 255},
-	color.RGBA{R: 85, G: 85, B: 85, A: 255},
+	color.RGBA{85, 85, 85, 255},
-	color.RGBA{R: 102, G: 102, B: 102, A: 255},
+	color.RGBA{102, 102, 102, 255},
-	color.RGBA{R: 119, G: 119, B: 119, A: 255},
+	color.RGBA{119, 119, 119, 255},
-	color.RGBA{R: 136, G: 136, B: 136, A: 255},
+	color.RGBA{136, 136, 136, 255},
-	color.RGBA{R: 153, G: 153, B: 153, A: 255},
+	color.RGBA{153, 153, 153, 255},
-	color.RGBA{R: 170, G: 170, B: 170, A: 255},
+	color.RGBA{170, 170, 170, 255},
-	color.RGBA{R: 187, G: 187, B: 187, A: 255},
+	color.RGBA{187, 187, 187, 255},
-	color.RGBA{R: 204, G: 204, B: 204, A: 255},
+	color.RGBA{204, 204, 204, 255},
-	color.RGBA{R: 221, G: 221, B: 221, A: 255},
+	color.RGBA{221, 221, 221, 255},
-	color.RGBA{R: 238, G: 238, B: 238, A: 255},
+	color.RGBA{238, 238, 238, 255},
-	color.RGBA{R: 255, G: 255, B: 255, A: 255},
+	color.RGBA{255, 255, 255, 255},
 }
 
 // imageToPaletted converts an image.Image to *image.Paletted using 16-color palette.
 func imageToPaletted(src image.Image) *image.Paletted {
 	b := src.Bounds()
 	dst := image.NewPaletted(b, colors16)
-	draw.FloydSteinberg.Draw(dst, b, imageToGray(src), b.Min)
+	draw.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
 
 	return dst
 }

cmd/cbconvert-gui/dist/linux/modules.txt

@@ -35,7 +35,7 @@ github.com/fvbommel/sortorder
 # github.com/gen2brain/avif v0.4.1
 ## explicit; go 1.21
 github.com/gen2brain/avif
-# github.com/gen2brain/cbconvert v1.0.5-0.20241106181414-0dee611bf1de
+# github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca
 ## explicit; go 1.23
 github.com/gen2brain/cbconvert
 # github.com/gen2brain/go-fitz v1.24.14

cmd/cbconvert-gui/go.mod

@@ -1,56 +1,36 @@
 module github.com/gen2brain/cbconvert/cmd/cbconvert-gui
 
-go 1.26
+go 1.23
 
 require (
-	github.com/gen2brain/cbconvert v1.0.5-0.20260623161611-a5817c3ba5de
+	github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca
-	github.com/gen2brain/iup-go/iup v0.32.1-0.20260604112206-a19da6654449
+	github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4
+	github.com/godbus/dbus/v5 v5.1.0
 )
 
 require (
-	github.com/STARRY-S/zip v0.2.3 // indirect
+	github.com/anthonynsimon/bild v0.14.0 // indirect
-	github.com/andybalholm/brotli v1.2.1 // indirect
-	github.com/anthonynsimon/bild v0.15.0 // indirect
-	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.4 // indirect
-	github.com/bodgit/windows v1.0.1 // indirect
-	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d // indirect
 	github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ebitengine/purego v0.10.1 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/gen2brain/avif v0.5.1 // indirect
+	github.com/gen2brain/avif v0.4.1 // indirect
-	github.com/gen2brain/go-fitz v1.24.15 // indirect
+	github.com/gen2brain/go-fitz v1.24.14 // indirect
-	github.com/gen2brain/jpegli v0.4.0 // indirect
+	github.com/gen2brain/go-unarr v0.2.4 // indirect
-	github.com/gen2brain/jpegxl v0.5.1 // indirect
+	github.com/gen2brain/jpegli v0.3.3 // indirect
-	github.com/gen2brain/webp v0.6.1 // indirect
+	github.com/gen2brain/jpegxl v0.4.2 // indirect
+	github.com/gen2brain/webp v0.5.1 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
-	github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 // indirect
+	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
-	github.com/jupiterrider/ffi v0.7.0 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
-	github.com/klauspost/compress v1.18.6 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
+	golang.org/x/image v0.21.0 // indirect
-	github.com/mholt/archives v0.1.5 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	github.com/mikelolasagasti/xz v1.0.1 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	github.com/minio/minlz v1.1.1 // indirect
-	github.com/nwaples/rardecode/v2 v2.2.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.27 // indirect
-	github.com/sorairolake/lzip-go v0.3.8 // indirect
-	github.com/spf13/afero v1.15.0 // indirect
-	github.com/stangelandcl/ppmd v0.1.1 // indirect
-	github.com/tetratelabs/wazero v1.12.0 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
-	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
-	golang.org/x/image v0.43.0 // indirect
-	golang.org/x/net v0.56.0 // indirect
-	golang.org/x/sync v0.21.0 // indirect
-	golang.org/x/sys v0.46.0 // indirect
-	golang.org/x/text v0.38.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-replace github.com/gen2brain/cbconvert => ../..

cmd/cbconvert-gui/go.sum

@@ -1,21 +1,5 @@
-github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
-github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
-github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/anthonynsimon/bild v0.15.0 h1:FzvaNLuNlAPKw1Xz7V2WYOcGIEBMj8Y6ZyAk7CI+HzA=
-github.com/anthonynsimon/bild v0.15.0/go.mod h1:qIgJ9FldkCn0iy5Ad24fzUkz5R+iJ0WfhiV+6FeCB5A=
-github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
-github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
-github.com/bodgit/sevenzip v1.6.4 h1:iHiVJfxbrB6RF4X+snI2MpVgNBKmVfGaTqZGNlMQIU0=
-github.com/bodgit/sevenzip v1.6.4/go.mod h1:ZtNi5KNgHXeXg1G7WiF0IWSuFE2eG6lt/cTGlvuirO0=
-github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
-github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
-github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4/go.mod h1:9EXlPeHfblFFnwu5UOqmP2eoZfJyAZ2Ri/Vki33ajO0=
 github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d h1:yeH8wrJa3+8uKKDAdURHUK1ds2UvKhMqX2MiOdVeKPs=
@@ -34,110 +18,64 @@ github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/
 github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
-github.com/gen2brain/avif v0.5.1 h1:LQzLsJpWyGlsa4wuZ3D57qEbCiICIK7Yidz5ZPEwzTk=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/avif v0.5.1/go.mod h1:QgrYqdVE9y40PCfArK9VakcMIpYeDYpZmCSLkW6C1n8=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-fitz v1.24.15 h1:sJNB1MOWkqnzzENPHggFpgxTwW0+S5WF/rM5wUBpJWo=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca h1:qYA+cXWUG/Dx+wG2yQ4iuw/s5ROGdXAdo5aIUHrOq4U=
-github.com/gen2brain/go-fitz v1.24.15/go.mod h1:SftkiVbTHqF141DuiLwBBM65zP7ig6AVDQpf2WlHamo=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca/go.mod h1:pQ9kQXsCZQqy7LraruUkBl7CpKNHFpWayxqQ+qliE8Y=
-github.com/gen2brain/iup-go/iup v0.32.1-0.20260604112206-a19da6654449 h1:HPqLUcspf4aPnyQIgeFKlLmphFVpFP34fzr1ZdnNyfc=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/gen2brain/iup-go/iup v0.32.1-0.20260604112206-a19da6654449/go.mod h1:V4f7tHOJAeHtjQ+ju795QKv6DGdLEb4L5cmWB1sjSzU=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/gen2brain/jpegli v0.4.0 h1:TnmAO8EcekS/XCboyLPjP6cqz025tkhdaFkiYNd3wH8=
+github.com/gen2brain/go-unarr v0.2.4 h1:Iu2kqtGfkLBSQoTFwMkSCmp0g3GrEM/XMVWzo9TQr/Y=
-github.com/gen2brain/jpegli v0.4.0/go.mod h1:zJ++s4symmKCN1CLkrY0dGXTY3s0NWbd94Rz9KLdCzk=
+github.com/gen2brain/go-unarr v0.2.4/go.mod h1:0kdy3HtjKBcEaewifXZguHCvt4qD9V8iJCx4FPEOWT8=
-github.com/gen2brain/jpegxl v0.5.1 h1:UuBUIkZ35DErImU3bTA6rltfV5zSgVNOA/K5a6JibfE=
+github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4 h1:ElkeiufJ5qqFbhxLH0TP7FhLOm37mXezIOk5iJgV27Q=
-github.com/gen2brain/jpegxl v0.5.1/go.mod h1:Wlc6lqx03RJfhiQRyHa2e+8VQwT4/qv7zSRsNv9T+yE=
+github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4/go.mod h1:F026AOq3tZrMCqTMa3K32xLh7fyTdc9+KMTMUX6EtX0=
-github.com/gen2brain/webp v0.6.1 h1:ei7Y1SWpQcdqz3YNDNyn4y2nQanxs9WLzwW5/2DKS64=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
-github.com/gen2brain/webp v0.6.1/go.mod h1:iGWMaCSw7t3I/Cv9llzEKmpnR36S8lS8VL/ZVjxU0JE=
+github.com/gen2brain/jpegli v0.3.3/go.mod h1:6Dbgr+ni1IUBqGVOKHn8lY+6DvwSGfAfC7pPQiSK6uA=
+github.com/gen2brain/jpegxl v0.4.2 h1:Ff0jAWtCRdc9yjPc9jkyak6Ji/A89Jg0KI+D7qOEtRI=
+github.com/gen2brain/jpegxl v0.4.2/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
+github.com/gen2brain/webp v0.5.1 h1:ly9olTGveZEpq3soJuCmex9fxLJ0ipHcQRRSRit5EUE=
+github.com/gen2brain/webp v0.5.1/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 h1:q100v18oYIaE4p5myLFqDyfXTOxivzwGyLjGCEfv8x4=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82/go.mod h1:Mymr9kRGDc64JPr03TSZmuIBODZ3KyswLzm1xL0HFA8=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/jupiterrider/ffi v0.7.0 h1:RKsl6Ascal+3kyAqR5Qcbp83LceQMLc1VZbPfHWoNzs=
+github.com/jupiterrider/ffi v0.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
-github.com/jupiterrider/ffi v0.7.0/go.mod h1:9dauhpOfNqrqk28fxuu0kkdeFtT9Qr4vbfigiuIXN7c=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
-github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
-github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/mholt/archives v0.1.5 h1:Fh2hl1j7VEhc6DZs2DLMgiBNChUux154a1G+2esNvzQ=
-github.com/mholt/archives v0.1.5/go.mod h1:3TPMmBLPsgszL+1As5zECTuKwKvIfj6YcwWPpeTAXF4=
-github.com/mikelolasagasti/xz v1.0.1 h1:Q2F2jX0RYJUG3+WsM+FJknv+6eVjsjXNDV0KJXZzkD0=
-github.com/mikelolasagasti/xz v1.0.1/go.mod h1:muAirjiOUxPRXwm9HdDtB3uoRPrGnL85XHtokL9Hcgc=
-github.com/minio/minlz v1.1.1 h1:OGmft1V6AnI/Wme332U6bhG54nxEan+VFgkD7lat4KM=
-github.com/minio/minlz v1.1.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
-github.com/nwaples/rardecode/v2 v2.2.5 h1:L5doqgGfQwI7qADJMqnkrSB86rpPsqQDrHeO0HWa5JY=
-github.com/nwaples/rardecode/v2 v2.2.5/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
-github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk=
-github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sorairolake/lzip-go v0.3.8 h1:j5Q2313INdTA80ureWYRhX+1K78mUXfMoPZCw/ivWik=
-github.com/sorairolake/lzip-go v0.3.8/go.mod h1:JcBqGMV0frlxwrsE9sMWXDjqn3EeVf0/54YPsw66qkU=
-github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
-github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
-github.com/stangelandcl/ppmd v0.1.1 h1:c25QazhlWUn5nmR1QOzafKhQxBicAr7GGCKER2aJ8H8=
-github.com/stangelandcl/ppmd v0.1.1/go.mod h1:Rrv7M+/2P5jYr/GMLhBl7Ug3uJ1bUiVzr5LbbaV6xgY=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU=
-github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
-github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-go4.org v0.0.0-20260112195520-a5071408f32f h1:ziUVAjmTPwQMBmYR1tbdRFJPtTcQUI12fH9QQjfb0Sw=
-go4.org v0.0.0-20260112195520-a5071408f32f/go.mod h1:ZRJnO5ZI4zAwMFp+dS1+V6J6MSyAowhRqAE+DPa1Xp0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
-golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

cmd/cbconvert-gui/main.go

@@ -69,12 +69,13 @@ func main() {
 	iup.Open()
 	defer iup.Close()
 
-	iup.SetGlobal("AUTODARKMODE", "YES")
+	iup.SetGlobal("UTF8MODE", "YES")
+	iup.SetGlobal("UTF8MODE_FILE", "YES")
 
 	img, _ := png.Decode(bytes.NewReader(appLogo))
 	iup.ImageFromImage(img).SetHandle("logo")
 
-	dlg := iup.Dialog(layout()).SetAttributes(fmt.Sprintf(`TITLE="CBconvert %s", ICON=logo, SHRINK=YES`, appVersion)).SetHandle("dlg")
+	dlg := iup.Dialog(layout()).SetAttributes(fmt.Sprintf(`TITLE="CBconvert %s", ICON=logo`, appVersion)).SetHandle("dlg")
 
 	dlg.SetCallback("POSTMESSAGE_CB", iup.PostMessageFunc(func(ih iup.Ihandle, s string, i int, p any) int {
 		sp := strings.Split(s, ": ")
@@ -94,14 +95,6 @@ func main() {
 		return iup.DEFAULT
 	}))
 
-	dlg.SetCallback("THEMECHANGED_CB", iup.ThemeChangedFunc(func(ih iup.Ihandle, darkMode int) int {
-		t := iup.GetHandle("Table")
-		tableRowColors(t, darkMode == 1)
-		t.SetAttribute("REDRAW", "YES")
-
-		return iup.DEFAULT
-	}))
-
 	iup.Map(dlg)
 	setActive()
 
@@ -147,17 +140,6 @@ func options() cbconvert.Options {
 	opts.Fit = iup.GetHandle("Fit").GetAttribute("VALUE") == "ON"
 	opts.Filter = iup.GetHandle("Filter").GetInt("VALUE") - 1
 	opts.Quality = iup.GetHandle("Quality").GetInt("VALUE")
-	switch opts.Format {
-	case "webp", "avif", "jxl":
-		opts.Effort = iup.GetHandle("Effort").GetInt("VALUE")
-	default:
-		opts.Effort = -1
-	}
-	opts.Lossless = iup.GetHandle("Lossless").GetAttribute("VALUE") == "ON"
-	opts.Combine = iup.GetHandle("Combine").GetAttribute("VALUE") == "ON"
-	if opts.Combine {
-		opts.OutFile = iup.GetHandle("OutFile").GetAttribute("VALUE")
-	}
 	opts.Grayscale = iup.GetHandle("Grayscale").GetAttribute("VALUE") == "ON"
 	opts.Brightness = iup.GetHandle("Brightness").GetInt("VALUE")
 	opts.Contrast = iup.GetHandle("Contrast").GetInt("VALUE")
@@ -168,7 +150,7 @@ func options() cbconvert.Options {
 
 func setActive() {
 	opts := options()
-	count := iup.GetHandle("Table").GetInt("NUMLIN")
+	count := iup.GetHandle("List").GetInt("COUNT")
 
 	if count == 0 {
 		iup.GetHandle("Remove").SetAttribute("ACTIVE", "NO")
@@ -183,30 +165,24 @@ func setActive() {
 		iup.GetHandle("RemoveAll").SetAttribute("ACTIVE", "YES")
 	}
 
-	active := "YES"
+	if opts.OutDir == "" {
-	var tip string
+		iup.GetHandle("Thumbnail").SetAttributes(`ACTIVE=NO`)
-	switch {
+		iup.GetHandle("Cover").SetAttributes(`ACTIVE=NO`)
-	case count == 0 && opts.OutDir == "":
+		iup.GetHandle("Convert").SetAttributes(`ACTIVE=NO`)
-		active, tip = "NO", "Add files and set output directory"
+		if count > 0 {
-	case count == 0:
+			iup.GetHandle("Thumbnail").SetAttributes(`ACTIVE=NO, TIP="Set Output Directory"`)
-		active, tip = "NO", "Add files"
+			iup.GetHandle("Cover").SetAttributes(`ACTIVE=NO, TIP="Set Output Directory"`)
-	case opts.OutDir == "":
+			iup.GetHandle("Convert").SetAttributes(`ACTIVE=NO, TIP="Set Output Directory"`)
-		active, tip = "NO", "Set output directory"
+		}
-	}
+	} else {
-
+		if count > 0 {
-	enabledTip := map[string]string{
+			iup.GetHandle("Thumbnail").SetAttributes(`ACTIVE=YES, TIP=""`)
-		"Thumbnail": "Extract cover thumbnails",
+			iup.GetHandle("Cover").SetAttributes(`ACTIVE=YES, TIP=""`)
-		"Cover":     "Extract covers",
+			iup.GetHandle("Convert").SetAttributes(`ACTIVE=YES, TIP=""`)
-		"Convert":   "Convert files to the selected format",
-	}
-
-	for _, h := range []string{"Thumbnail", "Cover", "Convert"} {
-		b := iup.GetHandle(h)
-		b.SetAttribute("ACTIVE", active)
-		if active == "YES" {
-			b.SetAttribute("TIP", enabledTip[h])
 		} else {
-			b.SetAttribute("TIP", tip)
+			iup.GetHandle("Thumbnail").SetAttributes(`ACTIVE=NO`)
+			iup.GetHandle("Cover").SetAttributes(`ACTIVE=NO`)
+			iup.GetHandle("Convert").SetAttributes(`ACTIVE=NO`)
 		}
 	}
 
@@ -218,61 +194,17 @@ func setActive() {
 		iup.GetHandle("VboxTransform").SetAttribute("ACTIVE", "YES")
 	}
 
-	canLossless := opts.Format == "webp" || opts.Format == "avif" || opts.Format == "jxl"
+	if (opts.Format == "jpeg" || opts.Format == "webp" || opts.Format == "avif" || opts.Format == "jxl") && !opts.NoConvert {
-	losslessOn := canLossless && opts.Lossless
-
-	if (opts.Format == "jpeg" || canLossless) && !opts.NoConvert && !losslessOn {
 		iup.GetHandle("VboxQuality").SetAttribute("ACTIVE", "YES")
 	} else {
 		iup.GetHandle("VboxQuality").SetAttribute("ACTIVE", "NO")
 	}
 
-	if canLossless && !opts.NoConvert {
-		iup.GetHandle("VboxEffort").SetAttribute("ACTIVE", "YES")
-		iup.GetHandle("Lossless").SetAttribute("ACTIVE", "YES")
-	} else {
-		iup.GetHandle("VboxEffort").SetAttribute("ACTIVE", "NO")
-		iup.GetHandle("Lossless").SetAttribute("ACTIVE", "NO")
-	}
-
 	if opts.Width != 0 && opts.Height != 0 && !opts.NoConvert {
 		iup.GetHandle("Fit").SetAttribute("ACTIVE", "YES")
 	} else {
 		iup.GetHandle("Fit").SetAttribute("ACTIVE", "NO")
 	}
-
-	if opts.Combine {
-		iup.GetHandle("VboxOutFile").SetAttribute("ACTIVE", "YES")
-	} else {
-		iup.GetHandle("VboxOutFile").SetAttribute("ACTIVE", "NO")
-	}
-}
-
-func setEffort(format string) {
-	val := iup.GetHandle("Effort")
-
-	var name string
-
-	switch format {
-	case "webp":
-		val.SetAttributes("MIN=0, MAX=6, SHOWTICKS=7, VALUE=4")
-		val.SetAttribute("TIP", "WEBP method, higher is better/slower (0-6, default 4)")
-		name = "Method"
-	case "avif":
-		val.SetAttributes("MIN=0, MAX=10, SHOWTICKS=11, VALUE=10")
-		val.SetAttribute("TIP", "AVIF speed, higher is faster/worse (0-10, default 10)")
-		name = "Speed"
-	case "jxl":
-		val.SetAttributes("MIN=1, MAX=10, SHOWTICKS=10, VALUE=7")
-		val.SetAttribute("TIP", "JXL effort, higher is better/slower (1-10, default 7)")
-		name = "Effort"
-	default:
-		return
-	}
-
-	val.SetAttribute("EFFORTNAME", name)
-	iup.GetHandle("LabelEffort").SetAttribute("TITLE", fmt.Sprintf("%s: %d", name, val.GetInt("VALUE")))
-	iup.Refresh(iup.GetHandle("LabelEffort"))
 }
 
 func layout() iup.Ihandle {
@@ -293,109 +225,47 @@ func layout() iup.Ihandle {
 	)
 }
 
-// tableRowColors sets the alternating row colors for dark or light mode.
-func tableRowColors(t iup.Ihandle, dark bool) {
-	even, odd := "#F0F0F0", "#FFFFFF"
-	if dark {
-		even, odd = "#3A3A3A", "#2D2D2D"
-	}
-	t.SetAttribute("EVENROWCOLOR", even)
-	t.SetAttribute("ODDROWCOLOR", odd)
-}
-
 func list() iup.Ihandle {
-	t := iup.Table().SetHandle("Table")
+	return iup.Vbox(
-	t.SetAttributes(map[string]string{
+		iup.List().SetAttributes("EXPAND=YES, VISIBLECOLUMNS=16, VISIBLELINES=5").SetHandle("List").
-		"EXPAND":         "YES",
+			SetCallback("ACTION", iup.ListActionFunc(func(ih iup.Ihandle, text string, item int, state int) int {
-		"NUMCOL":         "3",
+				if state == 1 {
-		"NUMLIN":         "0",
+					index = item - 1
-		"TITLE1":         "Title",
+					setActive()
-		"TITLE2":         "Type",
+					previewPost()
-		"TITLE3":         "Size (MiB)",
+				}
-		"WIDTH1":         "150",
-		"WIDTH2":         "50",
-		"WIDTH3":         "100",
-		"ALIGNMENT2":     "ACENTER",
-		"ALIGNMENT3":     "ARIGHT",
-		"SELECTIONMODE":  "SINGLE",
-		"USERRESIZE":     "YES",
-		"STRETCHLAST":    "NO",
-		"FOCUSRECT":      "NO",
-		"SORTABLE":       "YES",
-		"ALTERNATECOLOR": "YES",
-	})
 
-	tableRowColors(t, iup.GetGlobal("DARKMODE") == "YES" && iup.GetGlobal("AUTODARKMODE") == "YES")
+				return iup.DEFAULT
+			})).
+			SetCallback("DROPFILES_CB", iup.DropFilesFunc(func(ih iup.Ihandle, fileName string, num, x, y int) int {
+				dec, err := url.QueryUnescape(fileName)
+				if err != nil {
+					iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
+					fmt.Println(err)
 
-	t.SetCallback("ENTERITEM_CB", iup.EnterItemFunc(func(ih iup.Ihandle, lin, col int) int {
+					return iup.DEFAULT
-		index = lin - 1
+				}
-		setActive()
-		previewPost()
 
-		return iup.DEFAULT
+				conv := cbconvert.New(options())
-	}))
 
-	t.SetCallback("DROPFILES_CB", iup.DropFilesFunc(func(ih iup.Ihandle, fileName string, num, x, y int) int {
+				fs, err := conv.Files([]string{dec})
-		dec, err := url.QueryUnescape(fileName)
+				if err != nil {
-		if err != nil {
+					iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
-			iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
+					fmt.Println(err)
-			fmt.Println(err)
 
-			return iup.DEFAULT
+					return iup.DEFAULT
-		}
+				}
 
-		conv := cbconvert.New(options())
+				for _, file := range fs {
+					iup.SetAttribute(iup.GetHandle("List"), "APPENDITEM", fmt.Sprintf("%s (%s)", file.Name, file.SizeHuman))
+					files = append(files, file)
+				}
 
-		fs, err := conv.Files([]string{dec})
+				setActive()
-		if err != nil {
-			iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
-			fmt.Println(err)
 
-			return iup.DEFAULT
+				return iup.DEFAULT
-		}
+			})),
-
+	)
-		wasEmpty := len(files) == 0
-
-		for _, file := range fs {
-			appendFile(file)
-		}
-
-		if wasEmpty && len(files) > 0 {
-			selectRow(0)
-		}
-
-		setActive()
-
-		if wasEmpty {
-			previewPost()
-		}
-
-		return iup.DEFAULT
-	}))
-
-	return iup.Vbox(t)
-}
-
-// selectRow focuses and selects the given 0-based row in the table.
-func selectRow(i int) {
-	if i < 0 || i >= len(files) {
-		return
-	}
-
-	index = i
-	iup.GetHandle("Table").SetAttribute("FOCUSCELL", fmt.Sprintf("%d:1", i+1))
-}
-
-// appendFile adds a file as a new row to the table and the files slice.
-func appendFile(file cbconvert.File) {
-	files = append(files, file)
-
-	t := iup.GetHandle("Table")
-	lin := len(files)
-	t.SetAttribute("NUMLIN", strconv.Itoa(lin))
-	iup.SetAttributeId2(t, "", lin, 1, file.Name)
-	iup.SetAttributeId2(t, "", lin, 2, cbconvert.FileType(file.Path))
-	iup.SetAttributeId2(t, "", lin, 3, strconv.FormatFloat(float64(file.Stat.Size())/(1024*1024), 'f', 2, 64))
 }
 
 func previewPost() {
@@ -493,154 +363,65 @@ func tabs() iup.Ihandle {
 				SetAttributes(`TIP="Process only files larger than minimum size"`),
 		),
 		iup.Space().SetAttributes("EXPAND=HORIZONTAL"),
-	).SetHandle("VboxInput").SetAttributes("NGAP=10")
+	).SetHandle("VboxInput").SetAttributes("MARGIN=5x5, GAP=5")
 
-	vboxOutput := iup.Hbox(
+	vboxOutput := iup.Vbox(
 		iup.Vbox(
-			iup.Vbox(
+			iup.Label("Output Directory:"),
-				iup.Label("Output Directory:"),
+			iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("OutDir").
-				iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("OutDir").
+				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
+					setActive()
+
+					return iup.DEFAULT
+				})),
+			iup.Space().SetAttribute("SIZE", "5x0"),
+			iup.Button("Browse...").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
+				SetCallback("ACTION", iup.ActionFunc(onOutputDirectory)),
+		),
+		iup.Vbox(
+			iup.Label("Add Suffix to Output File:"),
+			iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("Suffix").
+				SetAttribute("TIP", "Add suffix to filename, i.e. filename_suffix.cbz"),
+		),
+		iup.Vbox(
+			iup.Label("Archive Format:"),
+			iup.List().SetAttributes(map[string]string{
+				"DROPDOWN": "YES",
+				"VALUE":    "1",
+				"1":        "ZIP",
+				"2":        "TAR",
+			}).SetHandle("Archive"),
+		),
+	).SetHandle("VboxOutput").SetAttributes("MARGIN=5x5, GAP=5")
+
+	vboxImage := iup.Vbox(
+		iup.Vbox(
+			iup.Label("Format:"),
+			iup.List().SetAttributes(map[string]string{
+				"DROPDOWN": "YES",
+				"VALUE":    "1",
+				"1":        "JPEG",
+				"2":        "PNG",
+				"3":        "TIFF",
+				"4":        "BMP",
+				"5":        "WEBP",
+				"6":        "AVIF",
+				"7":        "JXL",
+			}).SetHandle("Format").
+				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
+					setActive()
+					previewPost()
+
+					return iup.DEFAULT
+				})),
+		),
+		iup.Vbox(
+			iup.Label("Size:"),
+			iup.Hbox(
+				iup.Text().SetAttributes(`CUEBANNER=" width", VISIBLECOLUMNS=4, MASK="/d*"`).SetHandle("Width").
+					SetAttribute("TIP", "If one of, width or height is not set, the image aspect ratio is preserved").
 					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
 						setActive()
-
-						return iup.DEFAULT
-					})),
-				iup.Space().SetAttribute("SIZE", "5x0"),
-				iup.Button("Browse...").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-					SetCallback("ACTION", iup.ActionFunc(onOutputDirectory)),
-			),
-			iup.Vbox(
-				iup.Label("Add Suffix to Output File:"),
-				iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("Suffix").
-					SetAttribute("TIP", "Add suffix to filename, i.e. filename_suffix.cbz"),
-			),
-			iup.Vbox(
-				iup.Label("Archive Format:"),
-				iup.List().SetAttributes(map[string]string{
-					"DROPDOWN": "YES",
-					"VALUE":    "1",
-					"1":        "ZIP",
-					"2":        "TAR",
-				}).SetHandle("Archive"),
-			),
-		).SetAttributes("NGAP=10"),
-		iup.Space().SetAttribute("SIZE", "15"),
-		iup.Vbox(
-			iup.Vbox(
-				iup.Toggle(" Combine into single file").SetHandle("Combine").
-					SetAttributes(`TIP="Merge all listed files into one archive"`).
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						setActive()
-
-						return iup.DEFAULT
-					})),
-			),
-			iup.Vbox(
-				iup.Label("Output File:"),
-				iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("OutFile").
-					SetAttribute("TIP", "Combined file name (default: first input + -combined)"),
-				iup.Space().SetAttribute("SIZE", "5x0"),
-				iup.Button("Browse...").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-					SetCallback("ACTION", iup.ActionFunc(onOutputFile)),
-			).SetHandle("VboxOutFile"),
-		).SetAttributes("NGAP=10"),
-	).SetHandle("VboxOutput")
-
-	vboxImage := iup.Hbox(
-		iup.Vbox(
-			iup.Vbox(
-				iup.Label("Format:"),
-				iup.List().SetAttributes(map[string]string{
-					"DROPDOWN": "YES",
-					"VALUE":    "1",
-					"1":        "JPEG",
-					"2":        "PNG",
-					"3":        "TIFF",
-					"4":        "BMP",
-					"5":        "WEBP",
-					"6":        "AVIF",
-					"7":        "JXL",
-				}).SetHandle("Format").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						setEffort(strings.ToLower(ih.GetAttribute("VALUESTRING")))
-						setActive()
-						previewPost()
-
-						return iup.DEFAULT
-					})),
-			),
-			iup.Vbox(
-				iup.Label("Size:"),
-				iup.Hbox(
-					iup.Text().SetAttributes(`CUEBANNER="width", VISIBLECOLUMNS=6, MASK="/d*"`).SetHandle("Width").
-						SetAttribute("TIP", "If one of, width or height is not set, the image aspect ratio is preserved").
-						SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-							setActive()
-							ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
-
-							return iup.DEFAULT
-						})).
-						SetCallback("KILLFOCUS_CB", iup.KillFocusFunc(func(ih iup.Ihandle) int {
-							if ih.GetAttribute("MYVALUE") != "" {
-								previewPost()
-							}
-							ih.SetAttribute("MYVALUE", "")
-
-							return iup.DEFAULT
-						})),
-					iup.Space().SetAttribute("SIZE", "2"),
-					iup.Label("x"),
-					iup.Space().SetAttribute("SIZE", "2"),
-					iup.Text().SetAttributes(`CUEBANNER="height", VISIBLECOLUMNS=6, MASK="/d*"`).SetHandle("Height").
-						SetAttribute("TIP", "If one of, width or height is not set, the image aspect ratio is preserved").
-						SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-							setActive()
-							ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
-
-							return iup.DEFAULT
-						})).
-						SetCallback("KILLFOCUS_CB", iup.KillFocusFunc(func(ih iup.Ihandle) int {
-							if ih.GetAttribute("MYVALUE") != "" {
-								previewPost()
-							}
-							ih.SetAttribute("MYVALUE", "")
-
-							return iup.DEFAULT
-						})),
-				).SetAttributes("ALIGNMENT=ACENTER, NMARGIN=0"),
-			),
-			iup.Vbox(
-				iup.Toggle(" Best Fit").SetHandle("Fit").
-					SetAttributes(`TIP="Best fit for required width and height"`),
-			),
-			iup.Vbox(
-				iup.Label("Resize Filter:"),
-				iup.List().SetAttributes(map[string]string{
-					"DROPDOWN": "YES",
-					"VALUE":    "3",
-					"TIP":      "Linear is the bilinear filter, smooth and reasonably fast",
-					"1":        "NearestNeighbor",
-					"2":        "Box",
-					"3":        "Linear",
-					"4":        "MitchellNetravali",
-					"5":        "CatmullRom",
-					"6":        "Gaussian",
-					"7":        "Lanczos",
-				}).SetHandle("Filter").SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(onFilterChanged)),
-			),
-		).SetAttributes("NGAP=10"),
-		iup.Space().SetAttribute("SIZE", "15"),
-		iup.Vbox(
-			iup.Vbox(
-				iup.Hbox(
-					iup.Label("Quality: "),
-					iup.Label("75").SetHandle("LabelQuality"),
-				).SetAttributes("NMARGIN=0"),
-				iup.Val("").SetAttributes(`MIN=0, MAX=100, VALUE=75, SHOWTICKS=10`).SetHandle("Quality").
-					SetAttribute("TIP", "Quality affects JPEG, WEBP, AVIF and JXL").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						iup.GetHandle("LabelQuality").SetAttribute("TITLE", ih.GetInt("VALUE"))
-						iup.Refresh(iup.GetHandle("LabelQuality"))
 						ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
 
 						return iup.DEFAULT
@@ -653,14 +434,11 @@ func tabs() iup.Ihandle {
 
 						return iup.DEFAULT
 					})),
-			).SetHandle("VboxQuality"),
+				iup.Label("x"),
-			iup.Vbox(
+				iup.Text().SetAttributes(`CUEBANNER=" height", VISIBLECOLUMNS=4, MASK="/d*"`).SetHandle("Height").
-				iup.Label("Effort:").SetHandle("LabelEffort"),
+					SetAttribute("TIP", "If one of, width or height is not set, the image aspect ratio is preserved").
-				iup.Val("").SetAttributes(`MIN=0, MAX=10, VALUE=0, SHOWTICKS=11`).SetHandle("Effort").
-					SetAttribute("TIP", "Encoder speed/effort (WEBP, AVIF, JXL)").
 					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						iup.GetHandle("LabelEffort").SetAttribute("TITLE", fmt.Sprintf("%s: %d", ih.GetAttribute("EFFORTNAME"), ih.GetInt("VALUE")))
+						setActive()
-						iup.Refresh(iup.GetHandle("LabelEffort"))
 						ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
 
 						return iup.DEFAULT
@@ -673,40 +451,70 @@ func tabs() iup.Ihandle {
 
 						return iup.DEFAULT
 					})),
-			).SetHandle("VboxEffort"),
+			).SetAttributes("ALIGNMENT=ACENTER, MARGIN=0"),
-			iup.Vbox(
+		),
-				iup.Toggle(" Lossless").SetHandle("Lossless").
+		iup.Vbox(
-					SetAttributes(`TIP="Lossless compression (WEBP, AVIF, JXL), ignores quality"`).
+			iup.Toggle(" Best Fit").SetHandle("Fit").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
+				SetAttributes(`TIP="Best fit for required width and height"`),
-						setActive()
+		),
-						previewPost()
+		iup.Vbox(
+			iup.Label("Resize Filter:"),
+			iup.List().SetAttributes(map[string]string{
+				"DROPDOWN": "YES",
+				"VALUE":    "3",
+				"TIP":      "Linear is the bilinear filter, smooth and reasonably fast",
+				"1":        "NearestNeighbor",
+				"2":        "Box",
+				"3":        "Linear",
+				"4":        "MitchellNetravali",
+				"5":        "CatmullRom",
+				"6":        "Gaussian",
+				"7":        "Lanczos",
+			}).SetHandle("Filter").SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(onFilterChanged)),
+		),
+		iup.Vbox(
+			iup.Hbox(
+				iup.Label("Quality: "),
+				iup.Label("75").SetHandle("LabelQuality"),
+			).SetAttributes("MARGIN=0"),
+			iup.Val("").SetAttributes(`MIN=0, MAX=100, VALUE=75, SHOWTICKS=10`).SetHandle("Quality").
+				SetAttribute("TIP", "Quality affects JPEG, WEBP, AVIF and JXL").
+				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
+					iup.GetHandle("LabelQuality").SetAttribute("TITLE", ih.GetInt("VALUE"))
+					ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
 
-						return iup.DEFAULT
+					return iup.DEFAULT
-					})),
+				})).
-			),
+				SetCallback("KILLFOCUS_CB", iup.KillFocusFunc(func(ih iup.Ihandle) int {
-			iup.Vbox(
+					if ih.GetAttribute("MYVALUE") != "" {
-				iup.Toggle(" Grayscale").SetHandle("Grayscale").
-					SetAttributes(`TIP="Convert images to grayscale (monochromatic)"`).
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
 						previewPost()
+					}
+					ih.SetAttribute("MYVALUE", "")
 
-						return iup.DEFAULT
+					return iup.DEFAULT
-					})),
+				})),
-			),
+		).SetHandle("VboxQuality"),
-		).SetAttributes("NGAP=10"),
+		iup.Vbox(
-	).SetHandle("VboxImage")
+			iup.Toggle(" Grayscale").SetHandle("Grayscale").
+				SetAttributes(`TIP="Convert images to grayscale (monochromatic)"`).
+				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
+					previewPost()
+
+					return iup.DEFAULT
+				})),
+		),
+	).SetHandle("VboxImage").SetAttributes("MARGIN=5x5, GAP=5")
 
 	vboxTransform := iup.Vbox(
 		iup.Vbox(
 			iup.Hbox(
 				iup.Label("Brightness: "),
 				iup.Label("0").SetHandle("LabelBrightness"),
-			).SetAttributes("ALIGNMENT=ACENTER, NMARGIN=0"),
+			).SetAttributes("ALIGNMENT=ACENTER, MARGIN=0"),
 			iup.Val("").SetAttributes(`MIN=-100, MAX=100, VALUE=0, SHOWTICKS=10`).SetHandle("Brightness").
 				SetAttributes(`TIP="Adjust the brightness of the images"`).
 				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
 					iup.GetHandle("LabelBrightness").SetAttribute("TITLE", iup.GetHandle("Brightness").GetInt("VALUE"))
-					iup.Refresh(iup.GetHandle("LabelBrightness"))
 					ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
 
 					return iup.DEFAULT
@@ -724,12 +532,11 @@ func tabs() iup.Ihandle {
 			iup.Hbox(
 				iup.Label("Contrast: "),
 				iup.Label("0").SetHandle("LabelContrast"),
-			).SetAttributes("ALIGNMENT=ACENTER, NMARGIN=0"),
+			).SetAttributes("ALIGNMENT=ACENTER, MARGIN=0"),
 			iup.Val("").SetAttributes(`MIN=-100, MAX=100, VALUE=0, SHOWTICKS=10`).SetHandle("Contrast").
 				SetAttributes(`TIP="Adjust the contrast of the images"`).
 				SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
 					iup.GetHandle("LabelContrast").SetAttribute("TITLE", iup.GetHandle("Contrast").GetInt("VALUE"))
-					iup.Refresh(iup.GetHandle("LabelContrast"))
 					ih.SetAttribute("MYVALUE", ih.GetInt("VALUE"))
 
 					return iup.DEFAULT
@@ -759,51 +566,45 @@ func tabs() iup.Ihandle {
 					return iup.DEFAULT
 				})),
 		),
-	).SetHandle("VboxTransform").SetAttributes("NGAP=10")
+	).SetHandle("VboxTransform").SetAttributes("MARGIN=5x5, GAP=5")
 
 	return iup.Tabs(
-		vboxInput.SetAttributes("TABTITLE=Input, NMARGIN=10x10"),
+		vboxInput.SetAttributes("TABTITLE=Input"),
-		vboxOutput.SetAttributes("TABTITLE=Output, NMARGIN=10x10"),
+		vboxOutput.SetAttributes("TABTITLE=Output"),
-		vboxImage.SetAttributes("TABTITLE=Image, NMARGIN=10x10"),
+		vboxImage.SetAttributes("TABTITLE=Image"),
-		vboxTransform.SetAttributes("TABTITLE=Transform, NMARGIN=10x10"),
+		vboxTransform.SetAttributes("TABTITLE=Transform"),
-	).SetHandle("Tabs")
+	).SetHandle("Tabs").SetAttributes("MINSIZE=320x400, EXPAND=HORIZONTAL, MULTILINE=YES")
 }
 
 func buttons() iup.Ihandle {
-	addFiles := iup.Button("Add &Files...").SetHandle("AddFiles").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onAddFiles))
-	addDir := iup.Button("Add &Dir...").SetHandle("AddDir").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onAddDir))
-	remove := iup.Button("Remove").SetHandle("Remove").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onRemove))
-	removeAll := iup.Button("Remove All").SetHandle("RemoveAll").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onRemoveAll))
-	thumbnail := iup.Button("Thumbnail").SetHandle("Thumbnail").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onThumbnail))
-	cover := iup.Button("Cover").SetHandle("Cover").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onCover))
-	convert := iup.Button("&Convert").SetHandle("Convert").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
-		SetCallback("ACTION", iup.ActionFunc(onConvert))
-
-	iup.Normalizer(addFiles, addDir, remove, removeAll, thumbnail, cover, convert).SetAttribute("NORMALIZE", "BOTH")
-
 	return iup.Vbox(
-		iup.Vbox(
+		iup.Frame(
-			addFiles,
+			iup.Vbox(
-			addDir,
+				iup.Button("Add &Files...").SetHandle("AddFiles").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
-			remove,
+					SetCallback("ACTION", iup.ActionFunc(onAddFiles)),
-			removeAll,
+				iup.Button("Add &Dir...").SetHandle("AddDir").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
-		).SetAttribute("NGAP", "2"),
+					SetCallback("ACTION", iup.ActionFunc(onAddDir)),
-		iup.Space().SetAttribute("SIZE", "x5"),
+				iup.Button("Remove").SetHandle("Remove").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
-		iup.Vbox(
+					SetCallback("ACTION", iup.ActionFunc(onRemove)),
-			thumbnail,
+				iup.Button("Remove All").SetHandle("RemoveAll").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
-			cover,
+					SetCallback("ACTION", iup.ActionFunc(onRemoveAll)),
-		).SetAttribute("NGAP", "2"),
+			).SetAttributes("NGAP=5"),
-		iup.Space().SetAttribute("SIZE", "x5"),
-		iup.Vbox(
-			convert,
 		),
-	).SetHandle("Buttons").SetAttributes("ALIGNMENT=ACENTER")
+		iup.Frame(
+			iup.Vbox(
+				iup.Button("Thumbnail").SetHandle("Thumbnail").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
+					SetCallback("ACTION", iup.ActionFunc(onThumbnail)),
+				iup.Button("Cover").SetHandle("Cover").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
+					SetCallback("ACTION", iup.ActionFunc(onCover)),
+			).SetAttributes("NGAP=5"),
+		),
+		iup.Frame(
+			iup.Vbox(
+				iup.Button("&Convert").SetHandle("Convert").SetAttributes("EXPAND=HORIZONTAL, PADDING=DEFAULTBUTTONPADDING").
+					SetCallback("ACTION", iup.ActionFunc(onConvert)),
+			),
+		),
+	).SetHandle("Buttons").SetAttributes("ALIGNMENT=ACENTER, NGAP=10")
 }
 
 func status() iup.Ihandle {
@@ -811,10 +612,10 @@ func status() iup.Ihandle {
 		loading(),
 		iup.Fill(),
 		iup.Label("File 1 of 1").SetHandle("LabelStatus1").SetAttributes("VISIBLE=NO"),
-		iup.Space().SetAttribute("SIZE", "5"),
+		iup.Space().SetAttribute("SIZE", "5x0"),
 		iup.Label("(000/000)").SetHandle("LabelStatus2").SetAttributes("VISIBLE=NO"),
-		iup.Space().SetAttribute("SIZE", "5"),
+		iup.Space().SetAttribute("SIZE", "5x0"),
-		iup.ProgressBar().SetAttributes("RASTERSIZE=200x, VISIBLE=NO").SetHandle("ProgressBar").
+		iup.ProgressBar().SetAttributes("RASTERSIZE=200x15, VISIBLE=NO").SetHandle("ProgressBar").
 			SetCallback("POSTMESSAGE_CB", iup.PostMessageFunc(func(ih iup.Ihandle, s string, i int, p any) int {
 				switch s {
 				case "convert":
@@ -822,7 +623,7 @@ func status() iup.Ihandle {
 					ih.SetAttributes("VALUE=0, VISIBLE=YES")
 					ih.SetAttribute("MAX", conv.Ncontents)
 
-					iup.GetHandle("Table").SetAttributes("ACTIVE=NO")
+					iup.GetHandle("List").SetAttributes("ACTIVE=NO")
 					iup.GetHandle("Tabs").SetAttributes("ACTIVE=NO")
 					iup.GetHandle("Buttons").SetAttributes("ACTIVE=NO")
 
@@ -836,7 +637,7 @@ func status() iup.Ihandle {
 					ih.SetAttributes("VALUE=0, VISIBLE=YES")
 					ih.SetAttribute("MAX", conv.Nfiles)
 
-					iup.GetHandle("Table").SetAttributes("ACTIVE=NO")
+					iup.GetHandle("List").SetAttributes("ACTIVE=NO")
 					iup.GetHandle("Tabs").SetAttributes("ACTIVE=NO")
 					iup.GetHandle("Buttons").SetAttributes("ACTIVE=NO")
 
@@ -854,7 +655,7 @@ func status() iup.Ihandle {
 
 					iup.Refresh(iup.GetHandle("StatusBar"))
 				case "finish":
-					iup.GetHandle("Table").SetAttributes("ACTIVE=YES")
+					iup.GetHandle("List").SetAttributes("ACTIVE=YES")
 					iup.GetHandle("Tabs").SetAttributes("ACTIVE=YES")
 					iup.GetHandle("Buttons").SetAttributes("ACTIVE=YES")
 
@@ -907,21 +708,12 @@ func onAddFiles(ih iup.Ihandle) int {
 			return iup.DEFAULT
 		}
 
-		wasEmpty := len(files) == 0
-
 		for _, file := range fs {
-			appendFile(file)
+			iup.SetAttribute(iup.GetHandle("List"), "APPENDITEM", fmt.Sprintf("%s (%s)", file.Name, file.SizeHuman))
-		}
+			files = append(files, file)
-
-		if wasEmpty && len(files) > 0 {
-			selectRow(0)
 		}
 
 		setActive()
-
-		if wasEmpty {
-			previewPost()
-		}
 	}
 
 	return iup.DEFAULT
@@ -947,40 +739,30 @@ func onAddDir(ih iup.Ihandle) int {
 			return iup.DEFAULT
 		}
 
-		wasEmpty := len(files) == 0
-
 		for _, file := range fs {
-			appendFile(file)
+			iup.SetAttribute(iup.GetHandle("List"), "APPENDITEM", fmt.Sprintf("%s (%s)", file.Name, file.SizeHuman))
-		}
+			files = append(files, file)
-
-		if wasEmpty && len(files) > 0 {
-			selectRow(0)
 		}
 
 		setActive()
-
-		if wasEmpty {
-			previewPost()
-		}
 	}
 
 	return iup.DEFAULT
 }
 
 func onRemove(ih iup.Ihandle) int {
-	if index < 0 || index >= len(files) {
+	if index == -1 || len(files) == 0 {
 		return iup.IGNORE
 	}
 
-	iup.GetHandle("Table").SetAttribute("DELLIN", strconv.Itoa(index+1))
+	if len(files) == 1 {
-	files = slices.Delete(files, index, index+1)
+		files = make([]cbconvert.File, 0)
-
+	} else {
-	if index >= len(files) {
+		files = slices.Delete(files, index, index)
-		index = len(files) - 1
 	}
 
+	iup.GetHandle("List").SetAttribute("REMOVEITEM", iup.GetHandle("List").GetAttribute("VALUE"))
 	setActive()
-	previewPost()
 
 	return iup.DEFAULT
 }
@@ -989,7 +771,7 @@ func onRemoveAll(ih iup.Ihandle) int {
 	index = -1
 	files = make([]cbconvert.File, 0)
 
-	iup.GetHandle("Table").SetAttribute("NUMLIN", "0")
+	iup.GetHandle("List").SetAttribute("REMOVEITEM", "ALL")
 	setActive()
 
 	return iup.DEFAULT
@@ -1107,38 +889,25 @@ func onConvert(ih iup.Ihandle) int {
 		return iup.DEFAULT
 	}))
 
-	convertErr := func(err error) {
-		if errors.Is(err, context.Canceled) {
-			if err := os.RemoveAll(conv.Workdir); err != nil {
-				fmt.Println(err)
-			}
-
-			return
-		}
-
-		iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
-		fmt.Println(err)
-
-		if err := os.RemoveAll(conv.Workdir); err != nil {
-			fmt.Println(err)
-		}
-	}
-
 	go func(c *cbconvert.Converter) {
-		if c.Opts.Combine {
+		for _, file := range files {
-			if err := c.Combine(files); err != nil {
+			if err := c.Convert(file.Path, file.Stat); err != nil {
-				convertErr(err)
+				if errors.Is(err, context.Canceled) {
-			}
+					if err := os.RemoveAll(c.Workdir); err != nil {
-		} else {
+						fmt.Println(err)
-			for _, file := range files {
-				if err := c.Convert(file.Path, file.Stat); err != nil {
-					convertErr(err)
-					if errors.Is(err, context.Canceled) {
-						break
 					}
 
-					continue
+					break
 				}
+
+				iup.PostMessage(iup.GetHandle("dlg"), err.Error(), 0, 0)
+				fmt.Println(err)
+
+				if err := os.RemoveAll(c.Workdir); err != nil {
+					fmt.Println(err)
+				}
+
+				continue
 			}
 		}
 
@@ -1166,17 +935,6 @@ func onOutputDirectory(ih iup.Ihandle) int {
 	return iup.DEFAULT
 }
 
-func onOutputFile(ih iup.Ihandle) int {
-	name := saveDlg("Output File")
-	if name != "" {
-		iup.GetHandle("OutFile").SetAttribute("VALUE", filepath.Base(name))
-		iup.GetHandle("OutDir").SetAttribute("VALUE", filepath.Dir(name))
-		setActive()
-	}
-
-	return iup.DEFAULT
-}
-
 func onFilterChanged(ih iup.Ihandle) int {
 	switch ih.GetInt("VALUE") {
 	case 1:
@@ -1199,72 +957,3 @@ func onFilterChanged(ih iup.Ihandle) int {
 
 	return iup.DEFAULT
 }
-
-func fileDlg(title string, multiple, directory bool) ([]string, error) {
-	ret := make([]string, 0)
-
-	dlg := iup.FileDlg()
-	defer dlg.Destroy()
-
-	if !directory {
-		mf := "YES"
-		if !multiple {
-			mf = "NO"
-		}
-
-		dlg.SetAttributes(map[string]string{
-			"DIALOGTYPE":    "OPEN",
-			"MULTIPLEFILES": mf,
-			"EXTFILTER":     "Comic Files|*.rar;*.zip;*.7z;*.tar;*.cbr;*.cbz;*.cb7;*.cbt;*.pdf;*.epub;*.mobi;*.docx;*.pptx|",
-			"FILTER":        "*.cb*", // for Motif
-			"TITLE":         title,
-		})
-	} else {
-		dlg.SetAttributes(map[string]string{
-			"DIALOGTYPE": "DIR",
-			"TITLE":      title,
-		})
-	}
-
-	iup.Popup(dlg, iup.CENTERPARENT, iup.CENTERPARENT)
-
-	if dlg.GetInt("STATUS") == 0 {
-		if !directory {
-			value := dlg.GetAttribute("VALUE")
-			sp := strings.Split(value, "|")
-
-			if len(sp) > 1 {
-				for _, file := range sp[1 : len(sp)-1] {
-					ret = append(ret, filepath.Join(sp[0], file))
-				}
-			} else {
-				ret = append(ret, value)
-			}
-		} else {
-			value := dlg.GetAttribute("VALUE")
-			ret = append(ret, value)
-		}
-	}
-
-	return ret, nil
-}
-
-func saveDlg(title string) string {
-	dlg := iup.FileDlg()
-	defer dlg.Destroy()
-
-	dlg.SetAttributes(map[string]string{
-		"DIALOGTYPE": "SAVE",
-		"EXTFILTER":  "Comic Files|*.cbz;*.cbt|",
-		"FILTER":     "*.cb*", // for Motif
-		"TITLE":      title,
-	})
-
-	iup.Popup(dlg, iup.CENTERPARENT, iup.CENTERPARENT)
-
-	if dlg.GetInt("STATUS") == -1 {
-		return ""
-	}
-
-	return dlg.GetAttribute("VALUE")
-}

cmd/cbconvert-gui/main_filedlg.go

@@ -0,0 +1,65 @@
+//go:build !portal
+
+package main
+
+import (
+	"path/filepath"
+	"strings"
+
+	"github.com/gen2brain/iup-go/iup"
+)
+
+func fileDlg(title string, multiple, directory bool) ([]string, error) {
+	ret := make([]string, 0)
+
+	dlg := iup.FileDlg()
+	defer dlg.Destroy()
+
+	if !directory {
+		mf := "YES"
+		if !multiple {
+			mf = "NO"
+		}
+
+		dlg.SetAttributes(map[string]string{
+			"DIALOGTYPE":    "OPEN",
+			"MULTIPLEFILES": mf,
+			"EXTFILTER":     "Comic Files|*.rar;*.zip;*.7z;*.tar;*.cbr;*.cbz;*.cb7;*.cbt;*.pdf;*.epub;*.mobi;*.docx;*.pptx|",
+			"FILTER":        "*.cb*", // for Motif
+			"TITLE":         title,
+		})
+	} else {
+		dlg.SetAttributes(map[string]string{
+			"DIALOGTYPE": "DIR",
+			"TITLE":      title,
+		})
+	}
+
+	iup.Popup(dlg, iup.CENTERPARENT, iup.CENTERPARENT)
+
+	if dlg.GetInt("STATUS") == 0 {
+		if !directory {
+			value := dlg.GetAttribute("VALUE")
+			sp := strings.Split(value, "|")
+
+			if strings.ToLower(iup.GetGlobal("DRIVER")) == "cocoa" {
+				for _, file := range sp {
+					ret = append(ret, file)
+				}
+			} else {
+				if len(sp) > 1 {
+					for _, file := range sp[1 : len(sp)-1] {
+						ret = append(ret, filepath.Join(sp[0], file))
+					}
+				} else {
+					ret = append(ret, value)
+				}
+			}
+		} else {
+			value := dlg.GetAttribute("VALUE")
+			ret = append(ret, value)
+		}
+	}
+
+	return ret, nil
+}

cmd/cbconvert-gui/main_filedlg_portal.go

@@ -0,0 +1,106 @@
+//go:build portal
+
+package main
+
+import (
+	"net/url"
+
+	"github.com/godbus/dbus/v5"
+)
+
+func fileDlg(title string, multiple, directory bool) ([]string, error) {
+	ret := make([]string, 0)
+
+	conn, err := dbus.ConnectSessionBus()
+	if err != nil {
+		return ret, err
+	}
+	defer conn.Close()
+
+	dest := "org.freedesktop.portal.Desktop"
+	path := "/org/freedesktop/portal/desktop"
+	resp := "org.freedesktop.portal.Request.Response"
+
+	if err = conn.AddMatchSignal(
+		dbus.WithMatchInterface(dest),
+		dbus.WithMatchObjectPath(dbus.ObjectPath(path)),
+		dbus.WithMatchSender(conn.Names()[0]),
+	); err != nil {
+		return ret, err
+	}
+
+	c := make(chan *dbus.Signal, 10)
+	conn.Signal(c)
+
+	type Item struct {
+		Index  uint32
+		Filter string
+	}
+
+	type Filter struct {
+		Title   string
+		Filters []Item
+	}
+
+	filters := []Filter{
+		{
+			"Comic Files",
+			[]Item{
+				Item{0, "*.rar"},
+				Item{0, "*.zip"},
+				Item{0, "*.7z"},
+				Item{0, "*.tar"},
+				Item{0, "*.cbr"},
+				Item{0, "*.cbz"},
+				Item{0, "*.cb7"},
+				Item{0, "*.cbt"},
+				Item{0, "*.pdf"},
+				Item{0, "*.epub"},
+				Item{0, "*.mobi"},
+				Item{0, "*.docx"},
+				Item{0, "*.pptx"},
+			},
+		},
+	}
+
+	opts := map[string]any{
+		"multiple":  multiple,
+		"directory": directory,
+	}
+
+	if !directory {
+		opts["filters"] = filters
+	}
+
+	obj := conn.Object(dest, dbus.ObjectPath(path))
+	call := obj.Call("org.freedesktop.portal.FileChooser.OpenFile", 0, "", title, opts)
+	if call.Err != nil {
+		return ret, call.Err
+	}
+
+	for v := range c {
+		if v.Name != resp {
+			continue
+		}
+
+		status := v.Body[0].(uint32)
+
+		if status == 0 {
+			m := v.Body[1].(map[string]dbus.Variant)
+			uris := m["uris"].Value().([]string)
+
+			for _, uri := range uris {
+				u, err := url.ParseRequestURI(uri)
+				if err != nil {
+					return ret, err
+				}
+
+				ret = append(ret, u.Path)
+			}
+		}
+
+		break
+	}
+
+	return ret, nil
+}

cmd/cbconvert/go.mod

@@ -1,60 +1,39 @@
 module github.com/gen2brain/cbconvert/cmd/cbconvert
 
-go 1.26
+go 1.23
 
 require (
-	github.com/gen2brain/cbconvert v1.0.5-0.20260623161611-a5817c3ba5de
+	github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca
-	github.com/schollz/progressbar/v3 v3.19.0
+	github.com/schollz/progressbar/v3 v3.13.1
 )
 
 require (
-	github.com/STARRY-S/zip v0.2.3 // indirect
+	github.com/anthonynsimon/bild v0.14.0 // indirect
-	github.com/andybalholm/brotli v1.2.1 // indirect
-	github.com/anthonynsimon/bild v0.15.0 // indirect
-	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.4 // indirect
-	github.com/bodgit/windows v1.0.1 // indirect
-	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d // indirect
 	github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ebitengine/purego v0.10.1 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/gen2brain/avif v0.5.1 // indirect
+	github.com/gen2brain/avif v0.4.1 // indirect
-	github.com/gen2brain/go-fitz v1.24.15 // indirect
+	github.com/gen2brain/go-fitz v1.24.14 // indirect
-	github.com/gen2brain/jpegli v0.4.0 // indirect
+	github.com/gen2brain/go-unarr v0.2.4 // indirect
-	github.com/gen2brain/jpegxl v0.5.1 // indirect
+	github.com/gen2brain/jpegli v0.3.3 // indirect
-	github.com/gen2brain/webp v0.6.1 // indirect
+	github.com/gen2brain/jpegxl v0.4.2 // indirect
+	github.com/gen2brain/webp v0.5.1 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
-	github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 // indirect
+	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
-	github.com/jupiterrider/ffi v0.7.0 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
-	github.com/klauspost/compress v1.18.6 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/mattn/go-runewidth v0.0.24 // indirect
-	github.com/mholt/archives v0.1.5 // indirect
-	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.1.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/nwaples/rardecode/v2 v2.2.5 // indirect
+	github.com/rivo/uniseg v0.3.4 // indirect
-	github.com/pierrec/lz4/v4 v4.1.27 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	golang.org/x/image v0.21.0 // indirect
-	github.com/sorairolake/lzip-go v0.3.8 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	github.com/spf13/afero v1.15.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	github.com/stangelandcl/ppmd v0.1.1 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	github.com/tetratelabs/wazero v1.12.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
-	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
-	golang.org/x/image v0.43.0 // indirect
-	golang.org/x/net v0.56.0 // indirect
-	golang.org/x/sync v0.21.0 // indirect
-	golang.org/x/sys v0.46.0 // indirect
-	golang.org/x/term v0.44.0 // indirect
-	golang.org/x/text v0.38.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
-
-replace github.com/gen2brain/cbconvert => ../..

cmd/cbconvert/go.sum

@@ -1,25 +1,8 @@
-github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
-github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
-github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/anthonynsimon/bild v0.15.0 h1:FzvaNLuNlAPKw1Xz7V2WYOcGIEBMj8Y6ZyAk7CI+HzA=
-github.com/anthonynsimon/bild v0.15.0/go.mod h1:qIgJ9FldkCn0iy5Ad24fzUkz5R+iJ0WfhiV+6FeCB5A=
-github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
-github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
-github.com/bodgit/sevenzip v1.6.4 h1:iHiVJfxbrB6RF4X+snI2MpVgNBKmVfGaTqZGNlMQIU0=
-github.com/bodgit/sevenzip v1.6.4/go.mod h1:ZtNi5KNgHXeXg1G7WiF0IWSuFE2eG6lt/cTGlvuirO0=
-github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
-github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
-github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
-github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
-github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
-github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
-github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4/go.mod h1:9EXlPeHfblFFnwu5UOqmP2eoZfJyAZ2Ri/Vki33ajO0=
 github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d h1:yeH8wrJa3+8uKKDAdURHUK1ds2UvKhMqX2MiOdVeKPs=
@@ -38,20 +21,24 @@ github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/
 github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
-github.com/gen2brain/avif v0.5.1 h1:LQzLsJpWyGlsa4wuZ3D57qEbCiICIK7Yidz5ZPEwzTk=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/avif v0.5.1/go.mod h1:QgrYqdVE9y40PCfArK9VakcMIpYeDYpZmCSLkW6C1n8=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-fitz v1.24.15 h1:sJNB1MOWkqnzzENPHggFpgxTwW0+S5WF/rM5wUBpJWo=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca h1:qYA+cXWUG/Dx+wG2yQ4iuw/s5ROGdXAdo5aIUHrOq4U=
-github.com/gen2brain/go-fitz v1.24.15/go.mod h1:SftkiVbTHqF141DuiLwBBM65zP7ig6AVDQpf2WlHamo=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca/go.mod h1:pQ9kQXsCZQqy7LraruUkBl7CpKNHFpWayxqQ+qliE8Y=
-github.com/gen2brain/jpegli v0.4.0 h1:TnmAO8EcekS/XCboyLPjP6cqz025tkhdaFkiYNd3wH8=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/gen2brain/jpegli v0.4.0/go.mod h1:zJ++s4symmKCN1CLkrY0dGXTY3s0NWbd94Rz9KLdCzk=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/gen2brain/jpegxl v0.5.1 h1:UuBUIkZ35DErImU3bTA6rltfV5zSgVNOA/K5a6JibfE=
+github.com/gen2brain/go-unarr v0.2.4 h1:Iu2kqtGfkLBSQoTFwMkSCmp0g3GrEM/XMVWzo9TQr/Y=
-github.com/gen2brain/jpegxl v0.5.1/go.mod h1:Wlc6lqx03RJfhiQRyHa2e+8VQwT4/qv7zSRsNv9T+yE=
+github.com/gen2brain/go-unarr v0.2.4/go.mod h1:0kdy3HtjKBcEaewifXZguHCvt4qD9V8iJCx4FPEOWT8=
-github.com/gen2brain/webp v0.6.1 h1:ei7Y1SWpQcdqz3YNDNyn4y2nQanxs9WLzwW5/2DKS64=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
-github.com/gen2brain/webp v0.6.1/go.mod h1:iGWMaCSw7t3I/Cv9llzEKmpnR36S8lS8VL/ZVjxU0JE=
+github.com/gen2brain/jpegli v0.3.3/go.mod h1:6Dbgr+ni1IUBqGVOKHn8lY+6DvwSGfAfC7pPQiSK6uA=
+github.com/gen2brain/jpegxl v0.4.2 h1:Ff0jAWtCRdc9yjPc9jkyak6Ji/A89Jg0KI+D7qOEtRI=
+github.com/gen2brain/jpegxl v0.4.2/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
+github.com/gen2brain/webp v0.5.1 h1:ly9olTGveZEpq3soJuCmex9fxLJ0ipHcQRRSRit5EUE=
+github.com/gen2brain/webp v0.5.1/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
@@ -59,97 +46,57 @@ github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8b
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 h1:q100v18oYIaE4p5myLFqDyfXTOxivzwGyLjGCEfv8x4=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82/go.mod h1:Mymr9kRGDc64JPr03TSZmuIBODZ3KyswLzm1xL0HFA8=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/jupiterrider/ffi v0.7.0 h1:RKsl6Ascal+3kyAqR5Qcbp83LceQMLc1VZbPfHWoNzs=
+github.com/jupiterrider/ffi v0.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
-github.com/jupiterrider/ffi v0.7.0/go.mod h1:9dauhpOfNqrqk28fxuu0kkdeFtT9Qr4vbfigiuIXN7c=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
-github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
-github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mholt/archives v0.1.5 h1:Fh2hl1j7VEhc6DZs2DLMgiBNChUux154a1G+2esNvzQ=
-github.com/mholt/archives v0.1.5/go.mod h1:3TPMmBLPsgszL+1As5zECTuKwKvIfj6YcwWPpeTAXF4=
-github.com/mikelolasagasti/xz v1.0.1 h1:Q2F2jX0RYJUG3+WsM+FJknv+6eVjsjXNDV0KJXZzkD0=
-github.com/mikelolasagasti/xz v1.0.1/go.mod h1:muAirjiOUxPRXwm9HdDtB3uoRPrGnL85XHtokL9Hcgc=
-github.com/minio/minlz v1.1.1 h1:OGmft1V6AnI/Wme332U6bhG54nxEan+VFgkD7lat4KM=
-github.com/minio/minlz v1.1.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
-github.com/nwaples/rardecode/v2 v2.2.5 h1:L5doqgGfQwI7qADJMqnkrSB86rpPsqQDrHeO0HWa5JY=
-github.com/nwaples/rardecode/v2 v2.2.5/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
-github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk=
-github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
-github.com/schollz/progressbar/v3 v3.19.0 h1:Ea18xuIRQXLAUidVDox3AbwfUhD0/1IvohyTutOIFoc=
+github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/schollz/progressbar/v3 v3.19.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=
-github.com/sorairolake/lzip-go v0.3.8 h1:j5Q2313INdTA80ureWYRhX+1K78mUXfMoPZCw/ivWik=
+github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ=
-github.com/sorairolake/lzip-go v0.3.8/go.mod h1:JcBqGMV0frlxwrsE9sMWXDjqn3EeVf0/54YPsw66qkU=
-github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
-github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
-github.com/stangelandcl/ppmd v0.1.1 h1:c25QazhlWUn5nmR1QOzafKhQxBicAr7GGCKER2aJ8H8=
-github.com/stangelandcl/ppmd v0.1.1/go.mod h1:Rrv7M+/2P5jYr/GMLhBl7Ug3uJ1bUiVzr5LbbaV6xgY=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU=
-github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
-github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-go4.org v0.0.0-20260112195520-a5071408f32f h1:ziUVAjmTPwQMBmYR1tbdRFJPtTcQUI12fH9QQjfb0Sw=
-go4.org v0.0.0-20260112195520-a5071408f32f/go.mod h1:ZRJnO5ZI4zAwMFp+dS1+V6J6MSyAowhRqAE+DPa1Xp0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
-golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

cmd/cbconvert/main.go

@@ -114,17 +114,6 @@ func main() {
 		}
 	}
 
-	if opts.Combine {
-		if err := conv.Combine(files); err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		fmt.Fprintf(os.Stderr, "\r")
-
-		return
-	}
-
 	for _, file := range files {
 		switch {
 		case opts.Meta:
@@ -178,10 +167,6 @@ func parseFlags() (cbconvert.Options, []string) {
 	convert.StringVar(&opts.Format, "format", "jpeg", "Image format, valid values are jpeg, png, tiff, bmp, webp, avif, jxl")
 	convert.StringVar(&opts.Archive, "archive", "zip", "Archive format, valid values are zip, tar")
 	convert.IntVar(&opts.Quality, "quality", 75, "Image quality")
-	convert.IntVar(&opts.Effort, "effort", -1, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default")
-	convert.BoolVar(&opts.Lossless, "lossless", false, "Lossless compression (webp, avif, jxl), ignores quality")
-	convert.BoolVar(&opts.Combine, "combine", false, "Combine all inputs into a single archive")
-	convert.StringVar(&opts.OutFile, "outfile", "", "Output file name for --combine (default: first input + -combined)")
 	convert.IntVar(&opts.Filter, "filter", 2, "0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos")
 	convert.BoolVar(&opts.NoCover, "no-cover", false, "Do not convert the cover image")
 	convert.BoolVar(&opts.NoRGB, "no-rgb", false, "Do not convert images that have RGB colorspace")
@@ -203,8 +188,6 @@ func parseFlags() (cbconvert.Options, []string) {
 	cover.BoolVar(&opts.Fit, "fit", false, "Best fit for required width and height")
 	cover.StringVar(&opts.Format, "format", "jpeg", "Image format, valid values are jpeg, png, tiff, bmp, webp, avif")
 	cover.IntVar(&opts.Quality, "quality", 75, "Image quality")
-	cover.IntVar(&opts.Effort, "effort", -1, "Encoder speed/effort, format-specific (webp method 0-6, avif speed 0-10, jxl effort 1-10), -1 uses the format default")
-	cover.BoolVar(&opts.Lossless, "lossless", false, "Lossless compression (webp, avif, jxl), ignores quality")
 	cover.IntVar(&opts.Filter, "filter", 2, "0=NearestNeighbor, 1=Box, 2=Linear, 3=MitchellNetravali, 4=CatmullRom, 6=Gaussian, 7=Lanczos")
 	cover.StringVar(&opts.OutDir, "outdir", ".", "Output directory")
 	cover.IntVar(&opts.Size, "size", 0, "Process only files larger than size (in MB)")
@@ -235,7 +218,7 @@ func parseFlags() (cbconvert.Options, []string) {
 		fmt.Fprintf(os.Stderr, "Usage: %s <command> [<flags>] [file1 dir1 ... fileOrDirN]\n\n", filepath.Base(os.Args[0]))
 		fmt.Fprintf(os.Stderr, "\nCommands:\n")
 		fmt.Fprintf(os.Stderr, "\n  convert\n    \tConvert archive or document\n\n")
-		order := []string{"width", "height", "fit", "format", "archive", "quality", "effort", "lossless", "combine", "outfile", "filter", "no-cover", "no-rgb",
+		order := []string{"width", "height", "fit", "format", "archive", "quality", "filter", "no-cover", "no-rgb",
 			"no-nonimage", "no-convert", "grayscale", "rotate", "brightness", "contrast", "suffix", "outdir", "size", "recursive", "quiet"}
 		for _, name := range order {
 			f := convert.Lookup(name)
@@ -243,7 +226,7 @@ func parseFlags() (cbconvert.Options, []string) {
 			fmt.Fprintf(os.Stderr, "%v (default %q)\n", f.Usage, f.DefValue)
 		}
 		fmt.Fprintf(os.Stderr, "\n  cover\n    \tExtract cover\n\n")
-		order = []string{"width", "height", "fit", "format", "quality", "effort", "lossless", "combine", "outfile", "filter", "outdir", "size", "recursive", "quiet"}
+		order = []string{"width", "height", "fit", "format", "quality", "filter", "outdir", "size", "recursive", "quiet"}
 		for _, name := range order {
 			f := cover.Lookup(name)
 			fmt.Fprintf(os.Stderr, "    --%s\n    \t", f.Name)
@@ -314,7 +297,7 @@ func parseFlags() (cbconvert.Options, []string) {
 	return opts, args
 }
 
-// piped checks if we have piped stdin.
+// piped checks if we have a piped stdin.
 func piped() bool {
 	f, err := os.Stdin.Stat()
 	if err != nil {
@@ -328,7 +311,7 @@ func piped() bool {
 	return true
 }
 
-// lines returns slice of lines from the reader.
+// lines returns slice of lines from reader.
 func lines(r io.Reader) []string {
 	data := make([]string, 0)
 	scanner := bufio.NewScanner(r)

go.mod

@@ -1,52 +1,32 @@
 module github.com/gen2brain/cbconvert
 
-go 1.26
+go 1.23
 
 require (
-	github.com/anthonynsimon/bild v0.15.0
+	github.com/anthonynsimon/bild v0.14.0
 	github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fvbommel/sortorder v1.1.0
-	github.com/gen2brain/avif v0.5.1
+	github.com/gen2brain/avif v0.4.1
-	github.com/gen2brain/go-fitz v1.24.15
+	github.com/gen2brain/go-fitz v1.24.14
-	github.com/gen2brain/jpegli v0.4.0
+	github.com/gen2brain/go-unarr v0.2.3
-	github.com/gen2brain/jpegxl v0.5.1
+	github.com/gen2brain/jpegli v0.3.3
-	github.com/gen2brain/webp v0.6.1
+	github.com/gen2brain/jpegxl v0.4.2
+	github.com/gen2brain/webp v0.5.1
 	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25
-	github.com/mholt/archives v0.1.5
+	golang.org/x/image v0.21.0
-	golang.org/x/image v0.43.0
+	golang.org/x/sync v0.8.0
-	golang.org/x/sync v0.21.0
 )
 
 require (
-	github.com/STARRY-S/zip v0.2.3 // indirect
-	github.com/andybalholm/brotli v1.2.1 // indirect
-	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.6.4 // indirect
-	github.com/bodgit/windows v1.0.1 // indirect
-	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
-	github.com/ebitengine/purego v0.10.1 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
-	github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 // indirect
+	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
-	github.com/jupiterrider/ffi v0.7.0 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
-	github.com/klauspost/compress v1.18.6 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/mikelolasagasti/xz v1.0.1 // indirect
-	github.com/minio/minlz v1.1.1 // indirect
-	github.com/nwaples/rardecode/v2 v2.2.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.27 // indirect
-	github.com/sorairolake/lzip-go v0.3.8 // indirect
-	github.com/spf13/afero v1.15.0 // indirect
-	github.com/stangelandcl/ppmd v0.1.1 // indirect
-	github.com/tetratelabs/wazero v1.12.0 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
-	go4.org v0.0.0-20260112195520-a5071408f32f // indirect
-	golang.org/x/net v0.56.0 // indirect
-	golang.org/x/sys v0.46.0 // indirect
-	golang.org/x/text v0.38.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -1,21 +1,5 @@
-github.com/STARRY-S/zip v0.2.3 h1:luE4dMvRPDOWQdeDdUxUoZkzUIpTccdKdhHHsQJ1fm4=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-github.com/STARRY-S/zip v0.2.3/go.mod h1:lqJ9JdeRipyOQJrYSOtpNAiaesFO6zVDsE8GIGFaoSk=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
-github.com/andybalholm/brotli v1.2.1 h1:R+f5xP285VArJDRgowrfb9DqL18yVK0gKAW/F+eTWro=
-github.com/andybalholm/brotli v1.2.1/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/anthonynsimon/bild v0.15.0 h1:FzvaNLuNlAPKw1Xz7V2WYOcGIEBMj8Y6ZyAk7CI+HzA=
-github.com/anthonynsimon/bild v0.15.0/go.mod h1:qIgJ9FldkCn0iy5Ad24fzUkz5R+iJ0WfhiV+6FeCB5A=
-github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
-github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
-github.com/bodgit/sevenzip v1.6.4 h1:iHiVJfxbrB6RF4X+snI2MpVgNBKmVfGaTqZGNlMQIU0=
-github.com/bodgit/sevenzip v1.6.4/go.mod h1:ZtNi5KNgHXeXg1G7WiF0IWSuFE2eG6lt/cTGlvuirO0=
-github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
-github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
-github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
-github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
 github.com/dsoprea/go-exif/v2 v2.0.0-20200604193436-ca8584a0e1c4/go.mod h1:9EXlPeHfblFFnwu5UOqmP2eoZfJyAZ2Ri/Vki33ajO0=
 github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d h1:yeH8wrJa3+8uKKDAdURHUK1ds2UvKhMqX2MiOdVeKPs=
@@ -34,20 +18,28 @@ github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/
 github.com/dsoprea/go-utility/v2 v2.0.0-20200717064901-2fccff4aa15e/go.mod h1:uAzdkPTub5Y9yQwXe8W4m2XuP0tK4a9Q/dantD0+uaU=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQmYw=
 github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
-github.com/gen2brain/avif v0.5.1 h1:LQzLsJpWyGlsa4wuZ3D57qEbCiICIK7Yidz5ZPEwzTk=
+github.com/gen2brain/avif v0.4.0 h1:JuwAX2rVrkAzQrZx9lpIKx/ovCO35gCUquarfJ6uhHc=
-github.com/gen2brain/avif v0.5.1/go.mod h1:QgrYqdVE9y40PCfArK9VakcMIpYeDYpZmCSLkW6C1n8=
+github.com/gen2brain/avif v0.4.0/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-fitz v1.24.15 h1:sJNB1MOWkqnzzENPHggFpgxTwW0+S5WF/rM5wUBpJWo=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/go-fitz v1.24.15/go.mod h1:SftkiVbTHqF141DuiLwBBM65zP7ig6AVDQpf2WlHamo=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/jpegli v0.4.0 h1:TnmAO8EcekS/XCboyLPjP6cqz025tkhdaFkiYNd3wH8=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/gen2brain/jpegli v0.4.0/go.mod h1:zJ++s4symmKCN1CLkrY0dGXTY3s0NWbd94Rz9KLdCzk=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/gen2brain/jpegxl v0.5.1 h1:UuBUIkZ35DErImU3bTA6rltfV5zSgVNOA/K5a6JibfE=
+github.com/gen2brain/go-unarr v0.2.3 h1:VwZg0P6Dc/8Uh51McjVhzUMg4wHwwbiyqjEFsFELc0c=
-github.com/gen2brain/jpegxl v0.5.1/go.mod h1:Wlc6lqx03RJfhiQRyHa2e+8VQwT4/qv7zSRsNv9T+yE=
+github.com/gen2brain/go-unarr v0.2.3/go.mod h1:hoHheVuf0KT8/hfvkEL7GMwj2h7fq0lF72NdyySdr3c=
-github.com/gen2brain/webp v0.6.1 h1:ei7Y1SWpQcdqz3YNDNyn4y2nQanxs9WLzwW5/2DKS64=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
-github.com/gen2brain/webp v0.6.1/go.mod h1:iGWMaCSw7t3I/Cv9llzEKmpnR36S8lS8VL/ZVjxU0JE=
+github.com/gen2brain/jpegli v0.3.3/go.mod h1:6Dbgr+ni1IUBqGVOKHn8lY+6DvwSGfAfC7pPQiSK6uA=
+github.com/gen2brain/jpegxl v0.4.1 h1:jWaVp5GkXLJXjRvC+g0R9+uo+xoWiS7DYKxJ3n5gHL4=
+github.com/gen2brain/jpegxl v0.4.1/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
+github.com/gen2brain/jpegxl v0.4.2 h1:Ff0jAWtCRdc9yjPc9jkyak6Ji/A89Jg0KI+D7qOEtRI=
+github.com/gen2brain/jpegxl v0.4.2/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
+github.com/gen2brain/webp v0.5.0 h1:nn3o0BtKltoFKX9rlDZG/Y/aWqNzUZVyXdB815yVNfU=
+github.com/gen2brain/webp v0.5.0/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
+github.com/gen2brain/webp v0.5.1 h1:ly9olTGveZEpq3soJuCmex9fxLJ0ipHcQRRSRit5EUE=
+github.com/gen2brain/webp v0.5.1/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
 github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
@@ -55,87 +47,33 @@ github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8b
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82 h1:q100v18oYIaE4p5myLFqDyfXTOxivzwGyLjGCEfv8x4=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
-github.com/golang/geo v0.0.0-20260622181633-f80708c60e82/go.mod h1:Mymr9kRGDc64JPr03TSZmuIBODZ3KyswLzm1xL0HFA8=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/jupiterrider/ffi v0.7.0 h1:RKsl6Ascal+3kyAqR5Qcbp83LceQMLc1VZbPfHWoNzs=
+github.com/jupiterrider/ffi v0.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
-github.com/jupiterrider/ffi v0.7.0/go.mod h1:9dauhpOfNqrqk28fxuu0kkdeFtT9Qr4vbfigiuIXN7c=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
-github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
-github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/mholt/archives v0.1.5 h1:Fh2hl1j7VEhc6DZs2DLMgiBNChUux154a1G+2esNvzQ=
-github.com/mholt/archives v0.1.5/go.mod h1:3TPMmBLPsgszL+1As5zECTuKwKvIfj6YcwWPpeTAXF4=
-github.com/mikelolasagasti/xz v1.0.1 h1:Q2F2jX0RYJUG3+WsM+FJknv+6eVjsjXNDV0KJXZzkD0=
-github.com/mikelolasagasti/xz v1.0.1/go.mod h1:muAirjiOUxPRXwm9HdDtB3uoRPrGnL85XHtokL9Hcgc=
-github.com/minio/minlz v1.1.1 h1:OGmft1V6AnI/Wme332U6bhG54nxEan+VFgkD7lat4KM=
-github.com/minio/minlz v1.1.1/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
-github.com/nwaples/rardecode/v2 v2.2.5 h1:L5doqgGfQwI7qADJMqnkrSB86rpPsqQDrHeO0HWa5JY=
-github.com/nwaples/rardecode/v2 v2.2.5/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
-github.com/pierrec/lz4/v4 v4.1.27 h1:+PhzhWDrjRj89TH2sw43nE3+4+W8lSxIuQadEHZyjUk=
-github.com/pierrec/lz4/v4 v4.1.27/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sorairolake/lzip-go v0.3.8 h1:j5Q2313INdTA80ureWYRhX+1K78mUXfMoPZCw/ivWik=
-github.com/sorairolake/lzip-go v0.3.8/go.mod h1:JcBqGMV0frlxwrsE9sMWXDjqn3EeVf0/54YPsw66qkU=
-github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
-github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
-github.com/stangelandcl/ppmd v0.1.1 h1:c25QazhlWUn5nmR1QOzafKhQxBicAr7GGCKER2aJ8H8=
-github.com/stangelandcl/ppmd v0.1.1/go.mod h1:Rrv7M+/2P5jYr/GMLhBl7Ug3uJ1bUiVzr5LbbaV6xgY=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tetratelabs/wazero v1.12.0 h1:DuWcpNu/FzgEXgGBDp8J1Spc+CWOvvtvVyjKlaZopYU=
-github.com/tetratelabs/wazero v1.12.0/go.mod h1:LvKtzl2RqO4gyF27BiXU+nKAjcV8f38U+kP/q2vgxh0=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
-github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
-go4.org v0.0.0-20260112195520-a5071408f32f h1:ziUVAjmTPwQMBmYR1tbdRFJPtTcQUI12fH9QQjfb0Sw=
-go4.org v0.0.0-20260112195520-a5071408f32f/go.mod h1:ZRJnO5ZI4zAwMFp+dS1+V6J6MSyAowhRqAE+DPa1Xp0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.43.0 h1:FLxcP4ec2350nTfOC8ysKtqYSIFbk/QGjw1ZHNP4tsY=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/image v0.43.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
-golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
-golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=