From 62fffc86e9d0e291f50b65aa253ebf4a838a4446 Mon Sep 17 00:00:00 2001 From: eugene Date: Mon, 8 Sep 2025 21:37:35 +0300 Subject: [PATCH] package refactor --- Makefile | 0 README.md | 3 +-- cmd/tgs_file_convert/tgs_file_convert.go | 4 ++-- cmd/webm_file_convert/webm_file_convert.go | 4 ++-- internal/converter/tgs.go => tgs.go | 0 {internal/tgs => tgs}/service.go | 2 +- internal/converter/types.go => types.go | 0 internal/converter/webm.go => webm.go | 0 {internal/webm => webm}/ffmpeg.go | 2 +- {internal/webm => webm}/frame_scanner.go | 2 +- {internal/webm => webm}/service.go | 2 +- internal/converter/webp.go => webp.go | 0 {internal/wepb => webp}/service.go | 4 ++-- 13 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 Makefile rename internal/converter/tgs.go => tgs.go (100%) rename {internal/tgs => tgs}/service.go (98%) rename internal/converter/types.go => types.go (100%) rename internal/converter/webm.go => webm.go (100%) rename {internal/webm => webm}/ffmpeg.go (97%) rename {internal/webm => webm}/frame_scanner.go (97%) rename {internal/webm => webm}/service.go (95%) rename internal/converter/webp.go => webp.go (100%) rename {internal/wepb => webp}/service.go (89%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index 042480d..83fd15e 100644 --- a/README.md +++ b/README.md @@ -30,5 +30,4 @@ - WEBM → GIF - WEBM → PNG (first framge, all frames, N frame, frames range) - WEBM → JPEG (first framge, all frames, N frame, frames range) -- WEBM → WEBP (first framge, all frames, N frame, frames range) -- \ No newline at end of file +- WEBM → WEBP (first framge, all frames, N frame, frames range) \ No newline at end of file diff --git a/cmd/tgs_file_convert/tgs_file_convert.go b/cmd/tgs_file_convert/tgs_file_convert.go index 66b6d84..45eb087 100644 --- a/cmd/tgs_file_convert/tgs_file_convert.go +++ b/cmd/tgs_file_convert/tgs_file_convert.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" - "github.com/yazmeyaa/telegram_sticker_converter/internal/tgs" + converter "github.com/yazmeyaa/telegram_sticker_converter" + "github.com/yazmeyaa/telegram_sticker_converter/tgs" ) func main() { diff --git a/cmd/webm_file_convert/webm_file_convert.go b/cmd/webm_file_convert/webm_file_convert.go index 893832c..77f11da 100644 --- a/cmd/webm_file_convert/webm_file_convert.go +++ b/cmd/webm_file_convert/webm_file_convert.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" - "github.com/yazmeyaa/telegram_sticker_converter/internal/webm" + converter "github.com/yazmeyaa/telegram_sticker_converter" + "github.com/yazmeyaa/telegram_sticker_converter/webm" ) func main() { diff --git a/internal/converter/tgs.go b/tgs.go similarity index 100% rename from internal/converter/tgs.go rename to tgs.go diff --git a/internal/tgs/service.go b/tgs/service.go similarity index 98% rename from internal/tgs/service.go rename to tgs/service.go index cbddfb0..2d3cf29 100644 --- a/internal/tgs/service.go +++ b/tgs/service.go @@ -14,7 +14,7 @@ import ( "github.com/arugaz/go-rlottie" ffmpeg_go "github.com/u2takey/ffmpeg-go" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" + converter "github.com/yazmeyaa/telegram_sticker_converter" ) func (t tgsServiceImpl) Transform(ctx context.Context, in io.Reader, out io.Writer, opts converter.TGSTransformOptions) error { diff --git a/internal/converter/types.go b/types.go similarity index 100% rename from internal/converter/types.go rename to types.go diff --git a/internal/converter/webm.go b/webm.go similarity index 100% rename from internal/converter/webm.go rename to webm.go diff --git a/internal/webm/ffmpeg.go b/webm/ffmpeg.go similarity index 97% rename from internal/webm/ffmpeg.go rename to webm/ffmpeg.go index 58bee5d..331e4e1 100644 --- a/internal/webm/ffmpeg.go +++ b/webm/ffmpeg.go @@ -4,7 +4,7 @@ import ( "fmt" ffmpeg_go "github.com/u2takey/ffmpeg-go" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" + converter "github.com/yazmeyaa/telegram_sticker_converter" ) var ( diff --git a/internal/webm/frame_scanner.go b/webm/frame_scanner.go similarity index 97% rename from internal/webm/frame_scanner.go rename to webm/frame_scanner.go index 2da5c45..226753b 100644 --- a/internal/webm/frame_scanner.go +++ b/webm/frame_scanner.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" + converter "github.com/yazmeyaa/telegram_sticker_converter" ) type frameScanner struct { diff --git a/internal/webm/service.go b/webm/service.go similarity index 95% rename from internal/webm/service.go rename to webm/service.go index aee82a3..199889f 100644 --- a/internal/webm/service.go +++ b/webm/service.go @@ -8,7 +8,7 @@ import ( "io" ffmpeg_go "github.com/u2takey/ffmpeg-go" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" + converter "github.com/yazmeyaa/telegram_sticker_converter" ) type webmService struct{} diff --git a/internal/converter/webp.go b/webp.go similarity index 100% rename from internal/converter/webp.go rename to webp.go diff --git a/internal/wepb/service.go b/webp/service.go similarity index 89% rename from internal/wepb/service.go rename to webp/service.go index 2966aa9..6fc321f 100644 --- a/internal/wepb/service.go +++ b/webp/service.go @@ -1,4 +1,4 @@ -package wepb +package webp import ( "context" @@ -6,7 +6,7 @@ import ( "image/png" "io" - "github.com/yazmeyaa/telegram_sticker_converter/internal/converter" + converter "github.com/yazmeyaa/telegram_sticker_converter" "golang.org/x/image/webp" )