diff --git a/cmd/main.go b/cmd/main.go index c8f6d07..90b8625 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -9,11 +9,11 @@ import ( "syscall" "time" - "github.com/teacinema/media-service/internal/config" - "github.com/teacinema/media-service/internal/infrastructure/grpc" - httpserver "github.com/teacinema/media-service/internal/infrastructure/http" - "github.com/teacinema/media-service/internal/infrastructure/storage" - "github.com/teacinema/media-service/pkg/logger" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/config" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/grpc" + httpserver "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/http" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" + "git.ksv741.keenetic.pro/teacinema/media-service/pkg/logger" ) func main() { diff --git a/go.mod b/go.mod index b84748a..abdf314 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,17 @@ -module github.com/teacinema/media-service +module git.ksv741.keenetic.pro/teacinema/media-service -go 1.24.0 - -toolchain go1.24.10 +go 1.26.1 require ( + git.ksv741.keenetic.pro/teacinema/contracts v1.1.6 github.com/aws/aws-sdk-go-v2 v1.39.6 github.com/aws/aws-sdk-go-v2/config v1.31.17 github.com/aws/aws-sdk-go-v2/credentials v1.18.21 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.90.0 - github.com/disintegration/imaging v1.6.2 github.com/gabriel-vasile/mimetype v1.4.11 github.com/gin-gonic/gin v1.11.0 github.com/google/uuid v1.6.0 - github.com/kolesa-team/go-webp v1.0.5 - github.com/teacinema/contracts v1.0.2 google.golang.org/grpc v1.77.0 ) @@ -36,7 +32,6 @@ require ( github.com/aws/smithy-go v1.23.2 // indirect github.com/bytedance/sonic v1.14.0 // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect - github.com/chai2010/webp v1.4.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/gin-contrib/sse v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -58,7 +53,6 @@ require ( go.uber.org/mock v0.5.0 // indirect golang.org/x/arch v0.20.0 // indirect golang.org/x/crypto v0.43.0 // indirect - golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect golang.org/x/mod v0.28.0 // indirect golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect golang.org/x/sync v0.17.0 // indirect diff --git a/go.sum b/go.sum index 52a6c7b..d8e6505 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +git.ksv741.keenetic.pro/teacinema/contracts v1.1.6 h1:YSoe5Vr8k4e1l/F04+ZR+MTp8VgvmFIOrdT9pGYgQjE= +git.ksv741.keenetic.pro/teacinema/contracts v1.1.6/go.mod h1:LYN/7xC+yDgYeGrb/7WHe4cTcFgh2URovgHiOzyYe5g= github.com/aws/aws-sdk-go-v2 v1.39.6 h1:2JrPCVgWJm7bm83BDwY5z8ietmeJUbh3O2ACnn+Xsqk= github.com/aws/aws-sdk-go-v2 v1.39.6/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.3 h1:DHctwEM8P8iTXFxC/QK0MRjwEpWQeM9yzidCRjldUz0= @@ -40,15 +42,11 @@ github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQ github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/chai2010/webp v1.4.0 h1:6DA2pkkRUPnbOHvvsmGI3He1hBKf/bkRlniAiSGuEko= -github.com/chai2010/webp v1.4.0/go.mod h1:0XVwvZWdjjdxpUEIf7b9g9VkHFnInUSYujwqTLEuldU= github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= -github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik= github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= @@ -82,8 +80,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= -github.com/kolesa-team/go-webp v1.0.5 h1:GZQHJBaE8dsNKZltfwqsL0qVJ7vqHXsfA+4AHrQW3pE= -github.com/kolesa-team/go-webp v1.0.5/go.mod h1:QmJu0YHXT3ex+4SgUvs+a+1SFCDcCqyZg+LbIuNNTnE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= @@ -104,14 +100,11 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/teacinema/contracts v1.0.2 h1:ZA4CupsMjjjNQMrwSbGjtf9cWodDZgGHcmt0cRxlLto= -github.com/teacinema/contracts v1.0.2/go.mod h1:oYc1RkjWhR4czmX7uZt4GaP6C6omGyZEdTkuWV5OIf8= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= @@ -134,9 +127,6 @@ golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c= golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04= golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= -golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 h1:6/3JGEh1C88g7m+qzzTbl3A0FtsLguXieqofVLU/JAo= @@ -146,11 +136,8 @@ golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= diff --git a/internal/application/usecases/delete.go b/internal/application/usecases/delete.go index 0fb9c72..8a42fd4 100644 --- a/internal/application/usecases/delete.go +++ b/internal/application/usecases/delete.go @@ -3,8 +3,8 @@ package usecases import ( "context" - "github.com/teacinema/media-service/internal/application/dto" - "github.com/teacinema/media-service/internal/infrastructure/storage" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/dto" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" ) type DeleteUseCase struct { diff --git a/internal/application/usecases/fetch.go b/internal/application/usecases/fetch.go index c4000cd..53f0fce 100644 --- a/internal/application/usecases/fetch.go +++ b/internal/application/usecases/fetch.go @@ -3,8 +3,8 @@ package usecases import ( "context" - "github.com/teacinema/media-service/internal/application/dto" - "github.com/teacinema/media-service/internal/infrastructure/storage" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/dto" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" ) type GetUseCase struct { diff --git a/internal/application/usecases/upload.go b/internal/application/usecases/upload.go index 52657d9..6f30062 100644 --- a/internal/application/usecases/upload.go +++ b/internal/application/usecases/upload.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/teacinema/media-service/internal/application/dto" - "github.com/teacinema/media-service/internal/infrastructure/images" - "github.com/teacinema/media-service/internal/infrastructure/storage" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/dto" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/images" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" ) type UploadUseCase struct { diff --git a/internal/infrastructure/grpc/interceptor.go b/internal/infrastructure/grpc/interceptor.go index 587d47e..0c9b7fe 100644 --- a/internal/infrastructure/grpc/interceptor.go +++ b/internal/infrastructure/grpc/interceptor.go @@ -5,7 +5,7 @@ import ( "time" "github.com/google/uuid" - "github.com/teacinema/media-service/pkg/logger" + "git.ksv741.keenetic.pro/teacinema/media-service/pkg/logger" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/internal/infrastructure/grpc/server.go b/internal/infrastructure/grpc/server.go index ec516ec..b85bc39 100644 --- a/internal/infrastructure/grpc/server.go +++ b/internal/infrastructure/grpc/server.go @@ -4,13 +4,13 @@ import ( "fmt" "net" - pb "github.com/teacinema/contracts/gen/go/media" - "github.com/teacinema/media-service/internal/application/usecases" - "github.com/teacinema/media-service/internal/config" - "github.com/teacinema/media-service/internal/infrastructure/images" - "github.com/teacinema/media-service/internal/infrastructure/storage" - handler "github.com/teacinema/media-service/internal/interfaces/grpc" - "github.com/teacinema/media-service/pkg/logger" + pb "git.ksv741.keenetic.pro/teacinema/contracts/gen/go/media" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/usecases" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/config" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/images" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" + handler "git.ksv741.keenetic.pro/teacinema/media-service/internal/interfaces/grpc" + "git.ksv741.keenetic.pro/teacinema/media-service/pkg/logger" "google.golang.org/grpc" ) diff --git a/internal/infrastructure/http/server.go b/internal/infrastructure/http/server.go index be4c541..4077c23 100644 --- a/internal/infrastructure/http/server.go +++ b/internal/infrastructure/http/server.go @@ -8,10 +8,10 @@ import ( "github.com/gabriel-vasile/mimetype" "github.com/gin-gonic/gin" - "github.com/teacinema/media-service/internal/config" - "github.com/teacinema/media-service/internal/infrastructure/images" - "github.com/teacinema/media-service/internal/infrastructure/storage" - "github.com/teacinema/media-service/pkg/logger" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/config" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/images" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/infrastructure/storage" + "git.ksv741.keenetic.pro/teacinema/media-service/pkg/logger" ) type Server struct { diff --git a/internal/infrastructure/storage/s3.go b/internal/infrastructure/storage/s3.go index 1ff3d86..2846a16 100644 --- a/internal/infrastructure/storage/s3.go +++ b/internal/infrastructure/storage/s3.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go-v2/feature/s3/manager" "github.com/aws/aws-sdk-go-v2/service/s3" s3Types "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/teacinema/media-service/internal/config" - "github.com/teacinema/media-service/pkg/logger" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/config" + "git.ksv741.keenetic.pro/teacinema/media-service/pkg/logger" ) type S3Storage struct { diff --git a/internal/interfaces/grpc/media_handler.go b/internal/interfaces/grpc/media_handler.go index 6d34202..ccb68b7 100644 --- a/internal/interfaces/grpc/media_handler.go +++ b/internal/interfaces/grpc/media_handler.go @@ -4,9 +4,9 @@ import ( "bytes" "context" - pb "github.com/teacinema/contracts/gen/go/media" - "github.com/teacinema/media-service/internal/application/dto" - "github.com/teacinema/media-service/internal/application/usecases" + pb "git.ksv741.keenetic.pro/teacinema/contracts/gen/go/media" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/dto" + "git.ksv741.keenetic.pro/teacinema/media-service/internal/application/usecases" ) type MediaHandler struct { diff --git a/scripts/run_dev.sh b/scripts/run_dev.sh old mode 100644 new mode 100755