ci: Sets up QEMU for cross-platform builds

Configures QEMU to enable emulation of different architectures, allowing for cross-platform builds and testing in the release workflow.
Updates build configuration for multi-platform support
2026-01-11 16:17:04 +01:00 · 2025-02-13 20:18:14 -05:00 · 2025-02-13 20:12:49 -05:00 · 2025-02-13 20:05:08 -05:00 · 2025-02-13 20:04:33 -05:00 · 2025-02-13 20:02:45 -05:00
31 changed files with 520 additions and 165 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,14 +22,14 @@ jobs:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0 # this is important, otherwise it won't checkout the full tree (i.e. no previous tags)
-      - name: Install libwebp-dev
-        run: sudo apt-get install -y libwebp-dev
      - uses: actions/setup-go@v5
        with:
-          go-version: 1.23
+          go-version: 1.24
          cache: true
-      - uses: sigstore/cosign-installer@v3.7.0         # installs cosign
-      - uses: anchore/sbom-action/download-syft@v0.17.8 # installs syft
+      - uses: sigstore/cosign-installer@v3.8.0         # installs cosign
+      - uses: anchore/sbom-action/download-syft@v0.18.0 # installs syft
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
      - uses: docker/login-action@v3                   # login to ghcr
        with:
          registry: ghcr.io
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,10 +15,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: '1.23'
-
-      - name: Install libwebp-dev
-        run: sudo apt-get install -y libwebp-dev
+          go-version: '1.24'

      - name: Install dependencies
        run: go mod tidy
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -24,11 +24,17 @@ changelog:
      order: 2
 builds:
  - id: cbzoptimizer
-    main: main.go
+    main: cmd/cbzoptimizer/main.go
    goos:
      - linux
+      - darwin
+      - windows
    goarch:
      - amd64
+      - arm64
+    ignore:
+      - goos: windows
+        goarch: arm64
    # ensures mod timestamp to be the commit timestamp
    mod_timestamp: "{{ .CommitTimestamp }}"
    flags:
@@ -37,7 +43,7 @@ builds:
    ldflags:
      - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
    env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
 # config the checksum filename
 # https://goreleaser.com/customization/checksum
 checksum:
@@ -60,11 +66,25 @@ sboms:
 # https://goreleaser.com/customization/docker
 dockers:
  - image_templates:
-      - "ghcr.io/belphemur/cbzoptimizer:latest"
-      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}"
-    dockerfile: Dockerfile
+      - "ghcr.io/belphemur/cbzoptimizer:latest-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-amd64"
+    use: buildx
    build_flag_templates:
      - "--pull"
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
+  - image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:latest-arm64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-arm64"
+    use: buildx
+    goarch: arm64
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/arm64"
      - "--label=org.opencontainers.image.created={{.Date}}"
      - "--label=org.opencontainers.image.name={{.ProjectName}}"
      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -97,4 +117,13 @@ docker_signs:
    args:
      - "sign"
      - "${artifact}"
-      - "--yes" # needed on cosign 2.0.0+
+      - "--yes" # needed on cosign 2.0.0+
+docker_manifests:
+  - name_template: "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}"
+    image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:{{ .Version }}-arm64"
+  - name_template: "ghcr.io/belphemur/cbzoptimizer:latest"
+    image_templates:
+      - "ghcr.io/belphemur/cbzoptimizer:latest-amd64"
+      - "ghcr.io/belphemur/cbzoptimizer:latest-arm64"
--- a/23
+++ b/23
@@ -1,4 +1,4 @@
-FROM debian:sid-slim
+FROM alpine:latest
 LABEL authors="Belphemur"
 ARG APP_PATH=/usr/local/bin/CBZOptimizer
 ENV USER=abc
@@ -6,22 +6,21 @@ ENV CONFIG_FOLDER=/config
 ENV PUID=99

 RUN mkdir -p "${CONFIG_FOLDER}" && \
-    useradd \
-        --system \
-        --no-create-home \
-        --home-dir "${CONFIG_FOLDER}" \
-        --gid "users" \
-        --uid "${PUID}" \
+    adduser \
+        -S \
+        -H \
+        -h "${CONFIG_FOLDER}" \
+        -G "users" \
+        -u "${PUID}" \
        "${USER}" && \
        chown ${PUID}:users "${CONFIG_FOLDER}"

 COPY CBZOptimizer ${APP_PATH}

-RUN apt-get update && \
-    apt-get full-upgrade -y && \
-    apt-get install -y inotify-tools bash-completion libwebp7 && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
+RUN apk add --no-cache \
+    inotify-tools \
+    bash \
+    bash-completion && \
    chmod +x ${APP_PATH} && \
    ${APP_PATH} completion bash > /etc/bash_completion.d/CBZOptimizer

--- a/cmd/cbzoptimizer/commands/optimize_command.go
+++ b/cmd/cbzoptimizer/commands/optimize_command.go
@@ -1,10 +1,10 @@
-package cmd
+package commands

 import (
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/converter"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	"github.com/belphemur/CBZOptimizer/v2/utils"
+	utils2 "github.com/belphemur/CBZOptimizer/v2/internal/utils"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
 	"github.com/spf13/cobra"
 	"github.com/thediveo/enumflag/v2"
 	"os"
@@ -45,7 +45,7 @@ func ConvertCbzCommand(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("path is required")
 	}

-	if !utils.IsValidFolder(path) {
+	if !utils2.IsValidFolder(path) {
 		return fmt.Errorf("the path needs to be a folder")
 	}

@@ -92,7 +92,7 @@ func ConvertCbzCommand(cmd *cobra.Command, args []string) error {
 		go func() {
 			defer wg.Done()
 			for path := range fileChan {
-				err := utils.Optimize(&utils.OptimizeOptions{
+				err := utils2.Optimize(&utils2.OptimizeOptions{
 					ChapterConverter: chapterConverter,
 					Path:             path,
 					Quality:          quality,
--- a/cmd/cbzoptimizer/commands/optimize_command_test.go
+++ b/cmd/cbzoptimizer/commands/optimize_command_test.go
@@ -1,11 +1,11 @@
-package cmd
+package commands

 import (
-	"github.com/belphemur/CBZOptimizer/v2/cbz"
-	"github.com/belphemur/CBZOptimizer/v2/converter"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/internal/cbz"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
 	"github.com/spf13/cobra"
 	"log"
 	"os"
@@ -41,7 +41,7 @@ func TestConvertCbzCommand(t *testing.T) {
 	defer errs.CaptureGeneric(&err, os.RemoveAll, tempDir, "failed to remove temporary directory")

 	// Locate the testdata directory
-	testdataDir := filepath.Join("../testdata")
+	testdataDir := filepath.Join("../../../testdata")
 	if _, err := os.Stat(testdataDir); os.IsNotExist(err) {
 		t.Fatalf("testdata directory not found")
 	}
--- a/cmd/cbzoptimizer/commands/rootcmd.go
+++ b/cmd/cbzoptimizer/commands/rootcmd.go
@@ -1,4 +1,4 @@
-package cmd
+package commands

 import (
 	"fmt"
--- a/cmd/cbzoptimizer/commands/watch_command.go
+++ b/cmd/cbzoptimizer/commands/watch_command.go
@@ -1,10 +1,10 @@
-package cmd
+package commands

 import (
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/converter"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	"github.com/belphemur/CBZOptimizer/v2/utils"
+	utils2 "github.com/belphemur/CBZOptimizer/v2/internal/utils"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
 	"github.com/pablodz/inotifywaitgo/inotifywaitgo"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -53,7 +53,7 @@ func WatchCommand(_ *cobra.Command, args []string) error {
 		return fmt.Errorf("path is required")
 	}

-	if !utils.IsValidFolder(path) {
+	if !utils2.IsValidFolder(path) {
 		return fmt.Errorf("the path needs to be a folder")
 	}

@@ -114,7 +114,7 @@ func WatchCommand(_ *cobra.Command, args []string) error {
 			for _, e := range event.Events {
 				switch e {
 				case inotifywaitgo.CLOSE_WRITE, inotifywaitgo.MOVE:
-					err := utils.Optimize(&utils.OptimizeOptions{
+					err := utils2.Optimize(&utils2.OptimizeOptions{
 						ChapterConverter: chapterConverter,
 						Path:             event.Filename,
 						Quality:          quality,
--- a/cmd/cbzoptimizer/main.go
+++ b/cmd/cbzoptimizer/main.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"github.com/belphemur/CBZOptimizer/v2/cmd/cbzoptimizer/commands"
+)
+
+var (
+	version = "dev"
+	commit  = "none"
+	date    = "unknown"
+)
+
+func main() {
+	commands.SetVersionInfo(version, commit, date)
+	commands.Execute()
+}
--- a/converter/webp/webp_provider.go
+++ b/converter/webp/webp_provider.go
@@ -1,19 +0,0 @@
-package webp
-
-import (
-	"github.com/kolesa-team/go-webp/encoder"
-	"github.com/kolesa-team/go-webp/webp"
-	"image"
-	"io"
-)
-
-func PrepareEncoder() error {
-	return nil
-}
-func Encode(w io.Writer, m image.Image, quality uint) error {
-	options, err := encoder.NewLossyEncoderOptions(encoder.PresetDefault, float32(quality))
-	if err != nil {
-		return err
-	}
-	return webp.Encode(w, m, options)
-}
--- a/go.mod
+++ b/go.mod
@@ -1,28 +1,41 @@
 module github.com/belphemur/CBZOptimizer/v2

-go 1.23.0
+go 1.24
+
+toolchain go1.24.0

 require (
 	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
-	github.com/kolesa-team/go-webp v1.0.4
+	github.com/belphemur/go-webpbin/v2 v2.0.0
 	github.com/oliamb/cutter v0.2.2
-	github.com/pablodz/inotifywaitgo v0.0.7
-	github.com/samber/lo v1.47.0
+	github.com/pablodz/inotifywaitgo v0.0.9
+	github.com/samber/lo v1.49.1
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
-	github.com/thediveo/enumflag/v2 v2.0.5
-	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
-	golang.org/x/image v0.23.0
+	github.com/stretchr/testify v1.10.0
+	github.com/thediveo/enumflag/v2 v2.0.7
+	golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
+	golang.org/x/image v0.24.0
 )

 require (
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/belphemur/go-binwrapper v0.0.0-20240827152605-33977349b1f0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/jfrog/archiver/v3 v3.6.1 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
@@ -30,10 +43,12 @@ require (
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,28 +1,46 @@
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
+github.com/belphemur/go-binwrapper v0.0.0-20240827152605-33977349b1f0 h1:EzKgPYK90TyAOmytK7bvapqlkG/m7KWKK28mOAdQEaM=
+github.com/belphemur/go-binwrapper v0.0.0-20240827152605-33977349b1f0/go.mod h1:s2Dv+CfgVbNM9ucqvE5qCCC0AkI1PE2OZb7N8PPlOh4=
+github.com/belphemur/go-webpbin/v2 v2.0.0 h1:Do0TTTJ6cS6lgi+R67De+jXRYe+ZOwxFqTiFggyX5p8=
+github.com/belphemur/go-webpbin/v2 v2.0.0/go.mod h1:VIHXZQaIwaIYDn08w0qeJFPj1MuYt5pyJnkQALPYc5g=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
+github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
+github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
-github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/kolesa-team/go-webp v1.0.4 h1:wQvU4PLG/X7RS0vAeyhiivhLRoxfLVRlDq4I3frdxIQ=
-github.com/kolesa-team/go-webp v1.0.4/go.mod h1:oMvdivD6K+Q5qIIkVC2w4k2ZUnI1H+MyP7inwgWq9aA=
+github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
+github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
+github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
+github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -32,16 +50,22 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v
 github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
+github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k=
 github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU=
-github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
-github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
-github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
-github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/pablodz/inotifywaitgo v0.0.7 h1:1ii49dGBnRn0t1Sz7RGZS6/NberPEDQprwKHN49Bv6U=
-github.com/pablodz/inotifywaitgo v0.0.7/go.mod h1:OtzRCsYTJlIr+vAzlOtauTkfQ1c25ebFuXq8tbbf8cw=
+github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
+github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
+github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
+github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
+github.com/pablodz/inotifywaitgo v0.0.9 h1:njquRbBU7fuwIe5rEvtaniVBjwWzcpdUVptSgzFqZsw=
+github.com/pablodz/inotifywaitgo v0.0.9/go.mod h1:hAfx2oN+WKg8miwUKPs52trySpPignlRBRxWcXVHku0=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -53,8 +77,8 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
-github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
+github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
+github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
 github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -79,36 +103,39 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/thediveo/enumflag/v2 v2.0.5 h1:VJjvlAqUb6m6mxOrB/0tfBJI0Kvi9wJ8ulh38xK87i8=
-github.com/thediveo/enumflag/v2 v2.0.5/go.mod h1:0NcG67nYgwwFsAvoQCmezG0J0KaIxZ0f7skg9eLq1DA=
-github.com/thediveo/success v1.0.1 h1:NVwUOwKUwaN8szjkJ+vsiM2L3sNBFscldoDJ2g2tAPg=
-github.com/thediveo/success v1.0.1/go.mod h1:AZ8oUArgbIsCuDEWrzWNQHdKnPbDOLQsWOFj9ynwLt0=
+github.com/thediveo/enumflag/v2 v2.0.7 h1:uxXDU+rTel7Hg4X0xdqICpG9rzuI/mzLAEYXWLflOfs=
+github.com/thediveo/enumflag/v2 v2.0.7/go.mod h1:bWlnNvTJuUK+huyzf3WECFLy557Ttlc+yk3o+BPs0EA=
+github.com/thediveo/success v1.0.2 h1:w+r3RbSjLmd7oiNnlCblfGqItcsaShcuAorRVh/+0xk=
+github.com/thediveo/success v1.0.2/go.mod h1:hdPJB77k70w764lh8uLUZgNhgeTl3DYeZ4d4bwMO2CU=
+github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
+github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
+github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0=
-golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
-golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
+golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs=
+golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo=
+golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ=
+golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/internal/cbz/cbz_creator.go
+++ b/internal/cbz/cbz_creator.go
@@ -3,8 +3,8 @@ package cbz
 import (
 	"archive/zip"
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
 	"os"
 	"time"
 )
--- a/internal/cbz/cbz_creator_test.go
+++ b/internal/cbz/cbz_creator_test.go
@@ -4,8 +4,8 @@ import (
 	"archive/zip"
 	"bytes"
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
 	"os"
 	"testing"
 	"time"
--- a/internal/cbz/cbz_loader.go
+++ b/internal/cbz/cbz_loader.go
@@ -6,8 +6,8 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/araddon/dateparse"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
 	"io"
 	"path/filepath"
 	"strings"
--- a/internal/cbz/cbz_loader_test.go
+++ b/internal/cbz/cbz_loader_test.go
@@ -17,14 +17,14 @@ func TestLoadChapter(t *testing.T) {
 	testCases := []testCase{
 		{
 			name:               "Original Chapter",
-			filePath:           "../testdata/Chapter 1.cbz",
+			filePath:           "../../testdata/Chapter 1.cbz",
 			expectedPages:      16,
 			expectedSeries:     "<Series>Boundless Necromancer</Series>",
 			expectedConversion: false,
 		},
 		{
 			name:               "Converted Chapter",
-			filePath:           "../testdata/Chapter 10_converted.cbz",
+			filePath:           "../../testdata/Chapter 10_converted.cbz",
 			expectedPages:      107,
 			expectedSeries:     "<Series>Boundless Necromancer</Series>",
 			expectedConversion: true,
--- a/internal/manga/chapter.go
+++ b/internal/manga/chapter.go
--- a/internal/manga/page.go
+++ b/internal/manga/page.go
--- a/internal/manga/page_container.go
+++ b/internal/manga/page_container.go
@@ -17,3 +17,11 @@ type PageContainer struct {
 func NewContainer(Page *Page, img image.Image, format string, isToBeConverted bool) *PageContainer {
 	return &PageContainer{Page: Page, Image: img, Format: format, IsToBeConverted: isToBeConverted}
 }
+
+// Close releases resources held by the PageContainer
+func (pc *PageContainer) Close() {
+	pc.Image = nil
+	if pc.Page != nil && pc.Page.Contents != nil {
+		pc.Page.Contents.Reset()
+	}
+}
--- a/internal/utils/errs/errors_defer.go
+++ b/internal/utils/errs/errors_defer.go
--- a/internal/utils/errs/errors_defer_test.go
+++ b/internal/utils/errs/errors_defer_test.go
--- a/internal/utils/file_utils.go
+++ b/internal/utils/file_utils.go
--- a/internal/utils/optimize.go
+++ b/internal/utils/optimize.go
@@ -3,9 +3,9 @@ package utils
 import (
 	"errors"
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/cbz"
-	"github.com/belphemur/CBZOptimizer/v2/converter"
-	errors2 "github.com/belphemur/CBZOptimizer/v2/converter/errors"
+	"github.com/belphemur/CBZOptimizer/v2/internal/cbz"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter"
+	errors2 "github.com/belphemur/CBZOptimizer/v2/pkg/converter/errors"
 	"log"
 	"strings"
 )
--- a/main.go
+++ b/main.go
@@ -1,16 +0,0 @@
-package main
-
-import (
-	"github.com/belphemur/CBZOptimizer/v2/cmd"
-)
-
-var (
-	version = "dev"
-	commit  = "none"
-	date    = "unknown"
-)
-
-func main() {
-	cmd.SetVersionInfo(version, commit, date)
-	cmd.Execute()
-}
--- a/pkg/converter/constant/format.go
+++ b/pkg/converter/constant/format.go
--- a/pkg/converter/converter.go
+++ b/pkg/converter/converter.go
@@ -2,9 +2,9 @@ package converter

 import (
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	"github.com/belphemur/CBZOptimizer/v2/converter/webp"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/webp"
 	"github.com/samber/lo"
 	"strings"
 )
--- a/pkg/converter/converter_test.go
+++ b/pkg/converter/converter_test.go
@@ -2,9 +2,9 @@ package converter

 import (
 	"bytes"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/internal/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
 	"golang.org/x/exp/slices"
 	"image"
 	"image/jpeg"
--- a/pkg/converter/errors/converter_errors.go
+++ b/pkg/converter/errors/converter_errors.go
--- a/pkg/converter/webp/webp_converter.go
+++ b/pkg/converter/webp/webp_converter.go
@@ -4,19 +4,19 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/belphemur/CBZOptimizer/v2/converter/constant"
-	converterrors "github.com/belphemur/CBZOptimizer/v2/converter/errors"
-	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/oliamb/cutter"
-	"golang.org/x/exp/slices"
-	_ "golang.org/x/image/webp"
 	"image"
 	_ "image/jpeg"
 	"image/png"
-	"io"
 	"runtime"
 	"sync"
 	"sync/atomic"
+
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
+	converterrors "github.com/belphemur/CBZOptimizer/v2/pkg/converter/errors"
+	"github.com/oliamb/cutter"
+	"golang.org/x/exp/slices"
+	_ "golang.org/x/image/webp"
 )

 const webpMaxHeight = 16383
@@ -63,6 +63,7 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8

 	pagesChan := make(chan *manga.PageContainer, maxGoroutines)
 	errChan := make(chan error, maxGoroutines)
+	doneChan := make(chan struct{})

 	var wgPages sync.WaitGroup
 	wgPages.Add(len(chapter.Pages))
@@ -72,23 +73,27 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8
 	var pages []*manga.Page
 	var totalPages = uint32(len(chapter.Pages))

+	// Start the worker pool
 	go func() {
 		for page := range pagesChan {
 			guard <- struct{}{} // would block if guard channel is already filled
 			go func(pageToConvert *manga.PageContainer) {
-				defer wgConvertedPages.Done()
+				defer func() {
+					wgConvertedPages.Done()
+					pageToConvert.Close() // Clean up resources
+					<-guard
+				}()
+
 				convertedPage, err := converter.convertPage(pageToConvert, quality)
 				if err != nil {
 					if convertedPage == nil {
 						errChan <- err
-						<-guard
 						return
 					}
 					buffer := new(bytes.Buffer)
 					err := png.Encode(buffer, convertedPage.Image)
 					if err != nil {
 						errChan <- err
-						<-guard
 						return
 					}
 					convertedPage.Page.Contents = buffer
@@ -99,11 +104,12 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8
 				pages = append(pages, convertedPage.Page)
 				progress(fmt.Sprintf("Converted %d/%d pages to %s format", len(pages), totalPages, converter.Format()), uint32(len(pages)), totalPages)
 				pagesMutex.Unlock()
-				<-guard
 			}(page)
 		}
+		close(doneChan)
 	}()

+	// Process pages
 	for _, page := range chapter.Pages {
 		go func(page *manga.Page) {
 			defer wgPages.Done()
@@ -111,7 +117,6 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8
 			splitNeeded, img, format, err := converter.checkPageNeedsSplit(page, split)
 			if err != nil {
 				errChan <- err
-				// Partial error in this case, we want the page, but not converting it
 				if img != nil {
 					wgConvertedPages.Add(1)
 					pagesChan <- manga.NewContainer(page, img, format, false)
@@ -124,6 +129,7 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8
 				pagesChan <- manga.NewContainer(page, img, format, true)
 				return
 			}
+
 			images, err := converter.cropImage(img)
 			if err != nil {
 				errChan <- err
@@ -132,17 +138,25 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8

 			atomic.AddUint32(&totalPages, uint32(len(images)-1))
 			for i, img := range images {
-				page := &manga.Page{Index: page.Index, IsSplitted: true, SplitPartIndex: uint16(i)}
+				newPage := &manga.Page{
+					Index:          page.Index,
+					IsSplitted:     true,
+					SplitPartIndex: uint16(i),
+				}
 				wgConvertedPages.Add(1)
-				pagesChan <- manga.NewContainer(page, img, "N/A", true)
+				pagesChan <- manga.NewContainer(newPage, img, "N/A", true)
 			}
 		}(page)
 	}

 	wgPages.Wait()
-	wgConvertedPages.Wait()
 	close(pagesChan)
+
+	// Wait for all conversions to complete
+	<-doneChan
+	wgConvertedPages.Wait()
 	close(errChan)
+	close(guard)

 	var errList []error
 	for err := range errChan {
@@ -156,9 +170,9 @@ func (converter *Converter) ConvertChapter(chapter *manga.Chapter, quality uint8

 	slices.SortFunc(pages, func(a, b *manga.Page) int {
 		if a.Index == b.Index {
-			return int(b.SplitPartIndex - a.SplitPartIndex)
+			return int(a.SplitPartIndex) - int(b.SplitPartIndex)
 		}
-		return int(b.Index - a.Index)
+		return int(a.Index) - int(b.Index)
 	})
 	chapter.Pages = pages

@@ -201,7 +215,7 @@ func (converter *Converter) cropImage(img image.Image) ([]image.Image, error) {
 }

 func (converter *Converter) checkPageNeedsSplit(page *manga.Page, splitRequested bool) (bool, image.Image, string, error) {
-	reader := io.Reader(bytes.NewBuffer(page.Contents.Bytes()))
+	reader := bytes.NewBuffer(page.Contents.Bytes())
 	img, format, err := image.Decode(reader)
 	if err != nil {
 		return false, nil, format, err
@@ -217,7 +231,9 @@ func (converter *Converter) checkPageNeedsSplit(page *manga.Page, splitRequested
 }

 func (converter *Converter) convertPage(container *manga.PageContainer, quality uint8) (*manga.PageContainer, error) {
-	if container.Format == "webp" {
+	// Fix WebP format detection (case insensitive)
+	if container.Format == "webp" || container.Format == "WEBP" {
+		container.Page.Extension = ".webp"
 		return container, nil
 	}
 	if !container.IsToBeConverted {
--- a/pkg/converter/webp/webp_converter_test.go
+++ b/pkg/converter/webp/webp_converter_test.go
@@ -0,0 +1,261 @@
+package webp
+
+import (
+	"bytes"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/png"
+	"sync"
+	"testing"
+
+	"github.com/belphemur/CBZOptimizer/v2/internal/manga"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func createTestImage(width, height int) image.Image {
+	img := image.NewRGBA(image.Rect(0, 0, width, height))
+	draw.Draw(img, img.Bounds(), &image.Uniform{color.White}, image.Point{}, draw.Src)
+	return img
+}
+
+func createTestPage(t *testing.T, index int, width, height int) *manga.Page {
+	img := createTestImage(width, height)
+	var buf bytes.Buffer
+	err := png.Encode(&buf, img)
+	require.NoError(t, err)
+
+	return &manga.Page{
+		Index:     uint16(index),
+		Contents:  &buf,
+		Extension: ".png",
+		Size:      uint64(buf.Len()),
+	}
+}
+
+// TestConverter_ConvertChapter tests the ConvertChapter method of the WebP converter.
+// It verifies various scenarios including:
+// - Converting single normal images
+// - Converting multiple normal images
+// - Converting tall images with split enabled
+// - Handling tall images that exceed maximum height
+//
+// For each test case it validates:
+// - Proper error handling
+// - Expected number of output pages
+// - Correct page ordering
+// - Split page handling and indexing
+// - Progress callback behavior
+//
+// The test uses different image dimensions and split settings to ensure
+// the converter handles all cases correctly while maintaining proper
+// progress reporting and page ordering.
+func TestConverter_ConvertChapter(t *testing.T) {
+	tests := []struct {
+		name        string
+		pages       []*manga.Page
+		split       bool
+		expectSplit bool
+		expectError bool
+		numExpected int
+	}{
+		{
+			name:        "Single normal image",
+			pages:       []*manga.Page{createTestPage(t, 1, 800, 1200)},
+			split:       false,
+			expectSplit: false,
+			numExpected: 1,
+		},
+		{
+			name: "Multiple normal images",
+			pages: []*manga.Page{
+				createTestPage(t, 1, 800, 1200),
+				createTestPage(t, 2, 800, 1200),
+			},
+			split:       false,
+			expectSplit: false,
+			numExpected: 2,
+		},
+		{
+			name:        "Tall image with split enabled",
+			pages:       []*manga.Page{createTestPage(t, 1, 800, 5000)},
+			split:       true,
+			expectSplit: true,
+			numExpected: 3, // Based on cropHeight of 2000
+		},
+		{
+			name:        "Tall image without split",
+			pages:       []*manga.Page{createTestPage(t, 1, 800, webpMaxHeight+100)},
+			split:       false,
+			expectError: true,
+			numExpected: 1,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			converter := New()
+			err := converter.PrepareConverter()
+			require.NoError(t, err)
+
+			chapter := &manga.Chapter{
+				Pages: tt.pages,
+			}
+
+			var progressMutex sync.Mutex
+			var lastProgress uint32
+			progress := func(message string, current uint32, total uint32) {
+				progressMutex.Lock()
+				defer progressMutex.Unlock()
+				assert.GreaterOrEqual(t, current, lastProgress, "Progress should never decrease")
+				lastProgress = current
+				assert.LessOrEqual(t, current, total, "Current progress should not exceed total")
+			}
+
+			convertedChapter, err := converter.ConvertChapter(chapter, 80, tt.split, progress)
+
+			if tt.expectError {
+				assert.Error(t, err)
+				if convertedChapter != nil {
+					assert.LessOrEqual(t, len(convertedChapter.Pages), tt.numExpected)
+				}
+				return
+			}
+
+			require.NoError(t, err)
+			require.NotNil(t, convertedChapter)
+			assert.Len(t, convertedChapter.Pages, tt.numExpected)
+
+			// Verify page order
+			for i := 1; i < len(convertedChapter.Pages); i++ {
+				prevPage := convertedChapter.Pages[i-1]
+				currPage := convertedChapter.Pages[i]
+
+				if prevPage.Index == currPage.Index {
+					assert.Less(t, prevPage.SplitPartIndex, currPage.SplitPartIndex,
+						"Split parts should be in ascending order for page %d", prevPage.Index)
+				} else {
+					assert.Less(t, prevPage.Index, currPage.Index,
+						"Pages should be in ascending order")
+				}
+			}
+
+			if tt.expectSplit {
+				splitFound := false
+				for _, page := range convertedChapter.Pages {
+					if page.IsSplitted {
+						splitFound = true
+						break
+					}
+				}
+				assert.True(t, splitFound, "Expected to find at least one split page")
+			}
+		})
+	}
+}
+
+func TestConverter_convertPage(t *testing.T) {
+	converter := New()
+	err := converter.PrepareConverter()
+	require.NoError(t, err)
+
+	tests := []struct {
+		name            string
+		format          string
+		isToBeConverted bool
+		expectWebP      bool
+	}{
+		{
+			name:            "Convert PNG to WebP",
+			format:          "png",
+			isToBeConverted: true,
+			expectWebP:      true,
+		},
+		{
+			name:            "Already WebP",
+			format:          "webp",
+			isToBeConverted: true,
+			expectWebP:      true,
+		},
+		{
+			name:            "Skip conversion",
+			format:          "png",
+			isToBeConverted: false,
+			expectWebP:      false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			page := createTestPage(t, 1, 100, 100)
+			container := manga.NewContainer(page, createTestImage(100, 100), tt.format, tt.isToBeConverted)
+			defer container.Close()
+
+			converted, err := converter.convertPage(container, 80)
+			require.NoError(t, err)
+			assert.NotNil(t, converted)
+
+			if tt.expectWebP {
+				assert.Equal(t, ".webp", converted.Page.Extension)
+			} else {
+				assert.NotEqual(t, ".webp", converted.Page.Extension)
+			}
+		})
+	}
+}
+
+func TestConverter_checkPageNeedsSplit(t *testing.T) {
+	converter := New()
+
+	tests := []struct {
+		name        string
+		imageHeight int
+		split       bool
+		expectSplit bool
+		expectError bool
+	}{
+		{
+			name:        "Normal height",
+			imageHeight: 1000,
+			split:       true,
+			expectSplit: false,
+		},
+		{
+			name:        "Height exceeds max with split enabled",
+			imageHeight: 5000,
+			split:       true,
+			expectSplit: true,
+		},
+		{
+			name:        "Height exceeds webp max without split",
+			imageHeight: webpMaxHeight + 100,
+			split:       false,
+			expectError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			page := createTestPage(t, 1, 800, tt.imageHeight)
+
+			needsSplit, img, format, err := converter.checkPageNeedsSplit(page, tt.split)
+
+			if tt.expectError {
+				assert.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			assert.NotNil(t, img)
+			assert.NotEmpty(t, format)
+			assert.Equal(t, tt.expectSplit, needsSplit)
+		})
+	}
+}
+
+func TestConverter_Format(t *testing.T) {
+	converter := New()
+	assert.Equal(t, constant.WebP, converter.Format())
+}
--- a/pkg/converter/webp/webp_provider.go
+++ b/pkg/converter/webp/webp_provider.go
@@ -0,0 +1,22 @@
+package webp
+
+import (
+	"github.com/belphemur/go-webpbin/v2"
+	"image"
+	"io"
+)
+
+const libwebpVersion = "1.5.0"
+
+func PrepareEncoder() error {
+	webpbin.SetLibVersion(libwebpVersion)
+	container := webpbin.NewCWebP()
+	return container.BinWrapper.Run()
+}
+func Encode(w io.Writer, m image.Image, quality uint) error {
+	return webpbin.NewCWebP().
+		Quality(quality).
+		InputImage(m).
+		Output(w).
+		Run()
+}
Author	SHA1	Message	Date
Antoine Aflalo	4d3391273c	ci: Sets up QEMU for cross-platform builds Configures QEMU to enable emulation of different architectures, allowing for cross-platform builds and testing in the release workflow.	2025-02-13 20:18:14 -05:00
Antoine Aflalo	2da3bae04a	Updates build configuration for multi-platform support Configures the build process to support multiple platforms (Linux, Darwin, Windows) and architectures (amd64, arm64). Disables CGO to simplify cross-compilation. Updates Docker image creation to produce separate images for amd64 and arm64, and creates manifest lists for `latest` and versioned tags.	2025-02-13 20:12:49 -05:00
Antoine Aflalo	a3dfec642c	test: add webp converter test	2025-02-13 20:05:08 -05:00
Antoine Aflalo	0303c80feb	test: fix path	2025-02-13 20:04:33 -05:00
Antoine Aflalo	efe1696bfa	fix(memory): fix possible memory leak and add better tests	2025-02-13 20:02:45 -05:00
Antoine Aflalo	25cd4585b7	feat: revert to use webp executable	2025-02-13 19:47:13 -05:00
Antoine Aflalo	dd7b6a332c	refactor: update import paths to use internal package	2025-02-13 19:43:18 -05:00
renovate[bot]	5428134d15	chore(deps): update dependency go to v1.24.0 (#49 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-11 20:04:36 +00:00
renovate[bot]	8d59530234	fix(deps): update golang.org/x/exp digest to 939b2ce (#48 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-10 20:23:31 +00:00
renovate[bot]	af30f34aa6	fix(deps): update golang.org/x/exp digest to f9890c6 (#47 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-07 05:00:13 +00:00
renovate[bot]	b3c412c09d	chore(deps): update sigstore/cosign-installer action to v3.8.0 (#46 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-05 00:35:33 +00:00
renovate[bot]	16ba484f28	fix(deps): update module golang.org/x/image to v0.24.0 (#45 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-04 20:39:34 +00:00
renovate[bot]	2de8a81137	chore(deps): update dependency go to v1.23.6 (#44 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-02-04 17:36:25 +00:00
renovate[bot]	c223c9dca6	fix(deps): update golang.org/x/exp digest to e0ece0d (#43 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-28 21:04:20 +00:00
renovate[bot]	dcf57c7646	fix(deps): update golang.org/x/exp digest to 3edf0e9 (#42 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-28 17:46:34 +00:00
renovate[bot]	77e7724de2	fix(deps): update module github.com/samber/lo to v1.49.1 (#41 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-28 13:22:17 +00:00
renovate[bot]	ea8fd55cc2	fix(deps): update module github.com/samber/lo to v1.49.0 (#40 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-27 04:30:54 +00:00
renovate[bot]	709c53d647	fix(deps): update module github.com/pablodz/inotifywaitgo to v0.0.9 (#39 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-26 20:57:06 +00:00
renovate[bot]	919a53fec7	fix(deps): update module github.com/samber/lo to v1.48.0 (#38 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-26 10:22:50 +00:00
renovate[bot]	d3b3a73b8f	chore(deps): update anchore/sbom-action action to v0.18.0 (#37 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-23 20:47:16 +00:00
renovate[bot]	188211e26d	fix(deps): update golang.org/x/exp digest to 7588d65 (#36 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-06 21:12:16 +00:00
renovate[bot]	f57a88eaf4	fix(deps): update module github.com/thediveo/enumflag/v2 to v2.0.7 (#35 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-05 19:29:38 +00:00
renovate[bot]	6e6b66b5eb	fix(deps): update golang.org/x/exp digest to 7d7fa50 (#34 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-03 21:05:57 +00:00
renovate[bot]	1ff1bed3cc	fix(deps): update golang.org/x/exp digest to dd03c70 (#33 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-03 18:34:17 +00:00
renovate[bot]	196938718c	fix(deps): update golang.org/x/exp digest to b2144cd (#32 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-17 20:15:57 +00:00
renovate[bot]	9972709d32	fix(deps): update golang.org/x/exp digest to 4a55095 (#31 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-15 18:36:01 +00:00
renovate[bot]	152fa85577	chore(deps): update anchore/sbom-action action to v0.17.9 (#30 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-13 23:01:28 +00:00
renovate[bot]	554fce5d1e	fix(deps): update golang.org/x/exp digest to 1829a12 (#29 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-10 23:09:05 +00:00
renovate[bot]	25357e9ec6	fix(deps): update golang.org/x/exp digest to 1443442 (#28 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-12-10 17:58:23 +00:00