From 98aa128f3e197353b427b51424fb7d37b7b384d4 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Thu, 4 Jan 2024 16:43:14 +0100 Subject: [PATCH] make epub package public --- main.go | 4 ++-- {internal => pkg}/epub/epub.go | 14 +++++++------- {internal => pkg}/epub/image/epub_image.go | 0 .../epub_image_filters_autocontrast.go | 0 .../imagefilters/epub_image_filters_autocrop.go | 0 .../imagefilters/epub_image_filters_cover_title.go | 0 .../epub_image_filters_crop_split_double_page.go | 0 .../epub/imagefilters/epub_image_filters_pixel.go | 0 .../epub/imageprocessor/epub_image_processor.go | 10 +++++----- .../imageprocessor/epub_image_processor_loader.go | 0 {internal => pkg}/epub/options/epub_options.go | 0 {internal => pkg}/epub/progress/epub_progress.go | 0 .../epub/progress/epub_progress_json.go | 0 {internal => pkg}/epub/templates/epub_templates.go | 0 .../templates/epub_templates_applebooks.xml.tmpl | 0 .../epub/templates/epub_templates_blank.xhtml.tmpl | 0 .../templates/epub_templates_container.xml.tmpl | 0 .../epub/templates/epub_templates_content.go | 4 ++-- .../epub/templates/epub_templates_style.css.tmpl | 0 .../epub/templates/epub_templates_text.xhtml.tmpl | 0 .../epub/templates/epub_templates_toc.go | 2 +- {internal => pkg}/epub/tree/epub_tree.go | 0 {internal => pkg}/epub/zip/epub_zip.go | 0 {internal => pkg}/epub/zip/epub_zip_image.go | 0 .../epub/zip/epub_zip_storage_image.go | 0 25 files changed, 17 insertions(+), 17 deletions(-) rename {internal => pkg}/epub/epub.go (95%) rename {internal => pkg}/epub/image/epub_image.go (100%) rename {internal => pkg}/epub/imagefilters/epub_image_filters_autocontrast.go (100%) rename {internal => pkg}/epub/imagefilters/epub_image_filters_autocrop.go (100%) rename {internal => pkg}/epub/imagefilters/epub_image_filters_cover_title.go (100%) rename {internal => pkg}/epub/imagefilters/epub_image_filters_crop_split_double_page.go (100%) rename {internal => pkg}/epub/imagefilters/epub_image_filters_pixel.go (100%) rename {internal => pkg}/epub/imageprocessor/epub_image_processor.go (95%) rename {internal => pkg}/epub/imageprocessor/epub_image_processor_loader.go (100%) rename {internal => pkg}/epub/options/epub_options.go (100%) rename {internal => pkg}/epub/progress/epub_progress.go (100%) rename {internal => pkg}/epub/progress/epub_progress_json.go (100%) rename {internal => pkg}/epub/templates/epub_templates.go (100%) rename {internal => pkg}/epub/templates/epub_templates_applebooks.xml.tmpl (100%) rename {internal => pkg}/epub/templates/epub_templates_blank.xhtml.tmpl (100%) rename {internal => pkg}/epub/templates/epub_templates_container.xml.tmpl (100%) rename {internal => pkg}/epub/templates/epub_templates_content.go (98%) rename {internal => pkg}/epub/templates/epub_templates_style.css.tmpl (100%) rename {internal => pkg}/epub/templates/epub_templates_text.xhtml.tmpl (100%) rename {internal => pkg}/epub/templates/epub_templates_toc.go (96%) rename {internal => pkg}/epub/tree/epub_tree.go (100%) rename {internal => pkg}/epub/zip/epub_zip.go (100%) rename {internal => pkg}/epub/zip/epub_zip_image.go (100%) rename {internal => pkg}/epub/zip/epub_zip_storage_image.go (100%) diff --git a/main.go b/main.go index 2d19725..db7deda 100644 --- a/main.go +++ b/main.go @@ -14,8 +14,8 @@ import ( "runtime/debug" "github.com/celogeek/go-comic-converter/v2/internal/converter" - "github.com/celogeek/go-comic-converter/v2/internal/epub" - epuboptions "github.com/celogeek/go-comic-converter/v2/internal/epub/options" + "github.com/celogeek/go-comic-converter/v2/pkg/epub" + epuboptions "github.com/celogeek/go-comic-converter/v2/pkg/epub/options" "github.com/tcnksm/go-latest" ) diff --git a/internal/epub/epub.go b/pkg/epub/epub.go similarity index 95% rename from internal/epub/epub.go rename to pkg/epub/epub.go index df4da11..4a03125 100644 --- a/internal/epub/epub.go +++ b/pkg/epub/epub.go @@ -15,13 +15,13 @@ import ( "text/template" "time" - epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image" - epubimageprocessor "github.com/celogeek/go-comic-converter/v2/internal/epub/imageprocessor" - epuboptions "github.com/celogeek/go-comic-converter/v2/internal/epub/options" - epubprogress "github.com/celogeek/go-comic-converter/v2/internal/epub/progress" - epubtemplates "github.com/celogeek/go-comic-converter/v2/internal/epub/templates" - epubtree "github.com/celogeek/go-comic-converter/v2/internal/epub/tree" - epubzip "github.com/celogeek/go-comic-converter/v2/internal/epub/zip" + epubimage "github.com/celogeek/go-comic-converter/v2/pkg/epub/image" + epubimageprocessor "github.com/celogeek/go-comic-converter/v2/pkg/epub/imageprocessor" + epuboptions "github.com/celogeek/go-comic-converter/v2/pkg/epub/options" + epubprogress "github.com/celogeek/go-comic-converter/v2/pkg/epub/progress" + epubtemplates "github.com/celogeek/go-comic-converter/v2/pkg/epub/templates" + epubtree "github.com/celogeek/go-comic-converter/v2/pkg/epub/tree" + epubzip "github.com/celogeek/go-comic-converter/v2/pkg/epub/zip" "github.com/gofrs/uuid" ) diff --git a/internal/epub/image/epub_image.go b/pkg/epub/image/epub_image.go similarity index 100% rename from internal/epub/image/epub_image.go rename to pkg/epub/image/epub_image.go diff --git a/internal/epub/imagefilters/epub_image_filters_autocontrast.go b/pkg/epub/imagefilters/epub_image_filters_autocontrast.go similarity index 100% rename from internal/epub/imagefilters/epub_image_filters_autocontrast.go rename to pkg/epub/imagefilters/epub_image_filters_autocontrast.go diff --git a/internal/epub/imagefilters/epub_image_filters_autocrop.go b/pkg/epub/imagefilters/epub_image_filters_autocrop.go similarity index 100% rename from internal/epub/imagefilters/epub_image_filters_autocrop.go rename to pkg/epub/imagefilters/epub_image_filters_autocrop.go diff --git a/internal/epub/imagefilters/epub_image_filters_cover_title.go b/pkg/epub/imagefilters/epub_image_filters_cover_title.go similarity index 100% rename from internal/epub/imagefilters/epub_image_filters_cover_title.go rename to pkg/epub/imagefilters/epub_image_filters_cover_title.go diff --git a/internal/epub/imagefilters/epub_image_filters_crop_split_double_page.go b/pkg/epub/imagefilters/epub_image_filters_crop_split_double_page.go similarity index 100% rename from internal/epub/imagefilters/epub_image_filters_crop_split_double_page.go rename to pkg/epub/imagefilters/epub_image_filters_crop_split_double_page.go diff --git a/internal/epub/imagefilters/epub_image_filters_pixel.go b/pkg/epub/imagefilters/epub_image_filters_pixel.go similarity index 100% rename from internal/epub/imagefilters/epub_image_filters_pixel.go rename to pkg/epub/imagefilters/epub_image_filters_pixel.go diff --git a/internal/epub/imageprocessor/epub_image_processor.go b/pkg/epub/imageprocessor/epub_image_processor.go similarity index 95% rename from internal/epub/imageprocessor/epub_image_processor.go rename to pkg/epub/imageprocessor/epub_image_processor.go index f0fde37..4e18cd2 100644 --- a/internal/epub/imageprocessor/epub_image_processor.go +++ b/pkg/epub/imageprocessor/epub_image_processor.go @@ -11,11 +11,11 @@ import ( "os" "sync" - epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image" - epubimagefilters "github.com/celogeek/go-comic-converter/v2/internal/epub/imagefilters" - epuboptions "github.com/celogeek/go-comic-converter/v2/internal/epub/options" - epubprogress "github.com/celogeek/go-comic-converter/v2/internal/epub/progress" - epubzip "github.com/celogeek/go-comic-converter/v2/internal/epub/zip" + epubimage "github.com/celogeek/go-comic-converter/v2/pkg/epub/image" + epubimagefilters "github.com/celogeek/go-comic-converter/v2/pkg/epub/imagefilters" + epuboptions "github.com/celogeek/go-comic-converter/v2/pkg/epub/options" + epubprogress "github.com/celogeek/go-comic-converter/v2/pkg/epub/progress" + epubzip "github.com/celogeek/go-comic-converter/v2/pkg/epub/zip" "github.com/disintegration/gift" ) diff --git a/internal/epub/imageprocessor/epub_image_processor_loader.go b/pkg/epub/imageprocessor/epub_image_processor_loader.go similarity index 100% rename from internal/epub/imageprocessor/epub_image_processor_loader.go rename to pkg/epub/imageprocessor/epub_image_processor_loader.go diff --git a/internal/epub/options/epub_options.go b/pkg/epub/options/epub_options.go similarity index 100% rename from internal/epub/options/epub_options.go rename to pkg/epub/options/epub_options.go diff --git a/internal/epub/progress/epub_progress.go b/pkg/epub/progress/epub_progress.go similarity index 100% rename from internal/epub/progress/epub_progress.go rename to pkg/epub/progress/epub_progress.go diff --git a/internal/epub/progress/epub_progress_json.go b/pkg/epub/progress/epub_progress_json.go similarity index 100% rename from internal/epub/progress/epub_progress_json.go rename to pkg/epub/progress/epub_progress_json.go diff --git a/internal/epub/templates/epub_templates.go b/pkg/epub/templates/epub_templates.go similarity index 100% rename from internal/epub/templates/epub_templates.go rename to pkg/epub/templates/epub_templates.go diff --git a/internal/epub/templates/epub_templates_applebooks.xml.tmpl b/pkg/epub/templates/epub_templates_applebooks.xml.tmpl similarity index 100% rename from internal/epub/templates/epub_templates_applebooks.xml.tmpl rename to pkg/epub/templates/epub_templates_applebooks.xml.tmpl diff --git a/internal/epub/templates/epub_templates_blank.xhtml.tmpl b/pkg/epub/templates/epub_templates_blank.xhtml.tmpl similarity index 100% rename from internal/epub/templates/epub_templates_blank.xhtml.tmpl rename to pkg/epub/templates/epub_templates_blank.xhtml.tmpl diff --git a/internal/epub/templates/epub_templates_container.xml.tmpl b/pkg/epub/templates/epub_templates_container.xml.tmpl similarity index 100% rename from internal/epub/templates/epub_templates_container.xml.tmpl rename to pkg/epub/templates/epub_templates_container.xml.tmpl diff --git a/internal/epub/templates/epub_templates_content.go b/pkg/epub/templates/epub_templates_content.go similarity index 98% rename from internal/epub/templates/epub_templates_content.go rename to pkg/epub/templates/epub_templates_content.go index 2d6c267..c4ea5e8 100644 --- a/internal/epub/templates/epub_templates_content.go +++ b/pkg/epub/templates/epub_templates_content.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/beevik/etree" - epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image" - epuboptions "github.com/celogeek/go-comic-converter/v2/internal/epub/options" + epubimage "github.com/celogeek/go-comic-converter/v2/pkg/epub/image" + epuboptions "github.com/celogeek/go-comic-converter/v2/pkg/epub/options" ) type ContentOptions struct { diff --git a/internal/epub/templates/epub_templates_style.css.tmpl b/pkg/epub/templates/epub_templates_style.css.tmpl similarity index 100% rename from internal/epub/templates/epub_templates_style.css.tmpl rename to pkg/epub/templates/epub_templates_style.css.tmpl diff --git a/internal/epub/templates/epub_templates_text.xhtml.tmpl b/pkg/epub/templates/epub_templates_text.xhtml.tmpl similarity index 100% rename from internal/epub/templates/epub_templates_text.xhtml.tmpl rename to pkg/epub/templates/epub_templates_text.xhtml.tmpl diff --git a/internal/epub/templates/epub_templates_toc.go b/pkg/epub/templates/epub_templates_toc.go similarity index 96% rename from internal/epub/templates/epub_templates_toc.go rename to pkg/epub/templates/epub_templates_toc.go index 54966e2..eb6db26 100644 --- a/internal/epub/templates/epub_templates_toc.go +++ b/pkg/epub/templates/epub_templates_toc.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/beevik/etree" - epubimage "github.com/celogeek/go-comic-converter/v2/internal/epub/image" + epubimage "github.com/celogeek/go-comic-converter/v2/pkg/epub/image" ) // create toc diff --git a/internal/epub/tree/epub_tree.go b/pkg/epub/tree/epub_tree.go similarity index 100% rename from internal/epub/tree/epub_tree.go rename to pkg/epub/tree/epub_tree.go diff --git a/internal/epub/zip/epub_zip.go b/pkg/epub/zip/epub_zip.go similarity index 100% rename from internal/epub/zip/epub_zip.go rename to pkg/epub/zip/epub_zip.go diff --git a/internal/epub/zip/epub_zip_image.go b/pkg/epub/zip/epub_zip_image.go similarity index 100% rename from internal/epub/zip/epub_zip_image.go rename to pkg/epub/zip/epub_zip_image.go diff --git a/internal/epub/zip/epub_zip_storage_image.go b/pkg/epub/zip/epub_zip_storage_image.go similarity index 100% rename from internal/epub/zip/epub_zip_storage_image.go rename to pkg/epub/zip/epub_zip_storage_image.go