diff --git a/pkg/epub/epub.go b/pkg/epub/epub.go index 4a03125..47ea477 100644 --- a/pkg/epub/epub.go +++ b/pkg/epub/epub.go @@ -18,10 +18,10 @@ import ( 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/celogeek/go-comic-converter/v2/pkg/epubprogress" "github.com/gofrs/uuid" ) diff --git a/pkg/epub/image/epub_image.go b/pkg/epub/image/image.go similarity index 100% rename from pkg/epub/image/epub_image.go rename to pkg/epub/image/image.go diff --git a/pkg/epub/imagefilters/epub_image_filters_autocontrast.go b/pkg/epub/imagefilters/imagefilters_autocontrast.go similarity index 100% rename from pkg/epub/imagefilters/epub_image_filters_autocontrast.go rename to pkg/epub/imagefilters/imagefilters_autocontrast.go diff --git a/pkg/epub/imagefilters/epub_image_filters_autocrop.go b/pkg/epub/imagefilters/imagefilters_autocrop.go similarity index 100% rename from pkg/epub/imagefilters/epub_image_filters_autocrop.go rename to pkg/epub/imagefilters/imagefilters_autocrop.go diff --git a/pkg/epub/imagefilters/epub_image_filters_cover_title.go b/pkg/epub/imagefilters/imagefilters_cover_title.go similarity index 100% rename from pkg/epub/imagefilters/epub_image_filters_cover_title.go rename to pkg/epub/imagefilters/imagefilters_cover_title.go diff --git a/pkg/epub/imagefilters/epub_image_filters_crop_split_double_page.go b/pkg/epub/imagefilters/imagefilters_crop_split_double_page.go similarity index 100% rename from pkg/epub/imagefilters/epub_image_filters_crop_split_double_page.go rename to pkg/epub/imagefilters/imagefilters_crop_split_double_page.go diff --git a/pkg/epub/imagefilters/epub_image_filters_pixel.go b/pkg/epub/imagefilters/imagefilters_pixel.go similarity index 100% rename from pkg/epub/imagefilters/epub_image_filters_pixel.go rename to pkg/epub/imagefilters/imagefilters_pixel.go diff --git a/pkg/epub/imageprocessor/epub_image_processor.go b/pkg/epub/imageprocessor/imageprocessor.go similarity index 99% rename from pkg/epub/imageprocessor/epub_image_processor.go rename to pkg/epub/imageprocessor/imageprocessor.go index 4e18cd2..7160489 100644 --- a/pkg/epub/imageprocessor/epub_image_processor.go +++ b/pkg/epub/imageprocessor/imageprocessor.go @@ -14,8 +14,8 @@ import ( 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/celogeek/go-comic-converter/v2/pkg/epubprogress" "github.com/disintegration/gift" ) diff --git a/pkg/epub/imageprocessor/epub_image_processor_loader.go b/pkg/epub/imageprocessor/imageprocessor_loader.go similarity index 100% rename from pkg/epub/imageprocessor/epub_image_processor_loader.go rename to pkg/epub/imageprocessor/imageprocessor_loader.go diff --git a/pkg/epub/options/epub_options.go b/pkg/epub/options/options.go similarity index 100% rename from pkg/epub/options/epub_options.go rename to pkg/epub/options/options.go diff --git a/pkg/epub/progress/epub_progress.go b/pkg/epubprogress/epubprogress.go similarity index 94% rename from pkg/epub/progress/epub_progress.go rename to pkg/epubprogress/epubprogress.go index f664f72..6170dd4 100644 --- a/pkg/epub/progress/epub_progress.go +++ b/pkg/epubprogress/epubprogress.go @@ -20,12 +20,12 @@ type Options struct { TotalJob int } -type EpubProgress interface { +type epubProgress interface { Add(num int) error Close() error } -func New(o Options) EpubProgress { +func New(o Options) epubProgress { if o.Quiet { return progressbar.DefaultSilent(int64(o.Max)) } diff --git a/pkg/epub/progress/epub_progress_json.go b/pkg/epubprogress/epubprogress_json.go similarity index 71% rename from pkg/epub/progress/epub_progress_json.go rename to pkg/epubprogress/epubprogress_json.go index fc4a46c..3344958 100644 --- a/pkg/epub/progress/epub_progress_json.go +++ b/pkg/epubprogress/epubprogress_json.go @@ -5,20 +5,20 @@ import ( "os" ) -type EpubProgressJson struct { +type epubProgressJson struct { o Options e *json.Encoder current int } -func newEpubProgressJson(o Options) EpubProgress { - return &EpubProgressJson{ +func newEpubProgressJson(o Options) epubProgress { + return &epubProgressJson{ o: o, e: json.NewEncoder(os.Stdout), } } -func (p *EpubProgressJson) Add(num int) error { +func (p *epubProgressJson) Add(num int) error { p.current += num p.e.Encode(map[string]any{ "type": "progress", @@ -37,6 +37,6 @@ func (p *EpubProgressJson) Add(num int) error { return nil } -func (p *EpubProgressJson) Close() error { +func (p *epubProgressJson) Close() error { return nil }