Update modules

.github/workflows/test.yml

@@ -1,120 +1,23 @@
 on: [push, pull_request]
 name: Test
 jobs:
-  build:
+  test:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        go-version: [1.23.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    env:
+      CGO_ENABLED: 0
     steps:
-
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v1.13
-      with:
-        cmake-version: '3.27.x'
-
-    - name: Update apt-get
-      run: |
-        sudo apt-get update
-
-    - name: Wget libheif
-      uses: wei/wget@v1
-      with:
-        args: https://github.com/strukturag/libheif/releases/download/v1.15.2/libheif-1.15.2.tar.gz
-    - name: Unpack libheif
-      run: |
-        tar -xpf libheif-1.15.2.tar.gz
-    - name: Install libheif dependencies
-      run: |
-        sudo apt-get install libaom-dev -y
-    - name: Configure libheif
-      working-directory: libheif-1.15.2
-      run: |
-        ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --enable-shared --disable-static --disable-libde265 \
-        --disable-dav1d --disable-go --enable-aom --disable-gdk-pixbuf --disable-rav1e --disable-tests --disable-x265 --disable-examples
-    - name: Install libheif
-      working-directory: libheif-1.15.2
-      run: |
-        make -j3 && sudo make install
-
-    - name: Wget lcms2
-      uses: wei/wget@v1
-      with:
-        args: https://github.com/mm2/Little-CMS/releases/download/lcms2.15/lcms2-2.15.tar.gz
-    - name: Unpack lcms2
-      run: |
-        tar -xpf lcms2-2.15.tar.gz
-    - name: Configure lcms2
-      working-directory: lcms2-2.15
-      run: |
-        ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --enable-shared --disable-static
-    - name: Install lcms2
-      working-directory: lcms2-2.15
-      run: |
-        make -j3 && sudo make install
-
-    - name: Wget highway
-      uses: wei/wget@v1
-      with:
-        args: -O highway-1.0.5.tar.gz https://github.com/google/highway/archive/refs/tags/1.0.5.tar.gz
-    - name: Unpack highway
-      run: |
-        tar -xpf highway-1.0.5.tar.gz && mkdir -p highway-1.0.5/build
-    - name: Configure highway
-      working-directory: highway-1.0.5/build
-      run: |
-        cmake -DCMAKE_INSTALL_PREFIX=/usr -DHWY_ENABLE_TESTS=OFF -DHWY_ENABLE_EXAMPLES=OFF -DHWY_WARNINGS_ARE_ERRORS=OFF ../
-    - name: Install highway
-      working-directory: highway-1.0.5/build
-      run: |
-        make -j3 && sudo make install
-
-    - name: Wget libjxl
-      uses: wei/wget@v1
-      with:
-        args: -O libjxl-0.8.2.tar.gz https://github.com/libjxl/libjxl/archive/refs/tags/v0.8.2.tar.gz
-    - name: Unpack libjxl
-      run: |
-        tar -xpf libjxl-0.8.2.tar.gz && mkdir -p libjxl-0.8.2/build
-    - name: Configure libjxl
-      working-directory: libjxl-0.8.2/build
-      run: |
-        cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DJPEGXL_ENABLE_BENCHMARK=OFF \
-        -DJPEGXL_ENABLE_COVERAGE=OFF -DJPEGXL_ENABLE_FUZZERS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF \
-        -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-        -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DJPEGXL_ENABLE_TCMALLOC=OFF \
-        -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_OPENEXR=OFF -DBUILD_TESTING=OFF \
-        -DJXL_HWY_DISABLED_TARGETS_FORCED=ON -DJPEGXL_FORCE_SYSTEM_BROTLI=ON -DJPEGXL_FORCE_SYSTEM_HWY=ON ../
-    - name: Install libjxl
-      working-directory: libjxl-0.8.2/build
-      run: |
-        make -j3 && sudo make install
-
-    - name: Wget ImageMagick
-      uses: wei/wget@v1
-      with:
-        args: -O ImageMagick-7.1.1-15.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-15.tar.gz
-    - name: Unpack ImageMagick
-      run: |
-        tar -xpf ImageMagick-7.1.1-15.tar.gz
-    - name: Configure ImageMagick
-      working-directory: ImageMagick-7.1.1-15
-      run: |
-        ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --enable-shared --disable-static --enable-zero-configuration \
-        --without-frozenpaths --without-utilities --disable-hdri --disable-opencl --without-modules --without-magick-plus-plus --without-perl \
-        --without-bzlib --without-x --without-zip --with-zlib --without-dps --without-djvu --without-autotrace --without-fftw \
-        --without-fpx --without-fontconfig --without-freetype --without-gslib --without-gvc --without-jbig --without-openjp2 \
-        --without-lcms --without-lqr --without-lzma --without-openexr --without-pango --without-raw --without-rsvg --without-wmf \
-        --without-xml --disable-openmp --with-jpeg --with-heic --with-jxl --with-png --with-tiff --with-webp
-    - name: Install ImageMagick
-      working-directory: ImageMagick-7.1.1-15
-      run: |
-        make -j3 && sudo make install
-
-    - name: Install Go
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.21
-
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
-
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.go-version }}
     - name: Test
       run: go test
+      env:
+        CGO_ENABLED: 1

.gitignore

@@ -0,0 +1,5 @@
+cmd/cbconvert-gui/cbconvert-gui
+cmd/cbconvert/cbconvert
+
+.idea
+.vscode

README.md

@@ -12,37 +12,28 @@ See more [screenshots](https://github.com/gen2brain/cbconvert/blob/master/cmd/cb
 
 ### Features
 
-* reads CBR (RAR), CBZ (ZIP), CB7 (7Z), CBT (TAR), PDF, XPS, EPUB, MOBI and plain directory
+* reads CBR (RAR), CBZ (ZIP), CB7 (7Z), CBT (TAR), PDF, XPS, EPUB, MOBI, DOCX, PPTX and plain directory
 * saves processed files in ZIP archive format or TAR
 * images can be converted to JPEG, PNG, TIFF, WEBP, AVIF, JXL, or 4-Bit BMP (16 colors) image format
-* rotate, adjust brightness/contrast, adjust levels (Photoshop-like) or grayscale images
+* rotate, adjust brightness/contrast or grayscale images
 * resize filters (NearestNeighbor, Box, Linear, MitchellNetravali, CatmullRom, Gaussian, Lanczos)
 * export covers from comics
 * create thumbnails from covers by [FreeDesktop](http://specifications.freedesktop.org/thumbnail-spec/thumbnail-spec-latest.html) specification
 
 ### Download
 
-* [Windows x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-windows-x86_64.zip)
+Download the latest binaries from the [releases](https://github.com/gen2brain/cbconvert/releases).
-* [Linux x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-linux-x86_64.tar.gz)
-* [macOS x86_64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-darwin-x86_64.zip)
-* [macOS aarch64](https://github.com/gen2brain/cbconvert/releases/latest/download/cbconvert-1.0.0-darwin-aarch64.zip)
 
-[![flathub](https://dl.flathub.org/assets/badges/flathub-badge-en.png)](https://flathub.org/apps/io.github.gen2brain.cbconvert)
+Linux Flatpak is available at [Flathub](https://flathub.org/apps/io.github.gen2brain.cbconvert).
 
 ### Using cbconvert in file managers to generate FreeDesktop thumbnails
 
-Copy `cbconvert` cli binary to your PATH and create file `~/.local/share/thumbnailers/cbconvert.thumbnailer`:
+Copy/install `cbconvert` cli binary to your `PATH`, create file `~/.local/share/thumbnailers/cbconvert.thumbnailer`
+and paste contents from [thumbnailer](https://github.com/gen2brain/cbconvert/tree/master/cmd/cbconvert-gui/dist/linux/io.github.gen2brain.cbconvert.thumbnailer).
 
-```
+This is what it looks like in the `PCManFM` file manager:
-[Thumbnailer Entry]
-TryExec=cbconvert
-Exec=cbconvert thumbnail --quiet --width %s --outfile %o %i
-MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;application/vnd.ms-xpsdocument;
-```
 
-This is what it looks like in the PCManFM file manager:
+<img src="cmd/cbconvert-gui/screenshots/thumbnails.jpg" width="700" alt="thumbnails" />
-
-<img src="cmd/cbconvert/screenshots/thumbnails.jpg" width="700" alt="thumbnails" />
 
 
 ### Using command line app
@@ -64,8 +55,8 @@ This is what it looks like in the PCManFM file manager:
             Best fit for required width and height (default "false")
         --format
             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
             Image quality (default "75")
         --filter
@@ -77,7 +68,7 @@ This is what it looks like in the PCManFM file manager:
         --no-nonimage
             Remove non-image files from the archive (default "false")
         --no-convert
-    	    Do not transform or convert images (default "false")
+            Do not transform or convert images (default "false")
         --grayscale
             Convert images to grayscale (monochromatic) (default "false")
         --rotate
@@ -88,16 +79,6 @@ This is what it looks like in the PCManFM file manager:
             Adjust the contrast of the images, must be in the range (-100, 100) (default "0")
         --suffix
             Add suffix to file basename (default "")
-        --levels-inmin
-            Shadow input value (default "0")
-        --levels-gamma
-            Midpoint/Gamma (default "1")
-        --levels-inmax
-            Highlight input value (default "255")
-        --levels-outmin
-            Shadow output value (default "0")
-        --levels-outmax
-            Highlight output value (default "255")
         --outdir
             Output directory (default ".")
         --size
@@ -153,19 +134,19 @@ This is what it looks like in the PCManFM file manager:
         --quiet
             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(s) from archive (glob pattern, i.e. *.xml) (default "")
+            Remove file(s) from archive (glob pattern, i.e. *.xml) (default "")
 
 ```
 
@@ -201,10 +182,17 @@ This table maps quality settings for JPEG to the respective AVIF and WEBP qualit
 
 ### Compile
 
-Install ImageMagick7 (with libheif/libjxl support) and MuPDF libraries and headers and then install to GOBIN:
+You must have `CGO_ENABLED=1`. Note that `Go` will disable cgo when cross-compiling.
 
-`go install -tags extlib github.com/gen2brain/cbconvert/cmd/cbconvert@latest`
+Install to `GOBIN` (you can point `GOBIN` to e.g. `/usr/local/bin` or `~/.local/bin`):
 
-For GUI app, check [IUP requirements](https://github.com/gen2brain/iup-go), and then install:
+`go install github.com/gen2brain/cbconvert/cmd/cbconvert@latest`
 
-`go install -tags extlib github.com/gen2brain/cbconvert/cmd/cbconvert-gui@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_archive.go

@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/gen2brain/go-unarr"
 )
@@ -30,12 +31,13 @@ func (c *Converter) archiveSaveZip(fileName string) error {
 
 	var zipName string
 	if c.Opts.Recursive {
-		err := os.MkdirAll(filepath.Join(c.Opts.OutDir, filepath.Dir(fileName)), 0755)
+		fDir := strings.Split(filepath.Dir(fileName), string(os.PathSeparator))[1:]
+		err := os.MkdirAll(filepath.Join(c.Opts.OutDir, filepath.Join(fDir...)), 0755)
 		if err != nil {
 			return fmt.Errorf("archiveSaveZip: %w", err)
 		}
 
-		zipName = filepath.Join(c.Opts.OutDir, filepath.Dir(fileName), fmt.Sprintf("%s%s.cbz", baseNoExt(fileName), c.Opts.Suffix))
+		zipName = filepath.Join(c.Opts.OutDir, filepath.Join(fDir...), fmt.Sprintf("%s%s.cbz", baseNoExt(fileName), c.Opts.Suffix))
 	} else {
 		zipName = filepath.Join(c.Opts.OutDir, fmt.Sprintf("%s%s.cbz", baseNoExt(fileName), c.Opts.Suffix))
 	}
@@ -104,12 +106,13 @@ func (c *Converter) archiveSaveTar(fileName string) error {
 
 	var tarName string
 	if c.Opts.Recursive {
-		err := os.MkdirAll(filepath.Join(c.Opts.OutDir, filepath.Dir(fileName)), 0755)
+		fDir := strings.Split(filepath.Dir(fileName), string(os.PathSeparator))[1:]
+		err := os.MkdirAll(filepath.Join(c.Opts.OutDir, filepath.Join(fDir...)), 0755)
 		if err != nil {
 			return fmt.Errorf("archiveSaveTar: %w", err)
 		}
 
-		tarName = filepath.Join(c.Opts.OutDir, filepath.Dir(fileName), fmt.Sprintf("%s%s.cbt", baseNoExt(fileName), c.Opts.Suffix))
+		tarName = filepath.Join(c.Opts.OutDir, filepath.Join(fDir...), fmt.Sprintf("%s%s.cbt", baseNoExt(fileName), c.Opts.Suffix))
 	} else {
 		tarName = filepath.Join(c.Opts.OutDir, fmt.Sprintf("%s%s.cbt", baseNoExt(fileName), c.Opts.Suffix))
 	}

cbconvert_convert.go

@@ -0,0 +1,408 @@
+package cbconvert
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"image"
+	"image/png"
+	"io"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"sync/atomic"
+
+	"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"
+	"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)
+	}
+
+	defer doc.Close()
+
+	c.Ncontents = doc.NumPage()
+	c.CurrContent = 0
+
+	if c.OnStart != nil {
+		c.OnStart()
+	}
+
+	eg, ctx := errgroup.WithContext(ctx)
+	eg.SetLimit(runtime.NumCPU() + 1)
+
+	for n := 0; n < c.Ncontents; n++ {
+		if ctx.Err() != nil {
+			return fmt.Errorf("convertDocument: %w", ctx.Err())
+		}
+
+		img, err := doc.Image(n)
+		if err != nil {
+			return fmt.Errorf("convertDocument: %w", err)
+		}
+
+		if img != nil {
+			eg.Go(func() error {
+				return c.imageConvert(ctx, img, n, "")
+			})
+		}
+	}
+
+	err = eg.Wait()
+	if err != nil {
+		return fmt.Errorf("convertDocument: %w", err)
+	}
+
+	return nil
+}
+
+// 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)
+	}
+
+	images := imagesFromSlice(contents)
+
+	c.Ncontents = len(images)
+	c.CurrContent = 0
+
+	if c.OnStart != nil {
+		c.OnStart()
+	}
+
+	cover := c.coverName(images)
+
+	archive, err := unarr.NewArchive(fileName)
+	if err != nil {
+		return fmt.Errorf("convertArchive: %w", err)
+	}
+	defer archive.Close()
+
+	eg, ctx := errgroup.WithContext(ctx)
+	eg.SetLimit(runtime.NumCPU() + 1)
+
+	for {
+		if ctx.Err() != nil {
+			return fmt.Errorf("convertArchive: %w", ctx.Err())
+		}
+
+		err := archive.Entry()
+		if err != nil {
+			if errors.Is(err, io.EOF) {
+				break
+			}
+
+			return fmt.Errorf("convertArchive: %w", err)
+		}
+
+		data, err := archive.ReadAll()
+		if err != nil {
+			return fmt.Errorf("convertArchive: %w", err)
+		}
+
+		pathName := archive.Name()
+
+		if isImage(pathName) {
+			if c.Opts.NoConvert {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
+					return fmt.Errorf("convertArchive: %w", err)
+				}
+
+				continue
+			}
+
+			if cover == pathName && c.Opts.NoCover {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
+					return fmt.Errorf("convertArchive: %w", err)
+				}
+
+				continue
+			}
+
+			var img image.Image
+			img, err = c.imageDecode(bytes.NewReader(data))
+			if err != nil {
+				return fmt.Errorf("convertArchive: %w", err)
+			}
+
+			if c.Opts.NoRGB && !isGrayScale(img) {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
+					return fmt.Errorf("convertArchive: %w", err)
+				}
+
+				continue
+			}
+
+			if img != nil {
+				eg.Go(func() error {
+					return c.imageConvert(ctx, img, 0, pathName)
+				})
+			}
+		} else {
+			if filepath.Ext(pathName) == ".DS_Store" || strings.Contains(pathName, "__MACOSX") {
+				continue
+			}
+
+			if !c.Opts.NoNonImage {
+				if err = copyFile(bytes.NewReader(data), filepath.Join(c.Workdir, filepath.Base(pathName))); err != nil {
+					return fmt.Errorf("convertArchive: %w", err)
+				}
+			}
+		}
+	}
+
+	err = eg.Wait()
+	if err != nil {
+		return fmt.Errorf("convertArchive: %w", err)
+	}
+
+	return nil
+}
+
+// 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)
+	}
+
+	images := imagesFromSlice(contents)
+	c.Ncontents = len(images)
+	c.CurrContent = 0
+
+	if c.OnStart != nil {
+		c.OnStart()
+	}
+
+	eg, ctx := errgroup.WithContext(ctx)
+	eg.SetLimit(runtime.NumCPU() + 1)
+
+	for index, img := range contents {
+		if ctx.Err() != nil {
+			return fmt.Errorf("convertDirectory: %w", ctx.Err())
+		}
+
+		file, err := os.Open(img)
+		if err != nil {
+			return fmt.Errorf("convertDirectory: %w", err)
+		}
+
+		if isNonImage(img) && !c.Opts.NoNonImage {
+			if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
+				return fmt.Errorf("convertDirectory: %w", err)
+			}
+
+			if err = file.Close(); err != nil {
+				return fmt.Errorf("convertDirectory: %w", err)
+			}
+
+			continue
+		} else if isImage(img) {
+			if c.Opts.NoConvert {
+				if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
+					return fmt.Errorf("convertDirectory: %w", err)
+				}
+
+				if err = file.Close(); err != nil {
+					return fmt.Errorf("convertDirectory: %w", err)
+				}
+
+				continue
+			}
+
+			var i image.Image
+			i, err = c.imageDecode(file)
+			if err != nil {
+				return fmt.Errorf("convertDirectory: %w", err)
+			}
+
+			if c.Opts.NoRGB && !isGrayScale(i) {
+				if err = copyFile(file, filepath.Join(c.Workdir, filepath.Base(img))); err != nil {
+					return fmt.Errorf("convertDirectory: %w", err)
+				}
+
+				if err = file.Close(); err != nil {
+					return fmt.Errorf("convertDirectory: %w", err)
+				}
+
+				continue
+			}
+
+			if err = file.Close(); err != nil {
+				return fmt.Errorf("convertDirectory: %w", err)
+			}
+
+			if i != nil {
+				eg.Go(func() error {
+					return c.imageConvert(ctx, i, index, img)
+				})
+			}
+		}
+	}
+
+	err = eg.Wait()
+	if err != nil {
+		return fmt.Errorf("convertDirectory: %w", err)
+	}
+
+	return nil
+}
+
+// imageConvert converts image.Image.
+func (c *Converter) imageConvert(ctx context.Context, img image.Image, index int, pathName string) error {
+	err := ctx.Err()
+	if err != nil {
+		return fmt.Errorf("imageConvert: %w", err)
+	}
+
+	atomic.AddInt32(&c.CurrContent, 1)
+	if c.OnProgress != nil {
+		c.OnProgress()
+	}
+
+	ext := c.Opts.Format
+	if ext == "jpeg" {
+		ext = "jpg"
+	}
+
+	var fileName string
+	if pathName != "" {
+		fileName = filepath.Join(c.Workdir, fmt.Sprintf("%s.%s", baseNoExt(pathName), ext))
+	} else {
+		fileName = filepath.Join(c.Workdir, fmt.Sprintf("%03d.%s", index, ext))
+	}
+
+	img = c.imageTransform(img)
+
+	w, err := os.Create(fileName)
+	if err != nil {
+		return fmt.Errorf("imageConvert: %w", err)
+	}
+	defer w.Close()
+
+	if err := c.imageEncode(img, w); err != nil {
+		return fmt.Errorf("imageConvert: %w", err)
+	}
+
+	return nil
+}
+
+// imageTransform transforms image (resize, rotate, brightness, contrast).
+func (c *Converter) imageTransform(img image.Image) image.Image {
+	var i = img
+
+	if c.Opts.Width > 0 || c.Opts.Height > 0 {
+		if c.Opts.Fit {
+			i = fit(i, c.Opts.Width, c.Opts.Height, filters[c.Opts.Filter])
+		} else {
+			i = resize(i, c.Opts.Width, c.Opts.Height, filters[c.Opts.Filter])
+		}
+	}
+
+	if c.Opts.Rotate > 0 {
+		switch c.Opts.Rotate {
+		case 90:
+			i = rotate(i, 90)
+		case 180:
+			i = rotate(i, 180)
+		case 270:
+			i = rotate(i, 270)
+		}
+	}
+
+	if c.Opts.Brightness != 0 {
+		i = brightness(i, float64(c.Opts.Brightness))
+	}
+
+	if c.Opts.Contrast != 0 {
+		i = contrast(i, float64(c.Opts.Contrast))
+	}
+
+	if c.Opts.Grayscale {
+		i = imageToGray(i)
+	}
+
+	return i
+}
+
+// imageDecode decodes image from reader.
+func (c *Converter) imageDecode(reader io.Reader) (image.Image, error) {
+	img, _, err := image.Decode(reader)
+	if err != nil {
+		return img, fmt.Errorf("imageDecode: %w", err)
+	}
+
+	return img, nil
+}
+
+// imageEncode encodes image to file.
+func (c *Converter) imageEncode(img image.Image, w io.Writer) error {
+	var err error
+
+	switch c.Opts.Format {
+	case "png":
+		err = png.Encode(w, img)
+	case "tiff":
+		err = tiff.Encode(w, img, &tiff.Options{Compression: tiff.Uncompressed})
+	case "jpeg":
+		opts := &jpegli.EncodingOptions{}
+		opts.Quality = c.Opts.Quality
+		opts.ChromaSubsampling = image.YCbCrSubsampleRatio420
+		opts.ProgressiveLevel = 2
+		opts.AdaptiveQuantization = true
+		opts.DCTMethod = jpegli.DefaultDCTMethod
+		err = jpegli.Encode(w, img, opts)
+	case "webp":
+		err = webp.Encode(w, img, webp.Options{Quality: c.Opts.Quality, Method: webp.DefaultMethod})
+	case "avif":
+		err = avif.Encode(w, img, avif.Options{Quality: c.Opts.Quality, Speed: avif.DefaultSpeed})
+	case "jxl":
+		err = jpegxl.Encode(w, img, jpegxl.Options{Quality: c.Opts.Quality, Effort: jpegxl.DefaultEffort})
+	case "bmp":
+		opts := &gobmp.EncoderOptions{}
+		opts.SupportTransparency(false)
+		err = gobmp.EncodeWithOptions(w, imageToPaletted(img), opts)
+	}
+
+	if err != nil {
+		return fmt.Errorf("imageEncode: %w", err)
+	}
+
+	return nil
+}

cbconvert_cover.go

@@ -0,0 +1,153 @@
+package cbconvert
+
+import (
+	"bytes"
+	"fmt"
+	"image"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"github.com/fvbommel/sortorder"
+	"github.com/gen2brain/go-fitz"
+	"github.com/gen2brain/go-unarr"
+)
+
+// coverArchive extracts cover from archive.
+func (c *Converter) coverArchive(fileName string) (image.Image, error) {
+	var images []string
+
+	contents, err := c.archiveList(fileName)
+	if err != nil {
+		return nil, fmt.Errorf("coverArchive: %w", err)
+	}
+
+	for _, ct := range contents {
+		if isImage(ct) {
+			images = append(images, ct)
+		}
+	}
+
+	cover := c.coverName(images)
+
+	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)
+	}
+
+	var img image.Image
+	img, err = c.imageDecode(bytes.NewReader(data))
+	if err != nil {
+		return nil, fmt.Errorf("coverArchive: %w", err)
+	}
+
+	return img, nil
+}
+
+// coverDocument extracts cover from document.
+func (c *Converter) coverDocument(fileName string) (image.Image, error) {
+	doc, err := fitz.New(fileName)
+	if err != nil {
+		return nil, fmt.Errorf("coverDocument: %w", err)
+	}
+	defer doc.Close()
+
+	img, err := doc.Image(0)
+	if err != nil {
+		return nil, fmt.Errorf("coverDocument: %w", err)
+	}
+
+	return img, nil
+}
+
+// coverDirectory extracts cover from directory.
+func (c *Converter) coverDirectory(dir string) (image.Image, error) {
+	contents, err := imagesFromPath(dir)
+	if err != nil {
+		return nil, fmt.Errorf("coverDirectory: %w", err)
+	}
+
+	images := imagesFromSlice(contents)
+	cover := c.coverName(images)
+
+	file, err := os.Open(cover)
+	if err != nil {
+		return nil, fmt.Errorf("coverDirectory: %w", err)
+	}
+	defer file.Close()
+
+	var img image.Image
+	img, err = c.imageDecode(file)
+	if err != nil {
+		return nil, fmt.Errorf("coverDirectory: %w", err)
+	}
+
+	return img, nil
+}
+
+// coverName returns the filename that is the most likely to be the cover.
+func (c *Converter) coverName(images []string) string {
+	if len(images) == 0 {
+		return ""
+	}
+
+	lower := make([]string, 0)
+	for idx, img := range images {
+		img = strings.ToLower(img)
+		lower = append(lower, img)
+		ext := baseNoExt(img)
+
+		if strings.HasPrefix(img, "cover") || strings.HasPrefix(img, "front") ||
+			strings.HasSuffix(ext, "cover") || strings.HasSuffix(ext, "front") {
+			return filepath.ToSlash(images[idx])
+		}
+	}
+
+	sort.Sort(sortorder.Natural(lower))
+	cover := lower[0]
+
+	for idx, img := range images {
+		img = strings.ToLower(img)
+		if img == cover {
+			return filepath.ToSlash(images[idx])
+		}
+	}
+
+	return ""
+}
+
+// coverImage returns cover as image.Image.
+func (c *Converter) coverImage(fileName string, fileInfo os.FileInfo) (image.Image, error) {
+	var err error
+	var cover image.Image
+
+	switch {
+	case fileInfo.IsDir():
+		cover, err = c.coverDirectory(fileName)
+	case isDocument(fileName):
+		cover, err = c.coverDocument(fileName)
+	case isArchive(fileName):
+		cover, err = c.coverArchive(fileName)
+	}
+
+	if c.OnProgress != nil {
+		c.OnProgress()
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("coverImage: %w", err)
+	}
+
+	return cover, nil
+}

cbconvert_func.go

@@ -2,41 +2,12 @@ package cbconvert
 
 import (
 	"fmt"
-	"image"
-	"image/color"
-	"image/draw"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-// imageToRGBA converts an image.Image to *image.RGBA.
-func imageToRGBA(src image.Image) *image.RGBA {
-	if dst, ok := src.(*image.RGBA); ok {
-		return dst
-	}
-
-	b := src.Bounds()
-	dst := image.NewRGBA(b)
-	draw.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
-
-	return dst
-}
-
-// imageToGray converts an image.Image to *image.Gray.
-func imageToGray(src image.Image) *image.Gray {
-	if dst, ok := src.(*image.Gray); ok {
-		return dst
-	}
-
-	b := src.Bounds()
-	dst := image.NewGray(b)
-	draw.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
-
-	return dst
-}
-
 // imagesFromPath returns list of found image files for given directory.
 func imagesFromPath(path string) ([]string, error) {
 	var images []string
@@ -102,7 +73,7 @@ func isArchive(f string) bool {
 
 // isDocument checks if file is document.
 func isDocument(f string) bool {
-	var types = []string{".pdf", ".xps", ".epub", ".mobi"}
+	var types = []string{".pdf", ".xps", ".epub", ".mobi", ".docx", ".pptx", ".xlsx"}
 	for _, t := range types {
 		if strings.ToLower(filepath.Ext(f)) == t {
 			return true
@@ -147,16 +118,6 @@ func isSize(a, b int64) bool {
 	return true
 }
 
-// isGrayScale checks if image is grayscale.
-func isGrayScale(img image.Image) bool {
-	model := img.ColorModel()
-	if model == color.GrayModel || model == color.Gray16Model {
-		return true
-	}
-
-	return false
-}
-
 // baseNoExt returns base name without extension.
 func baseNoExt(filename string) string {
 	return strings.TrimSuffix(filepath.Base(filename), filepath.Ext(filename))

cbconvert_image.go

@@ -0,0 +1,163 @@
+package cbconvert
+
+import (
+	"image"
+	"image/color"
+	"image/draw"
+	"math"
+
+	"github.com/anthonynsimon/bild/adjust"
+	"github.com/anthonynsimon/bild/transform"
+)
+
+// Resample filters.
+const (
+	// NearestNeighbor is the fastest resampling filter, no antialiasing.
+	nearestNeighbor int = iota
+	// Box filter (averaging pixels).
+	box
+	// Linear is the bilinear filter, smooth and reasonably fast.
+	linear
+	// MitchellNetravali is a smooth bicubic filter.
+	mitchellNetravali
+	// CatmullRom is a sharp bicubic filter.
+	catmullRom
+	// 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
+)
+
+var filters = map[int]transform.ResampleFilter{
+	nearestNeighbor:   transform.NearestNeighbor,
+	box:               transform.Box,
+	linear:            transform.Linear,
+	mitchellNetravali: transform.MitchellNetravali,
+	catmullRom:        transform.CatmullRom,
+	gaussian:          transform.Gaussian,
+	lanczos:           transform.Lanczos,
+}
+
+func resize(img image.Image, width, height int, filter transform.ResampleFilter) *image.RGBA {
+	dstW, dstH := width, height
+
+	srcW := img.Bounds().Dx()
+	srcH := img.Bounds().Dy()
+
+	if dstW == 0 {
+		tmpW := float64(dstH) * float64(srcW) / float64(srcH)
+		dstW = int(math.Max(1.0, math.Floor(tmpW+0.5)))
+	}
+	if dstH == 0 {
+		tmpH := float64(dstW) * float64(srcH) / float64(srcW)
+		dstH = int(math.Max(1.0, math.Floor(tmpH+0.5)))
+	}
+
+	if srcW == dstW && srcH == dstH {
+		return imageToRGBA(img)
+	}
+
+	return transform.Resize(img, dstW, dstH, filter)
+}
+
+func fit(img image.Image, width, height int, filter transform.ResampleFilter) *image.RGBA {
+	maxW, maxH := width, height
+
+	b := img.Bounds()
+	srcW := b.Dx()
+	srcH := b.Dy()
+
+	if srcW <= maxW && srcH <= maxH {
+		return imageToRGBA(img)
+	}
+
+	srcAspectRatio := float64(srcW) / float64(srcH)
+	maxAspectRatio := float64(maxW) / float64(maxH)
+
+	var dstW, dstH int
+	if srcAspectRatio > maxAspectRatio {
+		dstW = maxW
+		dstH = int(float64(dstW) / srcAspectRatio)
+	} else {
+		dstH = maxH
+		dstW = int(float64(dstH) * srcAspectRatio)
+	}
+
+	return resize(img, dstW, dstH, filter)
+}
+
+func rotate(img image.Image, angle float64) *image.RGBA {
+	return transform.Rotate(img, angle, &transform.RotationOptions{ResizeBounds: true, Pivot: &image.Point{}})
+}
+
+func brightness(img image.Image, change float64) *image.RGBA {
+	return adjust.Brightness(img, change/100)
+}
+
+func contrast(img image.Image, change float64) *image.RGBA {
+	return adjust.Contrast(img, change/100)
+}
+
+// imageToRGBA converts an image.Image to *image.RGBA.
+func imageToRGBA(src image.Image) *image.RGBA {
+	if dst, ok := src.(*image.RGBA); ok {
+		return dst
+	}
+
+	b := src.Bounds()
+	dst := image.NewRGBA(b)
+	draw.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
+
+	return dst
+}
+
+// imageToGray converts an image.Image to *image.Gray.
+func imageToGray(src image.Image) *image.Gray {
+	if dst, ok := src.(*image.Gray); ok {
+		return dst
+	}
+
+	b := src.Bounds()
+	dst := image.NewGray(b)
+	draw.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
+
+	return dst
+}
+
+// isGrayScale checks if image is grayscale.
+func isGrayScale(img image.Image) bool {
+	model := img.ColorModel()
+	if model == color.GrayModel || model == color.Gray16Model {
+		return true
+	}
+
+	return false
+}
+
+var colors16 = []color.Color{
+	color.RGBA{0, 0, 0, 255},
+	color.RGBA{17, 17, 17, 255},
+	color.RGBA{34, 34, 34, 255},
+	color.RGBA{51, 51, 51, 255},
+	color.RGBA{68, 68, 68, 255},
+	color.RGBA{85, 85, 85, 255},
+	color.RGBA{102, 102, 102, 255},
+	color.RGBA{119, 119, 119, 255},
+	color.RGBA{136, 136, 136, 255},
+	color.RGBA{153, 153, 153, 255},
+	color.RGBA{170, 170, 170, 255},
+	color.RGBA{187, 187, 187, 255},
+	color.RGBA{204, 204, 204, 255},
+	color.RGBA{221, 221, 221, 255},
+	color.RGBA{238, 238, 238, 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.Draw(dst, dst.Bounds(), src, b.Min, draw.Src)
+
+	return dst
+}

cbconvert_test.go

@@ -18,9 +18,6 @@ func TestConvert(t *testing.T) {
 
 	conv := New(opts)
 
-	conv.Initialize()
-	defer conv.Terminate()
-
 	files, err := conv.Files([]string{"testdata/test", "testdata"})
 	if err != nil {
 		t.Error(err)
@@ -56,9 +53,6 @@ func TestCover(t *testing.T) {
 
 	conv := New(opts)
 
-	conv.Initialize()
-	defer conv.Terminate()
-
 	files, err := conv.Files([]string{"testdata/test.cbt"})
 	if err != nil {
 		t.Error(err)
@@ -88,9 +82,6 @@ func TestThumbnail(t *testing.T) {
 
 	conv := New(opts)
 
-	conv.Initialize()
-	defer conv.Terminate()
-
 	files, err := conv.Files([]string{"testdata/test.pdf"})
 	if err != nil {
 		t.Error(err)

cmd/cbconvert-gui/dist/linux/flatpak/io.github.gen2brain.cbconvert.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=CBconvert
-GenericName=A Comic Book converter
-Comment=A comic converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories
-Exec=cbconvert
-Icon=io.github.gen2brain.cbconvert
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Graphics;

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

@@ -1,105 +0,0 @@
-# git.sr.ht/~jackmordaunt/go-libwebp v1.1.0
-## explicit; go 1.21
-git.sr.ht/~jackmordaunt/go-libwebp/lib/common
-git.sr.ht/~jackmordaunt/go-libwebp/lib/dynamic/webp
-git.sr.ht/~jackmordaunt/go-libwebp/lib/transpiled/webp
-git.sr.ht/~jackmordaunt/go-libwebp/webp
-# github.com/disintegration/imaging v1.6.2
-## explicit
-github.com/disintegration/imaging
-# github.com/dustin/go-humanize v1.0.1
-## explicit; go 1.16
-github.com/dustin/go-humanize
-# github.com/ebitengine/purego v0.5.2
-## explicit; go 1.18
-github.com/ebitengine/purego
-github.com/ebitengine/purego/internal/cgo
-github.com/ebitengine/purego/internal/fakecgo
-github.com/ebitengine/purego/internal/strings
-# github.com/fvbommel/sortorder v1.1.0
-## explicit; go 1.13
-github.com/fvbommel/sortorder
-# github.com/gen2brain/cbconvert v1.0.4-0.20240208144735-a8084ed89758
-## explicit; go 1.21
-github.com/gen2brain/cbconvert
-# github.com/gen2brain/go-fitz v1.23.7
-## explicit; go 1.20
-github.com/gen2brain/go-fitz
-# github.com/gen2brain/go-unarr v0.2.0
-## explicit; go 1.19
-github.com/gen2brain/go-unarr
-github.com/gen2brain/go-unarr/unarrc
-# github.com/gen2brain/iup-go/iup v0.0.0-20230906093706-8b037fe6a7bd
-## explicit; go 1.19
-github.com/gen2brain/iup-go/iup
-github.com/gen2brain/iup-go/iup/manifest
-# github.com/godbus/dbus/v5 v5.1.0
-## explicit; go 1.12
-github.com/godbus/dbus/v5
-# github.com/google/uuid v1.6.0
-## explicit
-github.com/google/uuid
-# github.com/mattn/go-isatty v0.0.20
-## explicit; go 1.15
-github.com/mattn/go-isatty
-# github.com/ncruces/go-strftime v0.1.9
-## explicit; go 1.17
-github.com/ncruces/go-strftime
-# github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec
-## explicit; go 1.12
-github.com/remyoudompheng/bigfft
-# golang.org/x/image v0.15.0
-## explicit; go 1.18
-golang.org/x/image/bmp
-golang.org/x/image/ccitt
-golang.org/x/image/riff
-golang.org/x/image/tiff
-golang.org/x/image/tiff/lzw
-golang.org/x/image/vp8
-golang.org/x/image/vp8l
-golang.org/x/image/webp
-# golang.org/x/sync v0.6.0
-## explicit; go 1.18
-golang.org/x/sync/errgroup
-# golang.org/x/sys v0.17.0
-## explicit; go 1.18
-golang.org/x/sys/unix
-golang.org/x/sys/windows
-# gopkg.in/gographics/imagick.v3 v3.5.1
-## explicit; go 1.13
-gopkg.in/gographics/imagick.v3/imagick
-gopkg.in/gographics/imagick.v3/imagick/types
-# modernc.org/libc v1.41.0
-## explicit; go 1.20
-modernc.org/libc
-modernc.org/libc/errno
-modernc.org/libc/fcntl
-modernc.org/libc/fts
-modernc.org/libc/grp
-modernc.org/libc/honnef.co/go/netdb
-modernc.org/libc/langinfo
-modernc.org/libc/limits
-modernc.org/libc/netdb
-modernc.org/libc/netinet/in
-modernc.org/libc/poll
-modernc.org/libc/pthread
-modernc.org/libc/pwd
-modernc.org/libc/signal
-modernc.org/libc/stdio
-modernc.org/libc/stdlib
-modernc.org/libc/sys/socket
-modernc.org/libc/sys/stat
-modernc.org/libc/sys/types
-modernc.org/libc/termios
-modernc.org/libc/time
-modernc.org/libc/unistd
-modernc.org/libc/utime
-modernc.org/libc/uuid
-modernc.org/libc/uuid/uuid
-modernc.org/libc/wctype
-# modernc.org/mathutil v1.6.0
-## explicit; go 1.18
-modernc.org/mathutil
-# modernc.org/memory v1.7.2
-## explicit; go 1.18
-modernc.org/memory

cmd/cbconvert-gui/dist/linux/io.github.gen2brain.cbconvert.desktop

@@ -3,7 +3,7 @@ Name=CBconvert
 GenericName=A Comic Book converter
 Comment=A comic converter with support for .cb*, .pdf, .xps, .epub, .mobi and directories.
 Exec=cbconvert-gui
-Icon=cbconvert
+Icon=io.github.gen2brain.cbconvert
 Terminal=false
 Type=Application
 StartupNotify=true

cmd/cbconvert-gui/dist/linux/io.github.gen2brain.cbconvert.metainfo.xml

@@ -3,7 +3,6 @@
   <id>io.github.gen2brain.cbconvert</id>
 
   <name>CBconvert</name>
-  <developer_name>Milan Nikolic</developer_name>
   <summary>A Comic Book converter</summary>
 
   <metadata_license>MIT</metadata_license>
@@ -16,13 +15,20 @@
     </p>
   </description>
 
+  <developer id="com.github.gen2brain">
+    <name>Milan Nikolic</name>
+  </developer>
+
   <launchable type="desktop-id">io.github.gen2brain.cbconvert.desktop</launchable>
+
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/gen2brain/cbconvert/master/cmd/cbconvert-gui/screenshots/linux-02.jpg</image>
+      <caption>Options</caption>
+      <image>https://raw.githubusercontent.com/gen2brain/cbconvert/master/cmd/cbconvert-gui/screenshots/linux-01.jpg</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/gen2brain/cbconvert/master/cmd/cbconvert-gui/screenshots/linux-01.jpg</image>
+      <caption>Converting</caption>
+      <image>https://raw.githubusercontent.com/gen2brain/cbconvert/master/cmd/cbconvert-gui/screenshots/linux-02.jpg</image>
     </screenshot>
   </screenshots>
 
@@ -32,6 +38,17 @@
   <content_rating type="oars-1.1"/>
 
   <releases>
+    <release version="1.1.0" date="2024-11-06" type="stable">
+      <description>
+        <ul>
+          <li>Use jpegli for smaller files</li>
+          <li>Remove ImageMagick dependency</li>
+          <li>Wayland support</li>
+          <li>Support for DOCX and PPTX</li>
+        </ul>
+      </description>
+      <url type="details">https://github.com/gen2brain/cbconvert/releases/tag/v1.1.0</url>
+    </release>
     <release version="1.0.4" date="2024-02-08" type="stable">
       <description>
         <ul>

cmd/cbconvert-gui/dist/linux/io.github.gen2brain.cbconvert.thumbnailer

@@ -1,4 +1,4 @@
 [Thumbnailer Entry]
 TryExec=cbconvert
 Exec=cbconvert thumbnail --quiet --width %s --outfile %o %i
-MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;application/vnd.ms-xpsdocument;
+MimeType=application/pdf;application/x-cb7;application/x-cbt;application/epub+zip;application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-mobipocket-ebook;application/vnd.ms-xpsdocument;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;

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

@@ -0,0 +1,156 @@
+# github.com/anthonynsimon/bild v0.14.0
+## explicit; go 1.21
+github.com/anthonynsimon/bild/adjust
+github.com/anthonynsimon/bild/clone
+github.com/anthonynsimon/bild/math/f64
+github.com/anthonynsimon/bild/parallel
+github.com/anthonynsimon/bild/transform
+github.com/anthonynsimon/bild/util
+# github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d
+## explicit; go 1.13
+github.com/dsoprea/go-exif/v2
+github.com/dsoprea/go-exif/v2/common
+github.com/dsoprea/go-exif/v2/undefined
+# github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd
+## explicit; go 1.13
+github.com/dsoprea/go-logging
+# github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d
+## explicit; go 1.13
+github.com/dsoprea/go-png-image-structure
+# github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349
+## explicit; go 1.12
+github.com/dsoprea/go-utility/image
+# github.com/dustin/go-humanize v1.0.1
+## explicit; go 1.16
+github.com/dustin/go-humanize
+# github.com/ebitengine/purego v0.8.1
+## explicit; go 1.18
+github.com/ebitengine/purego
+github.com/ebitengine/purego/internal/cgo
+github.com/ebitengine/purego/internal/fakecgo
+github.com/ebitengine/purego/internal/strings
+# github.com/fvbommel/sortorder v1.1.0
+## explicit; go 1.13
+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.20241106192421-4d845afa43ca
+## explicit; go 1.23
+github.com/gen2brain/cbconvert
+# github.com/gen2brain/go-fitz v1.24.14
+## explicit; go 1.22
+github.com/gen2brain/go-fitz
+github.com/gen2brain/go-fitz/include/mupdf
+github.com/gen2brain/go-fitz/include/mupdf/fitz
+github.com/gen2brain/go-fitz/libs
+# github.com/gen2brain/go-unarr v0.2.4
+## explicit; go 1.21
+github.com/gen2brain/go-unarr
+github.com/gen2brain/go-unarr/unarrc
+github.com/gen2brain/go-unarr/unarrc/external
+github.com/gen2brain/go-unarr/unarrc/external/bzip2
+github.com/gen2brain/go-unarr/unarrc/external/unarr
+github.com/gen2brain/go-unarr/unarrc/external/unarr/_7z
+github.com/gen2brain/go-unarr/unarrc/external/unarr/common
+github.com/gen2brain/go-unarr/unarrc/external/unarr/lzmasdk
+github.com/gen2brain/go-unarr/unarrc/external/unarr/rar
+github.com/gen2brain/go-unarr/unarrc/external/unarr/tar
+github.com/gen2brain/go-unarr/unarrc/external/unarr/zip
+github.com/gen2brain/go-unarr/unarrc/external/zlib
+# github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4
+## explicit; go 1.22
+github.com/gen2brain/iup-go/iup
+github.com/gen2brain/iup-go/iup/external
+github.com/gen2brain/iup-go/iup/external/include
+github.com/gen2brain/iup-go/iup/external/src
+github.com/gen2brain/iup-go/iup/external/src/cocoa
+github.com/gen2brain/iup-go/iup/external/src/gtk
+github.com/gen2brain/iup-go/iup/external/src/mot
+github.com/gen2brain/iup-go/iup/external/src/win
+github.com/gen2brain/iup-go/iup/external/src/win/wdl
+github.com/gen2brain/iup-go/iup/external/src/win/wdl/dummy
+github.com/gen2brain/iup-go/iup/external/srcgl
+github.com/gen2brain/iup-go/iup/manifest
+# github.com/gen2brain/jpegli v0.3.3
+## explicit; go 1.22
+github.com/gen2brain/jpegli
+# github.com/gen2brain/jpegxl v0.4.2
+## explicit; go 1.22
+github.com/gen2brain/jpegxl
+# github.com/gen2brain/webp v0.5.1
+## explicit; go 1.22
+github.com/gen2brain/webp
+# github.com/go-errors/errors v1.5.1
+## explicit; go 1.14
+github.com/go-errors/errors
+# github.com/godbus/dbus/v5 v5.1.0
+## explicit; go 1.12
+github.com/godbus/dbus/v5
+# github.com/golang/geo v0.0.0-20230421003525-6adc56603217
+## explicit; go 1.18
+github.com/golang/geo/r1
+github.com/golang/geo/r2
+github.com/golang/geo/r3
+github.com/golang/geo/s1
+github.com/golang/geo/s2
+# github.com/google/uuid v1.6.0
+## explicit
+github.com/google/uuid
+# github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25
+## explicit
+github.com/jsummers/gobmp
+# github.com/jupiterrider/ffi v0.2.1
+## explicit; go 1.18
+github.com/jupiterrider/ffi
+# github.com/tetratelabs/wazero v1.8.1
+## explicit; go 1.21
+github.com/tetratelabs/wazero
+github.com/tetratelabs/wazero/api
+github.com/tetratelabs/wazero/experimental
+github.com/tetratelabs/wazero/experimental/sys
+github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1
+github.com/tetratelabs/wazero/internal/descriptor
+github.com/tetratelabs/wazero/internal/engine/interpreter
+github.com/tetratelabs/wazero/internal/engine/wazevo
+github.com/tetratelabs/wazero/internal/engine/wazevo/backend
+github.com/tetratelabs/wazero/internal/engine/wazevo/backend/isa/amd64
+github.com/tetratelabs/wazero/internal/engine/wazevo/backend/isa/arm64
+github.com/tetratelabs/wazero/internal/engine/wazevo/backend/regalloc
+github.com/tetratelabs/wazero/internal/engine/wazevo/frontend
+github.com/tetratelabs/wazero/internal/engine/wazevo/ssa
+github.com/tetratelabs/wazero/internal/engine/wazevo/wazevoapi
+github.com/tetratelabs/wazero/internal/expctxkeys
+github.com/tetratelabs/wazero/internal/filecache
+github.com/tetratelabs/wazero/internal/fsapi
+github.com/tetratelabs/wazero/internal/ieee754
+github.com/tetratelabs/wazero/internal/internalapi
+github.com/tetratelabs/wazero/internal/leb128
+github.com/tetratelabs/wazero/internal/moremath
+github.com/tetratelabs/wazero/internal/platform
+github.com/tetratelabs/wazero/internal/sock
+github.com/tetratelabs/wazero/internal/sys
+github.com/tetratelabs/wazero/internal/sysfs
+github.com/tetratelabs/wazero/internal/u32
+github.com/tetratelabs/wazero/internal/u64
+github.com/tetratelabs/wazero/internal/version
+github.com/tetratelabs/wazero/internal/wasip1
+github.com/tetratelabs/wazero/internal/wasm
+github.com/tetratelabs/wazero/internal/wasm/binary
+github.com/tetratelabs/wazero/internal/wasmdebug
+github.com/tetratelabs/wazero/internal/wasmruntime
+github.com/tetratelabs/wazero/sys
+# golang.org/x/image v0.21.0
+## explicit; go 1.18
+golang.org/x/image/ccitt
+golang.org/x/image/tiff
+golang.org/x/image/tiff/lzw
+# golang.org/x/net v0.30.0
+## explicit; go 1.18
+golang.org/x/net/context
+# golang.org/x/sync v0.8.0
+## explicit; go 1.18
+golang.org/x/sync/errgroup
+# gopkg.in/yaml.v2 v2.4.0
+## explicit; go 1.15
+gopkg.in/yaml.v2

cmd/cbconvert-gui/dist/macos/CBconvert.app/Contents/Info.plist

@@ -12,7 +12,7 @@
 	<string>icon</string>
 
 	<key>CFBundleIdentifier</key>
-	<string>com.github.gen2brain.cbconvert</string>
+	<string>io.github.gen2brain.cbconvert</string>
 
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>

cmd/cbconvert-gui/go.mod

@@ -1,30 +1,36 @@
 module github.com/gen2brain/cbconvert/cmd/cbconvert-gui
 
-go 1.21
+go 1.23
 
 require (
-	github.com/gen2brain/cbconvert v1.0.4-0.20240208144735-a8084ed89758
+	github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca
-	github.com/gen2brain/iup-go/iup v0.0.0-20230906093706-8b037fe6a7bd
+	github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4
 	github.com/godbus/dbus/v5 v5.1.0
 )
 
 require (
-	git.sr.ht/~jackmordaunt/go-libwebp v1.1.0 // indirect
+	github.com/anthonynsimon/bild v0.14.0 // indirect
-	github.com/disintegration/imaging v1.6.2 // 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.5.2 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/gen2brain/go-fitz v1.23.7 // indirect
+	github.com/gen2brain/avif v0.4.1 // indirect
-	github.com/gen2brain/go-unarr v0.2.0 // indirect
+	github.com/gen2brain/go-fitz v1.24.14 // indirect
+	github.com/gen2brain/go-unarr v0.2.4 // indirect
+	github.com/gen2brain/jpegli v0.3.3 // 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-20230421003525-6adc56603217 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
-	golang.org/x/image v0.15.0 // indirect
+	golang.org/x/image v0.21.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	gopkg.in/gographics/imagick.v3 v3.5.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
-	modernc.org/libc v1.41.0 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.7.2 // indirect
 )

cmd/cbconvert-gui/go.sum

@@ -1,45 +1,81 @@
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0 h1:rfDv89tb6OuNp8f1TyprOZWaeC/TxqaYvLCI6nHKBY8=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0/go.mod h1:8557wZRj8KWRPBM+osAuAXVVR5nVURZ3SCG5rnACBdE=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
-github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+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=
+github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc=
+github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
+github.com/dsoprea/go-exif/v3 v3.0.0-20210512043655-120bcdb2a55e/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
+github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA=
+github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd h1:l+vLbuxptsC6VQyQsfD7NnEC8BZuFpz45PgY+pH8YTg=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d h1:8+qI8ant/vZkNSsbwSjIR6XJfWcDVTg/qx/3pRUUZNA=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d/go.mod h1:yTR3tKgyk20phAFg6IE9ulMA5NjEDD2wyx+okRFLVtw=
+github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 h1:/py11NlxDaOxkT9OKN+gXgT+QOH5xj1ZRoyusfRIlo4=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/Hul09ujXAGq+42UBgCTnXkiJZRnLYdURGjQUwo=
+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.5.2 h1:r2MQEtkGzZ4LRtFZVAg5bjYKnUbxxloaeuGxH0t7qfs=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.5.2/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+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/cbconvert v1.0.4-0.20240208144735-a8084ed89758 h1:VXWir2Nq5qkXuIeoCTavOlQ7j2Yab0vIJe1mvKsLe3I=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/cbconvert v1.0.4-0.20240208144735-a8084ed89758/go.mod h1:jtc/vKGuG66vIemtQc6Ge69FXo33hX+gFvGtEP/z/SM=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-fitz v1.23.7 h1:HPhzEVzmOINvCKqQgB/DwMzYh4ArIgy3tMwq1eJTcbg=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca h1:qYA+cXWUG/Dx+wG2yQ4iuw/s5ROGdXAdo5aIUHrOq4U=
-github.com/gen2brain/go-fitz v1.23.7/go.mod h1:HU04vc+RisUh/kvEd2pB0LAxmK1oyXdN4ftyshUr9rQ=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca/go.mod h1:pQ9kQXsCZQqy7LraruUkBl7CpKNHFpWayxqQ+qliE8Y=
-github.com/gen2brain/go-unarr v0.2.0 h1:sYKSjbeNSuZgudd59iGAbMbr113XRFoA7Rt9XWA+QVE=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/gen2brain/go-unarr v0.2.0/go.mod h1:hoHheVuf0KT8/hfvkEL7GMwj2h7fq0lF72NdyySdr3c=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/gen2brain/iup-go/iup v0.0.0-20230906093706-8b037fe6a7bd h1:k1EaRqSEu/2eahOBY44uYZevryE1HQBz0t7RYCufnHI=
+github.com/gen2brain/go-unarr v0.2.4 h1:Iu2kqtGfkLBSQoTFwMkSCmp0g3GrEM/XMVWzo9TQr/Y=
-github.com/gen2brain/iup-go/iup v0.0.0-20230906093706-8b037fe6a7bd/go.mod h1:HeMeojpQFldBWCMmU5dkmU640AdEcS+SPyEVLMJjjrw=
+github.com/gen2brain/go-unarr v0.2.4/go.mod h1:0kdy3HtjKBcEaewifXZguHCvt4qD9V8iJCx4FPEOWT8=
+github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4 h1:ElkeiufJ5qqFbhxLH0TP7FhLOm37mXezIOk5iJgV27Q=
+github.com/gen2brain/iup-go/iup v0.0.0-20241106050025-0f971ac33ed4/go.mod h1:F026AOq3tZrMCqTMa3K32xLh7fyTdc9+KMTMUX6EtX0=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
+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-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/jupiterrider/ffi v0.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/gographics/imagick.v3 v3.5.1 h1:58JqK0UCx5RfvbRggF5FKuK6jHwAtTQopUxK8mzFa40=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/gographics/imagick.v3 v3.5.1/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=

cmd/cbconvert-gui/main.go

@@ -5,12 +5,15 @@ import (
 	"context"
 	_ "embed"
 	"errors"
+	"flag"
 	"fmt"
 	"image/gif"
 	"image/png"
 	"net/url"
 	"os"
+	"path/filepath"
 	"runtime/debug"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -20,8 +23,8 @@ import (
 
 //go:generate rsrc --ico dist/windows/icon.ico --arch amd64 -o main_windows_amd64.syso
 
-//go:embed assets/icon.png
+//go:embed assets/logo.png
-var appIcon []byte
+var appLogo []byte
 
 //go:embed assets/loading.gif
 var appLoading []byte
@@ -34,8 +37,6 @@ var (
 )
 
 func init() {
-	_ = os.Setenv("GDK_BACKEND", "x11")
-
 	if appVersion != "" {
 		return
 	}
@@ -63,16 +64,18 @@ func init() {
 }
 
 func main() {
+	parseFlags()
+
 	iup.Open()
 	defer iup.Close()
 
 	iup.SetGlobal("UTF8MODE", "YES")
 	iup.SetGlobal("UTF8MODE_FILE", "YES")
 
-	img, _ := png.Decode(bytes.NewReader(appIcon))
+	img, _ := png.Decode(bytes.NewReader(appLogo))
-	iup.ImageFromImage(img).SetHandle("icon")
+	iup.ImageFromImage(img).SetHandle("logo")
 
-	dlg := iup.Dialog(layout()).SetAttributes(fmt.Sprintf(`TITLE="CBconvert %s", ICON=icon`, 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, ": ")
@@ -84,7 +87,7 @@ func main() {
 	}))
 
 	dlg.SetCallback("RESIZE_CB", iup.ResizeFunc(func(ih iup.Ihandle, width, height int) int {
-		iup.GetHandle("Preview").SetAttribute("IMAGE", "")
+		iup.GetHandle("Preview").SetAttribute("IMAGE", "logo")
 		iup.Refresh(ih)
 
 		previewPost()
@@ -99,6 +102,27 @@ func main() {
 	iup.MainLoop()
 }
 
+func parseFlags() {
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, "Usage: %s <command> [<flags>]\n\n", filepath.Base(os.Args[0]))
+		fmt.Fprintf(os.Stderr, "\nCommands:\n")
+		fmt.Fprintf(os.Stderr, "\n  version\n    \tPrint version\n\n")
+	}
+
+	flag.NewFlagSet("version", flag.ExitOnError)
+	flag.Parse()
+
+	if flag.NArg() >= 1 {
+		if flag.Arg(0) == "version" {
+			fmt.Println(filepath.Base(os.Args[0]), appVersion)
+			os.Exit(0)
+		} else {
+			flag.Usage()
+			os.Exit(1)
+		}
+	}
+}
+
 func options() cbconvert.Options {
 	var opts cbconvert.Options
 	opts.Recursive = iup.GetHandle("Recursive").GetAttribute("VALUE") == "ON"
@@ -120,11 +144,6 @@ func options() cbconvert.Options {
 	opts.Brightness = iup.GetHandle("Brightness").GetInt("VALUE")
 	opts.Contrast = iup.GetHandle("Contrast").GetInt("VALUE")
 	opts.Rotate = iup.GetHandle("Rotate").GetInt("VALUESTRING")
-	opts.LevelsInMin = iup.GetHandle("LevelsInMin").GetInt("VALUE")
-	opts.LevelsInMax = iup.GetHandle("LevelsInMax").GetInt("VALUE")
-	opts.LevelsOutMin = iup.GetHandle("LevelsOutMin").GetInt("VALUE")
-	opts.LevelsOutMax = iup.GetHandle("LevelsOutMax").GetInt("VALUE")
-	opts.LevelsGamma = iup.GetHandle("LevelsGamma").GetDouble("VALUE")
 
 	return opts
 }
@@ -137,7 +156,7 @@ func setActive() {
 		iup.GetHandle("Remove").SetAttribute("ACTIVE", "NO")
 		iup.GetHandle("RemoveAll").SetAttribute("ACTIVE", "NO")
 
-		iup.GetHandle("Preview").SetAttribute("IMAGE", "")
+		iup.GetHandle("Preview").SetAttribute("IMAGE", "logo")
 		iup.GetHandle("PreviewInfo").SetAttribute("TITLE", "")
 	} else {
 		if index != -1 {
@@ -265,16 +284,16 @@ func previewPost() {
 	go func(opts cbconvert.Options) {
 		conv := cbconvert.New(opts)
 
-		conv.Initialize()
+		var s string
-		defer conv.Terminate()
-
 		file := files[index]
+
 		img, err := conv.Preview(file.Path, file.Stat, width, height)
 		if err != nil {
+			s = err.Error()
 			fmt.Println(err)
 		}
 
-		iup.PostMessage(iup.GetHandle("Preview"), "", 0, img)
+		iup.PostMessage(iup.GetHandle("Preview"), s, 0, img)
 	}(opts)
 }
 
@@ -296,14 +315,23 @@ func preview() iup.Ihandle {
 				SetCallback("POSTMESSAGE_CB", iup.PostMessageFunc(func(ih iup.Ihandle, s string, i int, p any) int {
 					img := p.(cbconvert.Image)
 
-					if img.Image != nil {
+					iup.GetHandle("Loading").SetAttributes("VISIBLE=NO, STOP=YES")
+
+					if img.Image != nil && len(s) == 0 {
 						iup.Destroy(iup.GetHandle("cover"))
 						iup.ImageFromImage(img.Image).SetHandle("cover")
-						ih.SetAttribute("IMAGE", "cover")
-					}
 
-					iup.GetHandle("Loading").SetAttributes("VISIBLE=NO, STOP=YES")
+						ih.SetAttribute("IMAGE", "cover")
 						iup.GetHandle("PreviewInfo").SetAttribute("TITLE", fmt.Sprintf("%s (%dx%d)", img.SizeHuman, img.Width, img.Height))
+					} else {
+						ih.SetAttribute("IMAGE", "logo")
+						iup.GetHandle("PreviewInfo").SetAttribute("TITLE", "")
+
+						sp := strings.Split(s, ": ")
+						if len(sp) > 1 {
+							iup.MessageError(ih, fmt.Sprintf("%s\n\n%s", sp[0], strings.Join(sp[1:], ": ")))
+						}
+					}
 
 					return iup.DEFAULT
 				})),
@@ -320,6 +348,8 @@ func tabs() iup.Ihandle {
 			SetAttributes(`TIP="Do not convert images that have RGB colorspace"`),
 		iup.Toggle(" Exclude Cover").SetHandle("NoCover").
 			SetAttributes(`TIP="Do not convert the cover image"`),
+		iup.Toggle(" Remove Non-Image Files from the Archive").SetHandle("NoNonImage").
+			SetAttribute("TIP", "Remove .nfo, .xml, .txt files from the archive"),
 		iup.Toggle(" Do not Transform or Convert Images").SetHandle("NoConvert").
 			SetAttributes(`TIP="Copy images from archive or directory without modifications"`).
 			SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
@@ -344,6 +374,7 @@ func tabs() iup.Ihandle {
 
 					return iup.DEFAULT
 				})),
+			iup.Space().SetAttribute("SIZE", "5x0"),
 			iup.Button("Browse...").SetAttributes("PADDING=DEFAULTBUTTONPADDING").
 				SetCallback("ACTION", iup.ActionFunc(onOutputDirectory)),
 		),
@@ -352,10 +383,6 @@ func tabs() iup.Ihandle {
 			iup.Text().SetAttributes("VISIBLECOLUMNS=16, MINSIZE=100x").SetHandle("Suffix").
 				SetAttribute("TIP", "Add suffix to filename, i.e. filename_suffix.cbz"),
 		),
-		iup.Vbox(
-			iup.Toggle(" Remove Non-Image Files from the Archive").SetHandle("NoNonImage").
-				SetAttribute("TIP", "Remove .nfo, .xml, .txt files from the archive"),
-		),
 		iup.Vbox(
 			iup.Label("Archive Format:"),
 			iup.List().SetAttributes(map[string]string{
@@ -539,94 +566,6 @@ func tabs() iup.Ihandle {
 					return iup.DEFAULT
 				})),
 		),
-		iup.Vbox(
-			iup.Label("Input Levels:"),
-			iup.Hbox(
-				iup.Text().SetAttributes(`SPIN=YES, SPINMAX=255, VALUE=0, VISIBLECOLUMNS=3, MASK="/d*"`).
-					SetHandle("LevelsInMin").SetAttribute("TIP", "Min").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						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.Fill(),
-				iup.Val("").SetAttributes(`VALUE=1.0, SHOWTICKS=10`).
-					SetHandle("LevelsGamma").SetAttribute("TIP", "Gamma").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						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.Fill(),
-				iup.Text().SetAttributes(`SPIN=YES, SPINMAX=255, VALUE=255, VISIBLECOLUMNS=3, MASK="/d*"`).
-					SetHandle("LevelsInMax").SetAttribute("TIP", "Max").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						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, MAXSIZE=340x"),
-		),
-		iup.Vbox(
-			iup.Label("Output Levels:"),
-			iup.Hbox(
-				iup.Text().SetAttributes(`SPIN=YES, SPINMAX=255, VALUE=0, VISIBLECOLUMNS=3, MASK="/d*"`).
-					SetHandle("LevelsOutMin").SetAttribute("TIP", "Min").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						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.Fill(),
-				iup.Text().SetAttributes(`SPIN=YES, SPINMAX=255, VALUE=255, VISIBLECOLUMNS=3, MASK="/d*"`).
-					SetHandle("LevelsOutMax").SetAttribute("TIP", "Max").
-					SetCallback("VALUECHANGED_CB", iup.ValueChangedFunc(func(ih iup.Ihandle) int {
-						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, MAXSIZE=340x"),
-		),
 	).SetHandle("VboxTransform").SetAttributes("MARGIN=5x5, GAP=5")
 
 	return iup.Tabs(
@@ -634,7 +573,7 @@ func tabs() iup.Ihandle {
 		vboxOutput.SetAttributes("TABTITLE=Output"),
 		vboxImage.SetAttributes("TABTITLE=Image"),
 		vboxTransform.SetAttributes("TABTITLE=Transform"),
-	).SetHandle("Tabs").SetAttributes("MINSIZE=320x400, EXPAND=HORIZONTAL")
+	).SetHandle("Tabs").SetAttributes("MINSIZE=320x400, EXPAND=HORIZONTAL, MULTILINE=YES")
 }
 
 func buttons() iup.Ihandle {
@@ -816,7 +755,11 @@ func onRemove(ih iup.Ihandle) int {
 		return iup.IGNORE
 	}
 
-	files = append(files[:index], files[index+1:]...)
+	if len(files) == 1 {
+		files = make([]cbconvert.File, 0)
+	} else {
+		files = slices.Delete(files, index, index)
+	}
 
 	iup.GetHandle("List").SetAttribute("REMOVEITEM", iup.GetHandle("List").GetAttribute("VALUE"))
 	setActive()
@@ -858,9 +801,6 @@ func onThumbnail(ih iup.Ihandle) int {
 	iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv)
 
 	go func(c *cbconvert.Converter) {
-		c.Initialize()
-		defer c.Terminate()
-
 		for _, file := range files {
 			if canceled {
 				break
@@ -904,9 +844,6 @@ func onCover(ih iup.Ihandle) int {
 	iup.PostMessage(iup.GetHandle("ProgressBar"), "start", 0, conv)
 
 	go func(c *cbconvert.Converter) {
-		c.Initialize()
-		defer c.Terminate()
-
 		for _, file := range files {
 			if canceled {
 				break
@@ -953,9 +890,6 @@ func onConvert(ih iup.Ihandle) int {
 	}))
 
 	go func(c *cbconvert.Converter) {
-		c.Initialize()
-		defer c.Terminate()
-
 		for _, file := range files {
 			if err := c.Convert(file.Path, file.Stat); err != nil {
 				if errors.Is(err, context.Canceled) {

cmd/cbconvert-gui/main_filedlg.go

@@ -24,7 +24,7 @@ func fileDlg(title string, multiple, directory bool) ([]string, error) {
 		dlg.SetAttributes(map[string]string{
 			"DIALOGTYPE":    "OPEN",
 			"MULTIPLEFILES": mf,
-			"EXTFILTER":     "Comic Files|*.rar;*.zip;*.7z;*.tar;*.cbr;*.cbz;*.cb7;*.cbt;*.pdf;*.epub;*.mobi;*.xps|",
+			"EXTFILTER":     "Comic Files|*.rar;*.zip;*.7z;*.tar;*.cbr;*.cbz;*.cb7;*.cbt;*.pdf;*.epub;*.mobi;*.docx;*.pptx|",
 			"FILTER":        "*.cb*", // for Motif
 			"TITLE":         title,
 		})

cmd/cbconvert-gui/main_filedlg_portal.go

@@ -57,7 +57,8 @@ func fileDlg(title string, multiple, directory bool) ([]string, error) {
 				Item{0, "*.pdf"},
 				Item{0, "*.epub"},
 				Item{0, "*.mobi"},
-				Item{0, "*.xps"},
+				Item{0, "*.docx"},
+				Item{0, "*.pptx"},
 			},
 		},
 	}

cmd/cbconvert-gui/make.bash

@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-GLIBC_x86_64="/usr/x86_64-pc-linux-gnu-static"
-MINGW_x86_64="/usr/x86_64-w64-mingw32"
-MACOS_x86_64="/usr/x86_64-apple-darwin"
-MACOS_aarch64="/usr/aarch64-apple-darwin"
-
-VERSION="$(git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '1.0.0')"
-
-BUILDDIR="cbconvert-gui-${VERSION}"
-
-mkdir -p "${BUILDDIR}"
-CC=x86_64-pc-linux-gnu-gcc \
-PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
-PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
-CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64" \
-CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -x -o "${BUILDDIR}"/cbconvert-gui -ldflags "-s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-mkdir -p "${BUILDDIR}"
-CC=x86_64-pc-linux-gnu-gcc \
-PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
-PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
-CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64 -lxcb -lICE -lXdmcp -lXau -lSM" \
-CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig motif' -v -o "${BUILDDIR}"/cbconvert-gui-motif -ldflags "-s -w -linkmode external -X main.appVersion=${VERSION} '-extldflags=-static'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && tar -czf "${BUILDDIR}-linux-x86_64-motif.tar.gz" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-mkdir -p "${BUILDDIR}"
-CC=x86_64-w64-mingw32-gcc \
-PKG_CONFIG="/usr/bin/x86_64-w64-mingw32-pkg-config" \
-PKG_CONFIG_PATH="$MINGW_x86_64/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MINGW_x86_64/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MINGW_x86_64/usr/include" \
-CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib" \
-CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert-gui.exe -ldflags "-s -w -X main.appVersion=${VERSION} -H=windowsgui '-extldflags=-static -Wl,--allow-multiple-definition'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-windows-x86_64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-mkdir -p "${BUILDDIR}"
-cp -r dist/macos/CBconvert.app "${BUILDDIR}"
-PATH=${PATH}:${MACOS_x86_64}/bin \
-CC=x86_64-apple-darwin21.1-clang \
-PKG_CONFIG="x86_64-apple-darwin21.1-pkg-config" \
-PKG_CONFIG_PATH="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MACOS_x86_64/usr/include -I$MACOS_x86_64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
-CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/CBconvert.app/Contents/MacOS/cbconvert-gui -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-x86_64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-mkdir -p "${BUILDDIR}"
-cp -r dist/macos/CBconvert.app "${BUILDDIR}"
-PATH=${PATH}:${MACOS_aarch64}/bin \
-CC=aarch64-apple-darwin21.1-clang \
-PKG_CONFIG="aarch64-apple-darwin21.1-pkg-config" \
-PKG_CONFIG_PATH="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MACOS_aarch64/usr/include -I$MACOS_aarch64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
-CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/CBconvert.app/Contents/MacOS/cbconvert-gui -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-aarch64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"

cmd/cbconvert-gui/screenshots/README.md

@@ -4,10 +4,7 @@ Windows
 <img src="windows-01.jpg" width="700" title="Windows" alt="Windows" />
 
 Linux  
-<img src="linux-02.jpg" width="700" title="Linux" alt="Linux" />
+<img src="linux-01.jpg" width="700" title="Linux" alt="Linux" />
 
 macOS  
 <img src="macos-01.jpg" width="700" title="macOS" alt="macOS" />
-
-Linux Motif  
-<img src="motif-01.jpg" width="700" title="Linux Motif" alt="Linux Motif" />

cmd/cbconvert/go.mod

@@ -1,34 +1,39 @@
 module github.com/gen2brain/cbconvert/cmd/cbconvert
 
-go 1.21
+go 1.23
 
 require (
-	github.com/gen2brain/cbconvert v1.0.4-0.20240208144735-a8084ed89758
+	github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca
 	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/spf13/pflag v1.0.5
 )
 
 require (
-	git.sr.ht/~jackmordaunt/go-libwebp v1.1.0 // indirect
+	github.com/anthonynsimon/bild v0.14.0 // indirect
-	github.com/disintegration/imaging v1.6.2 // 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.5.2 // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
-	github.com/gen2brain/go-fitz v1.23.7 // indirect
+	github.com/gen2brain/avif v0.4.1 // indirect
-	github.com/gen2brain/go-unarr v0.2.0 // indirect
+	github.com/gen2brain/go-fitz v1.24.14 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/gen2brain/go-unarr v0.2.4 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/gen2brain/jpegli v0.3.3 // 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-20230421003525-6adc56603217 // indirect
+	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rivo/uniseg v0.3.4 // indirect
-	golang.org/x/image v0.15.0 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
-	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/image v0.21.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
-	gopkg.in/gographics/imagick.v3 v3.5.1 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	modernc.org/libc v1.41.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
-	modernc.org/memory v1.7.2 // indirect
 )

cmd/cbconvert/go.sum

@@ -1,66 +1,102 @@
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0 h1:rfDv89tb6OuNp8f1TyprOZWaeC/TxqaYvLCI6nHKBY8=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0/go.mod h1:8557wZRj8KWRPBM+osAuAXVVR5nVURZ3SCG5rnACBdE=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
 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/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+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=
+github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc=
+github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
+github.com/dsoprea/go-exif/v3 v3.0.0-20210512043655-120bcdb2a55e/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
+github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA=
+github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd h1:l+vLbuxptsC6VQyQsfD7NnEC8BZuFpz45PgY+pH8YTg=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d h1:8+qI8ant/vZkNSsbwSjIR6XJfWcDVTg/qx/3pRUUZNA=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d/go.mod h1:yTR3tKgyk20phAFg6IE9ulMA5NjEDD2wyx+okRFLVtw=
+github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 h1:/py11NlxDaOxkT9OKN+gXgT+QOH5xj1ZRoyusfRIlo4=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/Hul09ujXAGq+42UBgCTnXkiJZRnLYdURGjQUwo=
+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.5.2 h1:r2MQEtkGzZ4LRtFZVAg5bjYKnUbxxloaeuGxH0t7qfs=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.5.2/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+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/cbconvert v1.0.4-0.20240208144735-a8084ed89758 h1:VXWir2Nq5qkXuIeoCTavOlQ7j2Yab0vIJe1mvKsLe3I=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/cbconvert v1.0.4-0.20240208144735-a8084ed89758/go.mod h1:jtc/vKGuG66vIemtQc6Ge69FXo33hX+gFvGtEP/z/SM=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-fitz v1.23.7 h1:HPhzEVzmOINvCKqQgB/DwMzYh4ArIgy3tMwq1eJTcbg=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca h1:qYA+cXWUG/Dx+wG2yQ4iuw/s5ROGdXAdo5aIUHrOq4U=
-github.com/gen2brain/go-fitz v1.23.7/go.mod h1:HU04vc+RisUh/kvEd2pB0LAxmK1oyXdN4ftyshUr9rQ=
+github.com/gen2brain/cbconvert v1.0.5-0.20241106192421-4d845afa43ca/go.mod h1:pQ9kQXsCZQqy7LraruUkBl7CpKNHFpWayxqQ+qliE8Y=
-github.com/gen2brain/go-unarr v0.2.0 h1:sYKSjbeNSuZgudd59iGAbMbr113XRFoA7Rt9XWA+QVE=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/gen2brain/go-unarr v0.2.0/go.mod h1:hoHheVuf0KT8/hfvkEL7GMwj2h7fq0lF72NdyySdr3c=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/gen2brain/go-unarr v0.2.4 h1:Iu2kqtGfkLBSQoTFwMkSCmp0g3GrEM/XMVWzo9TQr/Y=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gen2brain/go-unarr v0.2.4/go.mod h1:0kdy3HtjKBcEaewifXZguHCvt4qD9V8iJCx4FPEOWT8=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
+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/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-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
+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.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
 github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 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/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 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/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.3.4 h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=
 github.com/rivo/uniseg v0.3.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=
 github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
-golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
-golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+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.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
 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=
-gopkg.in/gographics/imagick.v3 v3.5.1 h1:58JqK0UCx5RfvbRggF5FKuK6jHwAtTQopUxK8mzFa40=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/gographics/imagick.v3 v3.5.1/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=

cmd/cbconvert/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -12,7 +13,6 @@ import (
 
 	"github.com/gen2brain/cbconvert"
 	pb "github.com/schollz/progressbar/v3"
-	flag "github.com/spf13/pflag"
 )
 
 var appVersion string
@@ -72,9 +72,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	conv.Initialize()
-	defer conv.Terminate()
-
 	files, err := conv.Files(args)
 	if err != nil {
 		fmt.Println(err)
@@ -164,7 +161,6 @@ func parseFlags() (cbconvert.Options, []string) {
 	var args []string
 
 	convert := flag.NewFlagSet("convert", flag.ExitOnError)
-	convert.SortFlags = false
 	convert.IntVar(&opts.Width, "width", 0, "Image width")
 	convert.IntVar(&opts.Height, "height", 0, "Image height")
 	convert.BoolVar(&opts.Fit, "fit", false, "Best fit for required width and height")
@@ -181,18 +177,12 @@ func parseFlags() (cbconvert.Options, []string) {
 	convert.IntVar(&opts.Brightness, "brightness", 0, "Adjust the brightness of the images, must be in the range (-100, 100)")
 	convert.IntVar(&opts.Contrast, "contrast", 0, "Adjust the contrast of the images, must be in the range (-100, 100)")
 	convert.StringVar(&opts.Suffix, "suffix", "", "Add suffix to file basename")
-	convert.IntVar(&opts.LevelsInMin, "levels-inmin", 0, "Shadow input value")
-	convert.Float64Var(&opts.LevelsGamma, "levels-gamma", 1.0, "Midpoint/Gamma")
-	convert.IntVar(&opts.LevelsInMax, "levels-inmax", 255, "Highlight input value")
-	convert.IntVar(&opts.LevelsOutMin, "levels-outmin", 0, "Shadow output value")
-	convert.IntVar(&opts.LevelsOutMax, "levels-outmax", 255, "Highlight output value")
 	convert.StringVar(&opts.OutDir, "outdir", ".", "Output directory")
 	convert.IntVar(&opts.Size, "size", 0, "Process only files larger than size (in MB)")
 	convert.BoolVar(&opts.Recursive, "recursive", false, "Process subdirectories recursively")
 	convert.BoolVar(&opts.Quiet, "quiet", false, "Hide console output")
 
 	cover := flag.NewFlagSet("cover", flag.ExitOnError)
-	cover.SortFlags = false
 	cover.IntVar(&opts.Width, "width", 0, "Image width")
 	cover.IntVar(&opts.Height, "height", 0, "Image height")
 	cover.BoolVar(&opts.Fit, "fit", false, "Best fit for required width and height")
@@ -205,7 +195,6 @@ func parseFlags() (cbconvert.Options, []string) {
 	cover.BoolVar(&opts.Quiet, "quiet", false, "Hide console output")
 
 	thumbnail := flag.NewFlagSet("thumbnail", flag.ExitOnError)
-	thumbnail.SortFlags = false
 	thumbnail.IntVar(&opts.Width, "width", 0, "Image width")
 	thumbnail.IntVar(&opts.Height, "height", 0, "Image height")
 	thumbnail.BoolVar(&opts.Fit, "fit", false, "Best fit for required width and height")
@@ -217,7 +206,6 @@ func parseFlags() (cbconvert.Options, []string) {
 	thumbnail.BoolVar(&opts.Quiet, "quiet", false, "Hide console output")
 
 	meta := flag.NewFlagSet("meta", flag.ExitOnError)
-	meta.SortFlags = false
 	meta.BoolVar(&opts.Cover, "cover", false, "Print cover name")
 	meta.BoolVar(&opts.Comment, "comment", false, "Print zip comment")
 	meta.StringVar(&opts.CommentBody, "comment-body", "", "Set zip comment")
@@ -230,25 +218,34 @@ 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")
-		convert.VisitAll(func(f *flag.Flag) {
+		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)
 			fmt.Fprintf(os.Stderr, "    --%s\n    \t", f.Name)
 			fmt.Fprintf(os.Stderr, "%v (default %q)\n", f.Usage, f.DefValue)
-		})
+		}
 		fmt.Fprintf(os.Stderr, "\n  cover\n    \tExtract cover\n\n")
-		cover.VisitAll(func(f *flag.Flag) {
+		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)
 			fmt.Fprintf(os.Stderr, "%v (default %q)\n", f.Usage, f.DefValue)
-		})
+		}
 		fmt.Fprintf(os.Stderr, "\n  thumbnail\n    \tExtract cover thumbnail (freedesktop spec.)\n\n")
-		thumbnail.VisitAll(func(f *flag.Flag) {
+		order = []string{"width", "height", "fit", "filter", "outdir", "outfile", "size", "recursive", "quiet"}
+		for _, name := range order {
+			f := thumbnail.Lookup(name)
 			fmt.Fprintf(os.Stderr, "    --%s\n    \t", f.Name)
 			fmt.Fprintf(os.Stderr, "%v (default %q)\n", f.Usage, f.DefValue)
-		})
+		}
 		fmt.Fprintf(os.Stderr, "\n  meta\n    \tCBZ metadata\n\n")
-		meta.VisitAll(func(f *flag.Flag) {
+		order = []string{"cover", "comment", "comment-body", "file-add", "file-remove"}
+		for _, name := range order {
+			f := meta.Lookup(name)
 			fmt.Fprintf(os.Stderr, "    --%s\n    \t", f.Name)
 			fmt.Fprintf(os.Stderr, "%v (default %q)\n", f.Usage, f.DefValue)
-		})
+		}
 		fmt.Fprintf(os.Stderr, "\n  version\n    \tPrint version\n\n")
 	}
 

cmd/cbconvert/make.bash

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-GLIBC_x86_64="/usr/x86_64-pc-linux-gnu-static"
-MINGW_x86_64="/usr/x86_64-w64-mingw32"
-MACOS_x86_64="/usr/x86_64-apple-darwin"
-MACOS_aarch64="/usr/aarch64-apple-darwin"
-
-VERSION="$(git --git-dir ../../.git describe --tags --abbrev=0 2>/dev/null || echo '1.0.0')"
-
-BUILDDIR="cbconvert-${VERSION}"
-
-mkdir -p "${BUILDDIR}"
-CC=x86_64-pc-linux-gnu-gcc \
-PKG_CONFIG="x86_64-pc-linux-gnu-pkg-config" \
-PKG_CONFIG_PATH="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-PKG_CONFIG_LIBDIR="$GLIBC_x86_64/usr/lib64/pkgconfig" \
-CGO_CFLAGS="-I$GLIBC_x86_64/usr/include" \
-CGO_LDFLAGS="-L$GLIBC_x86_64/usr/lib64" \
-CGO_ENABLED=1 GOOS=linux GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION} '-extldflags=-static'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && tar -czf "${BUILDDIR}-linux-x86_64.tar.gz" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-mkdir -p "${BUILDDIR}"
-CC=x86_64-w64-mingw32-gcc \
-PKG_CONFIG="/usr/bin/x86_64-w64-mingw32-pkg-config" \
-PKG_CONFIG_PATH="$MINGW_x86_64/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MINGW_x86_64/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MINGW_x86_64/usr/include" \
-CGO_LDFLAGS="-L$MINGW_x86_64/usr/lib -ljxl -ljxl_dec -ljxl_profiler -ljxl_threads" \
-CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert.exe -ldflags "-s -w -X main.appVersion=${VERSION} '-extldflags=-static -Wl,--allow-multiple-definition'" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-windows-x86_64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-mkdir -p "${BUILDDIR}"
-PATH=${PATH}:${MACOS_x86_64}/bin \
-CC=x86_64-apple-darwin21.1-clang \
-PKG_CONFIG="x86_64-apple-darwin21.1-pkg-config" \
-PKG_CONFIG_PATH="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MACOS_x86_64/usr/include -I$MACOS_x86_64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_x86_64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_x86_64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
-CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-x86_64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"
-
-export OSXCROSS_PKG_CONFIG_USE_NATIVE_VARIABLES=1
-mkdir -p "${BUILDDIR}"
-PATH=${PATH}:${MACOS_aarch64}/bin \
-CC=aarch64-apple-darwin21.1-clang \
-PKG_CONFIG="aarch64-apple-darwin21.1-pkg-config" \
-PKG_CONFIG_PATH="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-PKG_CONFIG_LIBDIR="$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib/pkgconfig" \
-CGO_CFLAGS="-I$MACOS_aarch64/usr/include -I$MACOS_aarch64/macports/pkgs/opt/local/include" \
-CGO_LDFLAGS="-L$MACOS_aarch64/SDK/MacOSX12.1.sdk/usr/lib -L$MACOS_aarch64/macports/pkgs/opt/local/lib -mmacosx-version-min=10.15" \
-CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 \
-go build -trimpath -tags 'extlib pkgconfig' -v -o "${BUILDDIR}"/cbconvert -ldflags "-linkmode external -s -w -X main.appVersion=${VERSION}" && \
-cp ../../README.md ../../AUTHORS ../../COPYING "${BUILDDIR}" && zip -rq "${BUILDDIR}-darwin-aarch64.zip" "${BUILDDIR}"
-rm -rf "${BUILDDIR}"

go.mod

@@ -1,26 +1,32 @@
 module github.com/gen2brain/cbconvert
 
-go 1.21
+go 1.23
 
 require (
-	git.sr.ht/~jackmordaunt/go-libwebp v1.1.0
+	github.com/anthonynsimon/bild v0.14.0
-	github.com/disintegration/imaging v1.6.2
+	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/go-fitz v1.23.7
+	github.com/gen2brain/avif v0.4.1
-	github.com/gen2brain/go-unarr v0.2.0
+	github.com/gen2brain/go-fitz v1.24.14
-	golang.org/x/image v0.15.0
+	github.com/gen2brain/go-unarr v0.2.3
-	golang.org/x/sync v0.6.0
+	github.com/gen2brain/jpegli v0.3.3
-	gopkg.in/gographics/imagick.v3 v3.5.1
+	github.com/gen2brain/jpegxl v0.4.2
+	github.com/gen2brain/webp v0.5.1
+	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25
+	golang.org/x/image v0.21.0
+	golang.org/x/sync v0.8.0
 )
 
 require (
-	github.com/ebitengine/purego v0.5.1 // indirect
+	github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/ebitengine/purego v0.8.1 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	github.com/go-errors/errors v1.5.1 // indirect
-	modernc.org/libc v1.24.1 // indirect
+	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-	modernc.org/mathutil v1.6.0 // indirect
+	github.com/jupiterrider/ffi v0.2.1 // indirect
-	modernc.org/memory v1.7.2 // indirect
+	github.com/tetratelabs/wazero v1.8.1 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -1,37 +1,79 @@
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0 h1:rfDv89tb6OuNp8f1TyprOZWaeC/TxqaYvLCI6nHKBY8=
+github.com/anthonynsimon/bild v0.14.0 h1:IFRkmKdNdqmexXHfEU7rPlAmdUZ8BDZEGtGHDnGWync=
-git.sr.ht/~jackmordaunt/go-libwebp v1.1.0/go.mod h1:8557wZRj8KWRPBM+osAuAXVVR5nVURZ3SCG5rnACBdE=
+github.com/anthonynsimon/bild v0.14.0/go.mod h1:hcvEAyBjTW69qkKJTfpcDQ83sSZHxwOunsseDfeQhUs=
-github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
+github.com/dsoprea/go-exif/v2 v2.0.0-20200321225314-640175a69fe4/go.mod h1:Lm2lMM2zx8p4a34ZemkaUV95AnMl4ZvLbCUbwOvLC2E=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+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=
+github.com/dsoprea/go-exif/v2 v2.0.0-20230826092837-6579e82b732d/go.mod h1:oKrjk2kb3rAR5NbtSTLUMvMSbc+k8ZosI3MaVH47noc=
+github.com/dsoprea/go-exif/v3 v3.0.0-20200717053412-08f1b6708903/go.mod h1:0nsO1ce0mh5czxGeLo4+OCZ/C6Eo6ZlMWsz7rH/Gxv8=
+github.com/dsoprea/go-exif/v3 v3.0.0-20210512043655-120bcdb2a55e/go.mod h1:cg5SNYKHMmzxsr9X6ZeLh/nfBRHHp5PngtEPcujONtk=
+github.com/dsoprea/go-logging v0.0.0-20190624164917-c4f10aab7696/go.mod h1:Nm/x2ZUNRW6Fe5C3LxdY1PyZY5wmDv/s5dkPJ/VB3iA=
+github.com/dsoprea/go-logging v0.0.0-20200517223158-a10564966e9d/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd h1:l+vLbuxptsC6VQyQsfD7NnEC8BZuFpz45PgY+pH8YTg=
+github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd/go.mod h1:7I+3Pe2o/YSU88W0hWlm9S22W7XI1JFNJ86U0zPKMf8=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d h1:8+qI8ant/vZkNSsbwSjIR6XJfWcDVTg/qx/3pRUUZNA=
+github.com/dsoprea/go-png-image-structure v0.0.0-20210512210324-29b889a6093d/go.mod h1:yTR3tKgyk20phAFg6IE9ulMA5NjEDD2wyx+okRFLVtw=
+github.com/dsoprea/go-utility v0.0.0-20200711062821-fab8125e9bdf/go.mod h1:95+K3z2L0mqsVYd6yveIv1lmtT3tcQQ3dVakPySffW8=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349 h1:/py11NlxDaOxkT9OKN+gXgT+QOH5xj1ZRoyusfRIlo4=
+github.com/dsoprea/go-utility v0.0.0-20221003172846-a3e1774ef349/go.mod h1:KVK+/Hul09ujXAGq+42UBgCTnXkiJZRnLYdURGjQUwo=
+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.5.1 h1:hNunhThpOf1vzKl49v6YxIsXLhl92vbBEv1/2Ez3ZrY=
+github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
-github.com/ebitengine/purego v0.5.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+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/go-fitz v1.23.7 h1:HPhzEVzmOINvCKqQgB/DwMzYh4ArIgy3tMwq1eJTcbg=
+github.com/gen2brain/avif v0.4.0 h1:JuwAX2rVrkAzQrZx9lpIKx/ovCO35gCUquarfJ6uhHc=
-github.com/gen2brain/go-fitz v1.23.7/go.mod h1:HU04vc+RisUh/kvEd2pB0LAxmK1oyXdN4ftyshUr9rQ=
+github.com/gen2brain/avif v0.4.0/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/gen2brain/go-unarr v0.2.0 h1:sYKSjbeNSuZgudd59iGAbMbr113XRFoA7Rt9XWA+QVE=
+github.com/gen2brain/avif v0.4.1 h1:fjwv5SDNYHdI1gbW6MJn3Yaxs1ldUEfAIAH8Ahee538=
-github.com/gen2brain/go-unarr v0.2.0/go.mod h1:hoHheVuf0KT8/hfvkEL7GMwj2h7fq0lF72NdyySdr3c=
+github.com/gen2brain/avif v0.4.1/go.mod h1:oePci7KPleKZ8X/2rjZ3FlVm2JFYjPwXiQpNgq9wrzs=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/gen2brain/go-fitz v1.24.14 h1:09weRkjVtLYNGo7l0J7DyOwBExbwi8SJ9h8YPhw9WEo=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gen2brain/go-fitz v1.24.14/go.mod h1:0KaZeQgASc20Yp5R/pFzyy7SmP01XcoHKNF842U2/S4=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/gen2brain/go-unarr v0.2.3 h1:VwZg0P6Dc/8Uh51McjVhzUMg4wHwwbiyqjEFsFELc0c=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/gen2brain/go-unarr v0.2.3/go.mod h1:hoHheVuf0KT8/hfvkEL7GMwj2h7fq0lF72NdyySdr3c=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/gen2brain/jpegli v0.3.3 h1:ryCOQpmGuVk6FA+QBe9st6cW48jsRdVOPiNrAJ50m+k=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/gen2brain/jpegli v0.3.3/go.mod h1:6Dbgr+ni1IUBqGVOKHn8lY+6DvwSGfAfC7pPQiSK6uA=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+github.com/gen2brain/jpegxl v0.4.1 h1:jWaVp5GkXLJXjRvC+g0R9+uo+xoWiS7DYKxJ3n5gHL4=
-golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+github.com/gen2brain/jpegxl v0.4.1/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
-golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
+github.com/gen2brain/jpegxl v0.4.2 h1:Ff0jAWtCRdc9yjPc9jkyak6Ji/A89Jg0KI+D7qOEtRI=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+github.com/gen2brain/jpegxl v0.4.2/go.mod h1:zIIDnzh7WqG+z66zyzLWQ0M4AS5xi//pyJLgu32GB1o=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+github.com/gen2brain/webp v0.5.0 h1:nn3o0BtKltoFKX9rlDZG/Y/aWqNzUZVyXdB815yVNfU=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/gen2brain/webp v0.5.0/go.mod h1:Nb3xO5sy6MeUAHhru9H3GT7nlOQO5dKRNNlE92CZrJw=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+github.com/gen2brain/webp v0.5.1 h1:ly9olTGveZEpq3soJuCmex9fxLJ0ipHcQRRSRit5EUE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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/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-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
+github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
+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.2.1 h1:08GJVDqz4eoQq7cKT1T0kwb9MB58XEAGjgxDvz80yBs=
+github.com/jupiterrider/ffi v0.2.1/go.mod h1:tJ7Q8p/3blFjdWt5qJU4W5oDE0xloImvrViE+0td0Rk=
+github.com/tetratelabs/wazero v1.8.1 h1:NrcgVbWfkWvVc4UtT4LRLDf91PsOzDzefMdwhLfA550=
+github.com/tetratelabs/wazero v1.8.1/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
+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.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/gographics/imagick.v3 v3.5.1 h1:58JqK0UCx5RfvbRggF5FKuK6jHwAtTQopUxK8mzFa40=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/gographics/imagick.v3 v3.5.1/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=