Merge 8ba9092d9cbe19d8a31fe0d98eb14d2acf38607f into c9df70fbb3105dce9c9fde6f6c3f79bd342952f8

main.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/tcnksm/go-latest"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/converter"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epub"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epuboptions"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/converter"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epub"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 func main() {

pkg/converter/converter.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type Converter struct {

pkg/converter/options.go

@@ -10,7 +10,7 @@ import (
 
 	"gopkg.in/yaml.v3"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type Options struct {

pkg/converter/profiles.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type Profile struct {

pkg/epub/epub.go

@@ -14,14 +14,14 @@ import (
 
 	"github.com/gofrs/uuid"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimage"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimageprocessor"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epuboptions"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubprogress"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubtemplates"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubtree"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubzip"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimage"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimageprocessor"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubprogress"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubtemplates"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubtree"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubzip"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type EPUB struct {

pkg/epubimage/epub_image.go

@@ -5,7 +5,7 @@ import (
 	"image"
 	"strings"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type EPUBImage struct {

pkg/epubimageprocessor/loader.go

@@ -27,9 +27,9 @@ import (
 	pdfimage "github.com/raff/pdfreader/image"
 	"github.com/raff/pdfreader/pdfread"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/sortpath"
+	"github.com/celogeek/go-comic-converter/v2/pkg/sortpath"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type task struct {

pkg/epubimageprocessor/processor.go

@@ -9,12 +9,12 @@ import (
 
 	"github.com/disintegration/gift"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimage"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimagefilters"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epuboptions"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubprogress"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubzip"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimage"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimagefilters"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubprogress"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubzip"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type EPUBImageProcessor struct {

pkg/epuboptions/view.go

@@ -1,7 +1,7 @@
 package epuboptions
 
 import (
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type View struct {

pkg/epubprogress/epub_progress.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/schollz/progressbar/v3"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type Options struct {

pkg/epubtemplates/content.go

@@ -3,9 +3,9 @@ package epubtemplates
 import (
 	"github.com/beevik/etree"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimage"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epuboptions"
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/utils"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimage"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epuboptions"
+	"github.com/celogeek/go-comic-converter/v2/pkg/utils"
 )
 
 type Content struct {

pkg/epubtemplates/toc.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/beevik/etree"
 
-	"github.com/celogeek/go-comic-converter/v2/internal/pkg/epubimage"
+	"github.com/celogeek/go-comic-converter/v2/pkg/epubimage"
 )
 
 // Toc create toc