From 4c9644e9b3d0936544253322ac35e83f1f42aef4 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:03:48 +0100 Subject: [PATCH] move back deps to internal --- {pkg => internal}/epubimage/epubimage.go | 0 .../epubimagefilters_autocontrast.go | 0 .../epubimagefilters/epubimagefilters_autocrop.go | 0 .../epubimagefilters/epubimagefilters_cover_title.go | 0 .../epubimagefilters_crop_split_double_page.go | 0 .../epubimagefilters/epubimagefilters_pixel.go | 0 .../epubimageprocessor/epubimageprocessor.go | 8 ++++---- .../epubimageprocessor_covert_title_data.go | 4 ++-- .../epubimageprocessor/epubimageprocessor_loader.go | 2 +- {pkg => internal}/epubprogress/epubprogress.go | 0 {pkg => internal}/epubprogress/epubprogress_json.go | 0 {pkg => internal}/epubtemplates/epubtemplates.go | 0 .../epubtemplates/epubtemplates_applebooks.xml.tmpl | 0 .../epubtemplates/epubtemplates_blank.xhtml.tmpl | 0 .../epubtemplates/epubtemplates_container.xml.tmpl | 0 .../epubtemplates/epubtemplates_content.go | 2 +- .../epubtemplates/epubtemplates_style.css.tmpl | 0 .../epubtemplates/epubtemplates_text.xhtml.tmpl | 0 {pkg => internal}/epubtemplates/epubtemplates_toc.go | 2 +- {pkg => internal}/epubtree/epubtree.go | 0 {pkg => internal}/epubzip/epubzip.go | 0 {pkg => internal}/epubzip/epubzip_image.go | 0 {pkg => internal}/epubzip/epubzip_image_reader.go | 0 {pkg => internal}/epubzip/epubzip_image_writer.go | 0 {pkg => internal}/sortpath/sortpath.go | 0 {pkg => internal}/sortpath/sortpath_parser.go | 0 pkg/epub/epub.go | 12 ++++++------ 27 files changed, 15 insertions(+), 15 deletions(-) rename {pkg => internal}/epubimage/epubimage.go (100%) rename {pkg => internal}/epubimagefilters/epubimagefilters_autocontrast.go (100%) rename {pkg => internal}/epubimagefilters/epubimagefilters_autocrop.go (100%) rename {pkg => internal}/epubimagefilters/epubimagefilters_cover_title.go (100%) rename {pkg => internal}/epubimagefilters/epubimagefilters_crop_split_double_page.go (100%) rename {pkg => internal}/epubimagefilters/epubimagefilters_pixel.go (100%) rename {pkg => internal}/epubimageprocessor/epubimageprocessor.go (96%) rename {pkg => internal}/epubimageprocessor/epubimageprocessor_covert_title_data.go (91%) rename {pkg => internal}/epubimageprocessor/epubimageprocessor_loader.go (99%) rename {pkg => internal}/epubprogress/epubprogress.go (100%) rename {pkg => internal}/epubprogress/epubprogress_json.go (100%) rename {pkg => internal}/epubtemplates/epubtemplates.go (100%) rename {pkg => internal}/epubtemplates/epubtemplates_applebooks.xml.tmpl (100%) rename {pkg => internal}/epubtemplates/epubtemplates_blank.xhtml.tmpl (100%) rename {pkg => internal}/epubtemplates/epubtemplates_container.xml.tmpl (100%) rename {pkg => internal}/epubtemplates/epubtemplates_content.go (99%) rename {pkg => internal}/epubtemplates/epubtemplates_style.css.tmpl (100%) rename {pkg => internal}/epubtemplates/epubtemplates_text.xhtml.tmpl (100%) rename {pkg => internal}/epubtemplates/epubtemplates_toc.go (96%) rename {pkg => internal}/epubtree/epubtree.go (100%) rename {pkg => internal}/epubzip/epubzip.go (100%) rename {pkg => internal}/epubzip/epubzip_image.go (100%) rename {pkg => internal}/epubzip/epubzip_image_reader.go (100%) rename {pkg => internal}/epubzip/epubzip_image_writer.go (100%) rename {pkg => internal}/sortpath/sortpath.go (100%) rename {pkg => internal}/sortpath/sortpath_parser.go (100%) diff --git a/pkg/epubimage/epubimage.go b/internal/epubimage/epubimage.go similarity index 100% rename from pkg/epubimage/epubimage.go rename to internal/epubimage/epubimage.go diff --git a/pkg/epubimagefilters/epubimagefilters_autocontrast.go b/internal/epubimagefilters/epubimagefilters_autocontrast.go similarity index 100% rename from pkg/epubimagefilters/epubimagefilters_autocontrast.go rename to internal/epubimagefilters/epubimagefilters_autocontrast.go diff --git a/pkg/epubimagefilters/epubimagefilters_autocrop.go b/internal/epubimagefilters/epubimagefilters_autocrop.go similarity index 100% rename from pkg/epubimagefilters/epubimagefilters_autocrop.go rename to internal/epubimagefilters/epubimagefilters_autocrop.go diff --git a/pkg/epubimagefilters/epubimagefilters_cover_title.go b/internal/epubimagefilters/epubimagefilters_cover_title.go similarity index 100% rename from pkg/epubimagefilters/epubimagefilters_cover_title.go rename to internal/epubimagefilters/epubimagefilters_cover_title.go diff --git a/pkg/epubimagefilters/epubimagefilters_crop_split_double_page.go b/internal/epubimagefilters/epubimagefilters_crop_split_double_page.go similarity index 100% rename from pkg/epubimagefilters/epubimagefilters_crop_split_double_page.go rename to internal/epubimagefilters/epubimagefilters_crop_split_double_page.go diff --git a/pkg/epubimagefilters/epubimagefilters_pixel.go b/internal/epubimagefilters/epubimagefilters_pixel.go similarity index 100% rename from pkg/epubimagefilters/epubimagefilters_pixel.go rename to internal/epubimagefilters/epubimagefilters_pixel.go diff --git a/pkg/epubimageprocessor/epubimageprocessor.go b/internal/epubimageprocessor/epubimageprocessor.go similarity index 96% rename from pkg/epubimageprocessor/epubimageprocessor.go rename to internal/epubimageprocessor/epubimageprocessor.go index ce54393..a0c6224 100644 --- a/pkg/epubimageprocessor/epubimageprocessor.go +++ b/internal/epubimageprocessor/epubimageprocessor.go @@ -10,11 +10,11 @@ import ( "os" "sync" - "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/internal/epubimage" + "github.com/celogeek/go-comic-converter/v2/internal/epubimagefilters" + "github.com/celogeek/go-comic-converter/v2/internal/epubprogress" + "github.com/celogeek/go-comic-converter/v2/internal/epubzip" "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/disintegration/gift" ) diff --git a/pkg/epubimageprocessor/epubimageprocessor_covert_title_data.go b/internal/epubimageprocessor/epubimageprocessor_covert_title_data.go similarity index 91% rename from pkg/epubimageprocessor/epubimageprocessor_covert_title_data.go rename to internal/epubimageprocessor/epubimageprocessor_covert_title_data.go index 7477d6d..de40d6e 100644 --- a/pkg/epubimageprocessor/epubimageprocessor_covert_title_data.go +++ b/internal/epubimageprocessor/epubimageprocessor_covert_title_data.go @@ -6,8 +6,8 @@ import ( "image/color" "image/draw" - "github.com/celogeek/go-comic-converter/v2/pkg/epubimagefilters" - "github.com/celogeek/go-comic-converter/v2/pkg/epubzip" + "github.com/celogeek/go-comic-converter/v2/internal/epubimagefilters" + "github.com/celogeek/go-comic-converter/v2/internal/epubzip" "github.com/disintegration/gift" ) diff --git a/pkg/epubimageprocessor/epubimageprocessor_loader.go b/internal/epubimageprocessor/epubimageprocessor_loader.go similarity index 99% rename from pkg/epubimageprocessor/epubimageprocessor_loader.go rename to internal/epubimageprocessor/epubimageprocessor_loader.go index 7a30fa0..8d4b345 100644 --- a/pkg/epubimageprocessor/epubimageprocessor_loader.go +++ b/internal/epubimageprocessor/epubimageprocessor_loader.go @@ -20,7 +20,7 @@ import ( "golang.org/x/image/font/gofont/gomonobold" _ "golang.org/x/image/webp" - "github.com/celogeek/go-comic-converter/v2/pkg/sortpath" + "github.com/celogeek/go-comic-converter/v2/internal/sortpath" "github.com/fogleman/gg" "github.com/golang/freetype/truetype" "github.com/nwaples/rardecode/v2" diff --git a/pkg/epubprogress/epubprogress.go b/internal/epubprogress/epubprogress.go similarity index 100% rename from pkg/epubprogress/epubprogress.go rename to internal/epubprogress/epubprogress.go diff --git a/pkg/epubprogress/epubprogress_json.go b/internal/epubprogress/epubprogress_json.go similarity index 100% rename from pkg/epubprogress/epubprogress_json.go rename to internal/epubprogress/epubprogress_json.go diff --git a/pkg/epubtemplates/epubtemplates.go b/internal/epubtemplates/epubtemplates.go similarity index 100% rename from pkg/epubtemplates/epubtemplates.go rename to internal/epubtemplates/epubtemplates.go diff --git a/pkg/epubtemplates/epubtemplates_applebooks.xml.tmpl b/internal/epubtemplates/epubtemplates_applebooks.xml.tmpl similarity index 100% rename from pkg/epubtemplates/epubtemplates_applebooks.xml.tmpl rename to internal/epubtemplates/epubtemplates_applebooks.xml.tmpl diff --git a/pkg/epubtemplates/epubtemplates_blank.xhtml.tmpl b/internal/epubtemplates/epubtemplates_blank.xhtml.tmpl similarity index 100% rename from pkg/epubtemplates/epubtemplates_blank.xhtml.tmpl rename to internal/epubtemplates/epubtemplates_blank.xhtml.tmpl diff --git a/pkg/epubtemplates/epubtemplates_container.xml.tmpl b/internal/epubtemplates/epubtemplates_container.xml.tmpl similarity index 100% rename from pkg/epubtemplates/epubtemplates_container.xml.tmpl rename to internal/epubtemplates/epubtemplates_container.xml.tmpl diff --git a/pkg/epubtemplates/epubtemplates_content.go b/internal/epubtemplates/epubtemplates_content.go similarity index 99% rename from pkg/epubtemplates/epubtemplates_content.go rename to internal/epubtemplates/epubtemplates_content.go index 6d1eeb0..b7698a7 100644 --- a/pkg/epubtemplates/epubtemplates_content.go +++ b/internal/epubtemplates/epubtemplates_content.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/beevik/etree" - "github.com/celogeek/go-comic-converter/v2/pkg/epubimage" + "github.com/celogeek/go-comic-converter/v2/internal/epubimage" "github.com/celogeek/go-comic-converter/v2/pkg/epuboptions" ) diff --git a/pkg/epubtemplates/epubtemplates_style.css.tmpl b/internal/epubtemplates/epubtemplates_style.css.tmpl similarity index 100% rename from pkg/epubtemplates/epubtemplates_style.css.tmpl rename to internal/epubtemplates/epubtemplates_style.css.tmpl diff --git a/pkg/epubtemplates/epubtemplates_text.xhtml.tmpl b/internal/epubtemplates/epubtemplates_text.xhtml.tmpl similarity index 100% rename from pkg/epubtemplates/epubtemplates_text.xhtml.tmpl rename to internal/epubtemplates/epubtemplates_text.xhtml.tmpl diff --git a/pkg/epubtemplates/epubtemplates_toc.go b/internal/epubtemplates/epubtemplates_toc.go similarity index 96% rename from pkg/epubtemplates/epubtemplates_toc.go rename to internal/epubtemplates/epubtemplates_toc.go index 1c5ede2..837d66b 100644 --- a/pkg/epubtemplates/epubtemplates_toc.go +++ b/internal/epubtemplates/epubtemplates_toc.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/beevik/etree" - "github.com/celogeek/go-comic-converter/v2/pkg/epubimage" + "github.com/celogeek/go-comic-converter/v2/internal/epubimage" ) // create toc diff --git a/pkg/epubtree/epubtree.go b/internal/epubtree/epubtree.go similarity index 100% rename from pkg/epubtree/epubtree.go rename to internal/epubtree/epubtree.go diff --git a/pkg/epubzip/epubzip.go b/internal/epubzip/epubzip.go similarity index 100% rename from pkg/epubzip/epubzip.go rename to internal/epubzip/epubzip.go diff --git a/pkg/epubzip/epubzip_image.go b/internal/epubzip/epubzip_image.go similarity index 100% rename from pkg/epubzip/epubzip_image.go rename to internal/epubzip/epubzip_image.go diff --git a/pkg/epubzip/epubzip_image_reader.go b/internal/epubzip/epubzip_image_reader.go similarity index 100% rename from pkg/epubzip/epubzip_image_reader.go rename to internal/epubzip/epubzip_image_reader.go diff --git a/pkg/epubzip/epubzip_image_writer.go b/internal/epubzip/epubzip_image_writer.go similarity index 100% rename from pkg/epubzip/epubzip_image_writer.go rename to internal/epubzip/epubzip_image_writer.go diff --git a/pkg/sortpath/sortpath.go b/internal/sortpath/sortpath.go similarity index 100% rename from pkg/sortpath/sortpath.go rename to internal/sortpath/sortpath.go diff --git a/pkg/sortpath/sortpath_parser.go b/internal/sortpath/sortpath_parser.go similarity index 100% rename from pkg/sortpath/sortpath_parser.go rename to internal/sortpath/sortpath_parser.go diff --git a/pkg/epub/epub.go b/pkg/epub/epub.go index 2bdc7f6..817188e 100644 --- a/pkg/epub/epub.go +++ b/pkg/epub/epub.go @@ -15,13 +15,13 @@ import ( "text/template" "time" - "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/internal/epubimage" + "github.com/celogeek/go-comic-converter/v2/internal/epubimageprocessor" + "github.com/celogeek/go-comic-converter/v2/internal/epubprogress" + "github.com/celogeek/go-comic-converter/v2/internal/epubtemplates" + "github.com/celogeek/go-comic-converter/v2/internal/epubtree" + "github.com/celogeek/go-comic-converter/v2/internal/epubzip" "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/gofrs/uuid" )