diff --git a/main.go b/main.go index bd41f17..c5820f0 100644 --- a/main.go +++ b/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() { diff --git a/internal/pkg/converter/converter.go b/pkg/converter/converter.go similarity index 99% rename from internal/pkg/converter/converter.go rename to pkg/converter/converter.go index 1e9e28d..ac93c94 100644 --- a/internal/pkg/converter/converter.go +++ b/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 { diff --git a/internal/pkg/converter/options.go b/pkg/converter/options.go similarity index 99% rename from internal/pkg/converter/options.go rename to pkg/converter/options.go index d83e8be..a6a56cc 100644 --- a/internal/pkg/converter/options.go +++ b/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 { diff --git a/internal/pkg/converter/order.go b/pkg/converter/order.go similarity index 100% rename from internal/pkg/converter/order.go rename to pkg/converter/order.go diff --git a/internal/pkg/converter/profiles.go b/pkg/converter/profiles.go similarity index 97% rename from internal/pkg/converter/profiles.go rename to pkg/converter/profiles.go index 791cd8b..c26bbaa 100644 --- a/internal/pkg/converter/profiles.go +++ b/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 { diff --git a/internal/pkg/epub/epub.go b/pkg/epub/epub.go similarity index 95% rename from internal/pkg/epub/epub.go rename to pkg/epub/epub.go index d87bfb3..7021634 100644 --- a/internal/pkg/epub/epub.go +++ b/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 { diff --git a/internal/pkg/epubimage/epub_image.go b/pkg/epubimage/epub_image.go similarity index 97% rename from internal/pkg/epubimage/epub_image.go rename to pkg/epubimage/epub_image.go index 6e8742c..7e74e56 100644 --- a/internal/pkg/epubimage/epub_image.go +++ b/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 { diff --git a/internal/pkg/epubimagefilters/auto_contrast.go b/pkg/epubimagefilters/auto_contrast.go similarity index 100% rename from internal/pkg/epubimagefilters/auto_contrast.go rename to pkg/epubimagefilters/auto_contrast.go diff --git a/internal/pkg/epubimagefilters/auto_crop.go b/pkg/epubimagefilters/auto_crop.go similarity index 100% rename from internal/pkg/epubimagefilters/auto_crop.go rename to pkg/epubimagefilters/auto_crop.go diff --git a/internal/pkg/epubimagefilters/cover_title.go b/pkg/epubimagefilters/cover_title.go similarity index 100% rename from internal/pkg/epubimagefilters/cover_title.go rename to pkg/epubimagefilters/cover_title.go diff --git a/internal/pkg/epubimagefilters/crop_split_double_page.go b/pkg/epubimagefilters/crop_split_double_page.go similarity index 100% rename from internal/pkg/epubimagefilters/crop_split_double_page.go rename to pkg/epubimagefilters/crop_split_double_page.go diff --git a/internal/pkg/epubimagefilters/pixel.go b/pkg/epubimagefilters/pixel.go similarity index 100% rename from internal/pkg/epubimagefilters/pixel.go rename to pkg/epubimagefilters/pixel.go diff --git a/internal/pkg/epubimageprocessor/loader.go b/pkg/epubimageprocessor/loader.go similarity index 98% rename from internal/pkg/epubimageprocessor/loader.go rename to pkg/epubimageprocessor/loader.go index e0afd04..f0bc8a6 100644 --- a/internal/pkg/epubimageprocessor/loader.go +++ b/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 { diff --git a/internal/pkg/epubimageprocessor/processor.go b/pkg/epubimageprocessor/processor.go similarity index 95% rename from internal/pkg/epubimageprocessor/processor.go rename to pkg/epubimageprocessor/processor.go index 212d128..be7a317 100644 --- a/internal/pkg/epubimageprocessor/processor.go +++ b/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 { diff --git a/internal/pkg/epuboptions/color.go b/pkg/epuboptions/color.go similarity index 100% rename from internal/pkg/epuboptions/color.go rename to pkg/epuboptions/color.go diff --git a/internal/pkg/epuboptions/crop.go b/pkg/epuboptions/crop.go similarity index 100% rename from internal/pkg/epuboptions/crop.go rename to pkg/epuboptions/crop.go diff --git a/internal/pkg/epuboptions/epub_options.go b/pkg/epuboptions/epub_options.go similarity index 100% rename from internal/pkg/epuboptions/epub_options.go rename to pkg/epuboptions/epub_options.go diff --git a/internal/pkg/epuboptions/image.go b/pkg/epuboptions/image.go similarity index 100% rename from internal/pkg/epuboptions/image.go rename to pkg/epuboptions/image.go diff --git a/internal/pkg/epuboptions/view.go b/pkg/epuboptions/view.go similarity index 85% rename from internal/pkg/epuboptions/view.go rename to pkg/epuboptions/view.go index 1fbc841..78c227c 100644 --- a/internal/pkg/epuboptions/view.go +++ b/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 { diff --git a/internal/pkg/epubprogress/epub_progress.go b/pkg/epubprogress/epub_progress.go similarity index 95% rename from internal/pkg/epubprogress/epub_progress.go rename to pkg/epubprogress/epub_progress.go index 272fc45..281808a 100644 --- a/internal/pkg/epubprogress/epub_progress.go +++ b/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 { diff --git a/internal/pkg/epubprogress/json.go b/pkg/epubprogress/json.go similarity index 100% rename from internal/pkg/epubprogress/json.go rename to pkg/epubprogress/json.go diff --git a/internal/pkg/epubtemplates/applebooks.go b/pkg/epubtemplates/applebooks.go similarity index 100% rename from internal/pkg/epubtemplates/applebooks.go rename to pkg/epubtemplates/applebooks.go diff --git a/internal/pkg/epubtemplates/applebooks.xml.tmpl b/pkg/epubtemplates/applebooks.xml.tmpl similarity index 100% rename from internal/pkg/epubtemplates/applebooks.xml.tmpl rename to pkg/epubtemplates/applebooks.xml.tmpl diff --git a/internal/pkg/epubtemplates/blank.go b/pkg/epubtemplates/blank.go similarity index 100% rename from internal/pkg/epubtemplates/blank.go rename to pkg/epubtemplates/blank.go diff --git a/internal/pkg/epubtemplates/blank.xhtml.tmpl b/pkg/epubtemplates/blank.xhtml.tmpl similarity index 100% rename from internal/pkg/epubtemplates/blank.xhtml.tmpl rename to pkg/epubtemplates/blank.xhtml.tmpl diff --git a/internal/pkg/epubtemplates/container.go b/pkg/epubtemplates/container.go similarity index 100% rename from internal/pkg/epubtemplates/container.go rename to pkg/epubtemplates/container.go diff --git a/internal/pkg/epubtemplates/container.xml.tmpl b/pkg/epubtemplates/container.xml.tmpl similarity index 100% rename from internal/pkg/epubtemplates/container.xml.tmpl rename to pkg/epubtemplates/container.xml.tmpl diff --git a/internal/pkg/epubtemplates/content.go b/pkg/epubtemplates/content.go similarity index 97% rename from internal/pkg/epubtemplates/content.go rename to pkg/epubtemplates/content.go index f0e1225..3f02ed0 100644 --- a/internal/pkg/epubtemplates/content.go +++ b/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 { diff --git a/internal/pkg/epubtemplates/style.css.tmpl b/pkg/epubtemplates/style.css.tmpl similarity index 100% rename from internal/pkg/epubtemplates/style.css.tmpl rename to pkg/epubtemplates/style.css.tmpl diff --git a/internal/pkg/epubtemplates/style.go b/pkg/epubtemplates/style.go similarity index 100% rename from internal/pkg/epubtemplates/style.go rename to pkg/epubtemplates/style.go diff --git a/internal/pkg/epubtemplates/text.go b/pkg/epubtemplates/text.go similarity index 100% rename from internal/pkg/epubtemplates/text.go rename to pkg/epubtemplates/text.go diff --git a/internal/pkg/epubtemplates/text.xhtml.tmpl b/pkg/epubtemplates/text.xhtml.tmpl similarity index 100% rename from internal/pkg/epubtemplates/text.xhtml.tmpl rename to pkg/epubtemplates/text.xhtml.tmpl diff --git a/internal/pkg/epubtemplates/toc.go b/pkg/epubtemplates/toc.go similarity index 96% rename from internal/pkg/epubtemplates/toc.go rename to pkg/epubtemplates/toc.go index 96636dc..ec808ce 100644 --- a/internal/pkg/epubtemplates/toc.go +++ b/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 diff --git a/internal/pkg/epubtree/epub_tree.go b/pkg/epubtree/epub_tree.go similarity index 100% rename from internal/pkg/epubtree/epub_tree.go rename to pkg/epubtree/epub_tree.go diff --git a/internal/pkg/epubzip/epub_zip.go b/pkg/epubzip/epub_zip.go similarity index 100% rename from internal/pkg/epubzip/epub_zip.go rename to pkg/epubzip/epub_zip.go diff --git a/internal/pkg/epubzip/image.go b/pkg/epubzip/image.go similarity index 100% rename from internal/pkg/epubzip/image.go rename to pkg/epubzip/image.go diff --git a/internal/pkg/epubzip/storage_image_reader.go b/pkg/epubzip/storage_image_reader.go similarity index 100% rename from internal/pkg/epubzip/storage_image_reader.go rename to pkg/epubzip/storage_image_reader.go diff --git a/internal/pkg/epubzip/storage_image_writer.go b/pkg/epubzip/storage_image_writer.go similarity index 100% rename from internal/pkg/epubzip/storage_image_writer.go rename to pkg/epubzip/storage_image_writer.go diff --git a/internal/pkg/sortpath/by.go b/pkg/sortpath/by.go similarity index 100% rename from internal/pkg/sortpath/by.go rename to pkg/sortpath/by.go diff --git a/internal/pkg/sortpath/parser.go b/pkg/sortpath/parser.go similarity index 100% rename from internal/pkg/sortpath/parser.go rename to pkg/sortpath/parser.go diff --git a/internal/pkg/utils/utils.go b/pkg/utils/utils.go similarity index 100% rename from internal/pkg/utils/utils.go rename to pkg/utils/utils.go diff --git a/internal/pkg/utils/utils_test.go b/pkg/utils/utils_test.go similarity index 100% rename from internal/pkg/utils/utils_test.go rename to pkg/utils/utils_test.go