From dd7b6a332cec205ed03238fef7f6c03e16cfb7d3 Mon Sep 17 00:00:00 2001
From: Antoine Aflalo <197810+Belphemur@users.noreply.github.com>
Date: Thu, 13 Feb 2025 19:39:06 -0500
Subject: [PATCH] refactor: update import paths to use internal package

---
 .goreleaser.yml                                  |  2 +-
 .../commands}/optimize_command.go                | 12 ++++++------
 .../commands}/optimize_command_test.go           | 12 ++++++------
 cmd/{ => cbzoptimizer/commands}/rootcmd.go       |  2 +-
 cmd/{ => cbzoptimizer/commands}/watch_command.go | 12 ++++++------
 cmd/cbzoptimizer/main.go                         | 16 ++++++++++++++++
 go.mod                                           |  2 +-
 {cbz => internal/cbz}/cbz_creator.go             |  4 ++--
 {cbz => internal/cbz}/cbz_creator_test.go        |  4 ++--
 {cbz => internal/cbz}/cbz_loader.go              |  4 ++--
 {cbz => internal/cbz}/cbz_loader_test.go         |  0
 {manga => internal/manga}/chapter.go             |  0
 {manga => internal/manga}/page.go                |  0
 {manga => internal/manga}/page_container.go      |  0
 {utils => internal/utils}/errs/errors_defer.go   |  0
 .../utils}/errs/errors_defer_test.go             |  0
 {utils => internal/utils}/file_utils.go          |  0
 {utils => internal/utils}/optimize.go            |  6 +++---
 main.go                                          | 16 ----------------
 {converter => pkg/converter}/constant/format.go  |  0
 {converter => pkg/converter}/converter.go        |  6 +++---
 {converter => pkg/converter}/converter_test.go   |  4 ++--
 .../converter}/errors/converter_errors.go        |  0
 .../converter}/webp/webp_converter.go            |  6 +++---
 .../converter}/webp/webp_provider.go             |  0
 25 files changed, 54 insertions(+), 54 deletions(-)
 rename cmd/{ => cbzoptimizer/commands}/optimize_command.go (92%)
 rename cmd/{ => cbzoptimizer/commands}/optimize_command_test.go (91%)
 rename cmd/{ => cbzoptimizer/commands}/rootcmd.go (98%)
 rename cmd/{ => cbzoptimizer/commands}/watch_command.go (92%)
 create mode 100644 cmd/cbzoptimizer/main.go
 rename {cbz => internal/cbz}/cbz_creator.go (95%)
 rename {cbz => internal/cbz}/cbz_creator_test.go (96%)
 rename {cbz => internal/cbz}/cbz_loader.go (95%)
 rename {cbz => internal/cbz}/cbz_loader_test.go (100%)
 rename {manga => internal/manga}/chapter.go (100%)
 rename {manga => internal/manga}/page.go (100%)
 rename {manga => internal/manga}/page_container.go (100%)
 rename {utils => internal/utils}/errs/errors_defer.go (100%)
 rename {utils => internal/utils}/errs/errors_defer_test.go (100%)
 rename {utils => internal/utils}/file_utils.go (100%)
 rename {utils => internal/utils}/optimize.go (90%)
 delete mode 100644 main.go
 rename {converter => pkg/converter}/constant/format.go (100%)
 rename {converter => pkg/converter}/converter.go (87%)
 rename {converter => pkg/converter}/converter_test.go (98%)
 rename {converter => pkg/converter}/errors/converter_errors.go (100%)
 rename {converter => pkg/converter}/webp/webp_converter.go (96%)
 rename {converter => pkg/converter}/webp/webp_provider.go (100%)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 525b05d..011ee79 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -24,7 +24,7 @@ changelog:
       order: 2
 builds:
   - id: cbzoptimizer
-    main: main.go
+    main: cmd/cbzoptimizer/main.go
     goos:
       - linux
     goarch:
diff --git a/cmd/optimize_command.go b/cmd/cbzoptimizer/commands/optimize_command.go
similarity index 92%
rename from cmd/optimize_command.go
rename to cmd/cbzoptimizer/commands/optimize_command.go
index b3d167c..44d03ac 100644
--- a/cmd/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,
diff --git a/cmd/optimize_command_test.go b/cmd/cbzoptimizer/commands/optimize_command_test.go
similarity index 91%
rename from cmd/optimize_command_test.go
rename to cmd/cbzoptimizer/commands/optimize_command_test.go
index 02438e6..e5a6848 100644
--- a/cmd/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"
diff --git a/cmd/rootcmd.go b/cmd/cbzoptimizer/commands/rootcmd.go
similarity index 98%
rename from cmd/rootcmd.go
rename to cmd/cbzoptimizer/commands/rootcmd.go
index 2d3ffc8..355d0f8 100644
--- a/cmd/rootcmd.go
+++ b/cmd/cbzoptimizer/commands/rootcmd.go
@@ -1,4 +1,4 @@
-package cmd
+package commands
 
 import (
 	"fmt"
diff --git a/cmd/watch_command.go b/cmd/cbzoptimizer/commands/watch_command.go
similarity index 92%
rename from cmd/watch_command.go
rename to cmd/cbzoptimizer/commands/watch_command.go
index 6893891..ed47f69 100644
--- a/cmd/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,
diff --git a/cmd/cbzoptimizer/main.go b/cmd/cbzoptimizer/main.go
new file mode 100644
index 0000000..46db18e
--- /dev/null
+++ 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()
+}
diff --git a/go.mod b/go.mod
index 2ff9233..5ccc809 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/belphemur/CBZOptimizer/v2
 
-go 1.23.1
+go 1.24
 
 toolchain go1.24.0
 
diff --git a/cbz/cbz_creator.go b/internal/cbz/cbz_creator.go
similarity index 95%
rename from cbz/cbz_creator.go
rename to internal/cbz/cbz_creator.go
index 8901f5d..c2fa16b 100644
--- a/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"
 )
diff --git a/cbz/cbz_creator_test.go b/internal/cbz/cbz_creator_test.go
similarity index 96%
rename from cbz/cbz_creator_test.go
rename to internal/cbz/cbz_creator_test.go
index 97320bb..62f7b71 100644
--- a/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"
diff --git a/cbz/cbz_loader.go b/internal/cbz/cbz_loader.go
similarity index 95%
rename from cbz/cbz_loader.go
rename to internal/cbz/cbz_loader.go
index 7084222..a46ccad 100644
--- a/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"
diff --git a/cbz/cbz_loader_test.go b/internal/cbz/cbz_loader_test.go
similarity index 100%
rename from cbz/cbz_loader_test.go
rename to internal/cbz/cbz_loader_test.go
diff --git a/manga/chapter.go b/internal/manga/chapter.go
similarity index 100%
rename from manga/chapter.go
rename to internal/manga/chapter.go
diff --git a/manga/page.go b/internal/manga/page.go
similarity index 100%
rename from manga/page.go
rename to internal/manga/page.go
diff --git a/manga/page_container.go b/internal/manga/page_container.go
similarity index 100%
rename from manga/page_container.go
rename to internal/manga/page_container.go
diff --git a/utils/errs/errors_defer.go b/internal/utils/errs/errors_defer.go
similarity index 100%
rename from utils/errs/errors_defer.go
rename to internal/utils/errs/errors_defer.go
diff --git a/utils/errs/errors_defer_test.go b/internal/utils/errs/errors_defer_test.go
similarity index 100%
rename from utils/errs/errors_defer_test.go
rename to internal/utils/errs/errors_defer_test.go
diff --git a/utils/file_utils.go b/internal/utils/file_utils.go
similarity index 100%
rename from utils/file_utils.go
rename to internal/utils/file_utils.go
diff --git a/utils/optimize.go b/internal/utils/optimize.go
similarity index 90%
rename from utils/optimize.go
rename to internal/utils/optimize.go
index 03d79e8..4de37c2 100644
--- a/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"
 )
diff --git a/main.go b/main.go
deleted file mode 100644
index cb254ef..0000000
--- a/main.go
+++ /dev/null
@@ -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()
-}
diff --git a/converter/constant/format.go b/pkg/converter/constant/format.go
similarity index 100%
rename from converter/constant/format.go
rename to pkg/converter/constant/format.go
diff --git a/converter/converter.go b/pkg/converter/converter.go
similarity index 87%
rename from converter/converter.go
rename to pkg/converter/converter.go
index ff1b23b..62719d2 100644
--- a/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"
 )
diff --git a/converter/converter_test.go b/pkg/converter/converter_test.go
similarity index 98%
rename from converter/converter_test.go
rename to pkg/converter/converter_test.go
index a9e4d5f..fa02ffe 100644
--- a/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/internal/utils/errs"
 	"github.com/belphemur/CBZOptimizer/v2/manga"
-	"github.com/belphemur/CBZOptimizer/v2/utils/errs"
+	"github.com/belphemur/CBZOptimizer/v2/pkg/converter/constant"
 	"golang.org/x/exp/slices"
 	"image"
 	"image/jpeg"
diff --git a/converter/errors/converter_errors.go b/pkg/converter/errors/converter_errors.go
similarity index 100%
rename from converter/errors/converter_errors.go
rename to pkg/converter/errors/converter_errors.go
diff --git a/converter/webp/webp_converter.go b/pkg/converter/webp/webp_converter.go
similarity index 96%
rename from converter/webp/webp_converter.go
rename to pkg/converter/webp/webp_converter.go
index 7c2b843..2f5fd21 100644
--- a/converter/webp/webp_converter.go
+++ b/pkg/converter/webp/webp_converter.go
@@ -4,9 +4,9 @@ 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/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"
diff --git a/converter/webp/webp_provider.go b/pkg/converter/webp/webp_provider.go
similarity index 100%
rename from converter/webp/webp_provider.go
rename to pkg/converter/webp/webp_provider.go