From 4c840c40bbc8db9e011f8f84f86f31945957d6e6 Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 10 Oct 2025 22:54:29 +0300 Subject: [PATCH] some changes --- Makefile | 2 +- src/cmd/root.go | 6 +++--- src/cmd/run.go | 2 +- src/cmd/version.go | 2 +- go.mod => src/go.mod | 2 +- go.sum => src/go.sum | 0 src/hooks/initial.go | 14 ++++++------- src/hooks/run.go | 22 ++++++++++---------- src/internal/core/corestate/node_uuid.go | 4 ++-- src/internal/core/run_manager/run_manager.go | 2 +- src/internal/core/update/update.go | 8 +++---- src/internal/core/utils/uuid.go | 2 +- src/internal/engine/app/app.go | 4 ++-- src/internal/engine/config/print.go | 2 +- src/internal/engine/logs/logger.go | 2 +- src/internal/engine/lua/types.go | 6 +++--- src/internal/server/gateway/general_types.go | 8 +++---- src/internal/server/gateway/init.go | 6 +++--- src/internal/server/gateway/route.go | 4 ++-- src/internal/server/rpc/responsers.go | 2 +- src/internal/server/sv1/handle.go | 2 +- src/internal/server/sv1/lua_handler.go | 4 ++-- src/internal/server/sv1/path.go | 2 +- src/internal/server/sv1/server.go | 4 ++-- src/main.go | 2 +- 25 files changed, 57 insertions(+), 57 deletions(-) rename go.mod => src/go.mod (97%) rename go.sum => src/go.sum (100%) diff --git a/Makefile b/Makefile index 14ac7a2..ff39acc 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ build: @echo "Building..." @# @echo "CGO_CFLAGS is: '$(CGO_CFLAGS)'" @# @echo "CGO_LDFLAGS is: '$(CGO_LDFLAGS)'" - @# CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" + @# CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" @go build -trimpath -ldflags "-w -s $(LDFLAGS)" -o $(BIN_DIR)/$(APP_NAME) ./ # @if ! command -v upx >/dev/null 2>&1; then \ # echo "upx not found, skipping compression."; \ diff --git a/src/cmd/root.go b/src/cmd/root.go index cec01c4..5c7bf49 100644 --- a/src/cmd/root.go +++ b/src/cmd/root.go @@ -7,9 +7,9 @@ import ( "log" "os" - "github.com/akyaiy/GoSally-mvp/hooks" - "github.com/akyaiy/GoSally-mvp/internal/colors" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/hooks" + "github.com/akyaiy/GoSally-mvp/src/internal/colors" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" "github.com/spf13/cobra" ) diff --git a/src/cmd/run.go b/src/cmd/run.go index 6f096c6..bad909c 100644 --- a/src/cmd/run.go +++ b/src/cmd/run.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/akyaiy/GoSally-mvp/hooks" + "github.com/akyaiy/GoSally-mvp/src/hooks" "github.com/spf13/cobra" ) diff --git a/src/cmd/version.go b/src/cmd/version.go index f0db52e..124715b 100644 --- a/src/cmd/version.go +++ b/src/cmd/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" "github.com/spf13/cobra" ) diff --git a/go.mod b/src/go.mod similarity index 97% rename from go.mod rename to src/go.mod index b50e320..40fbb48 100644 --- a/go.mod +++ b/src/go.mod @@ -1,4 +1,4 @@ -module github.com/akyaiy/GoSally-mvp +module github.com/akyaiy/GoSally-mvp/src go 1.24.4 diff --git a/go.sum b/src/go.sum similarity index 100% rename from go.sum rename to src/go.sum diff --git a/src/hooks/initial.go b/src/hooks/initial.go index c49a8e6..39488f9 100644 --- a/src/hooks/initial.go +++ b/src/hooks/initial.go @@ -18,13 +18,13 @@ import ( "syscall" "time" - "github.com/akyaiy/GoSally-mvp/internal/colors" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/core/run_manager" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" - "github.com/akyaiy/GoSally-mvp/internal/engine/logs" + "github.com/akyaiy/GoSally-mvp/src/internal/colors" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/logs" "gopkg.in/ini.v1" ) diff --git a/src/hooks/run.go b/src/hooks/run.go index 2e006fe..6245e19 100644 --- a/src/hooks/run.go +++ b/src/hooks/run.go @@ -11,17 +11,17 @@ import ( "regexp" "time" - "github.com/akyaiy/GoSally-mvp/internal/colors" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/core/run_manager" - "github.com/akyaiy/GoSally-mvp/internal/core/update" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" - "github.com/akyaiy/GoSally-mvp/internal/engine/logs" - "github.com/akyaiy/GoSally-mvp/internal/server/gateway" - "github.com/akyaiy/GoSally-mvp/internal/server/session" - "github.com/akyaiy/GoSally-mvp/internal/server/sv1" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/colors" + "github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager" + "github.com/akyaiy/GoSally-mvp/src/internal/core/update" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/logs" + "github.com/akyaiy/GoSally-mvp/src/internal/server/gateway" + "github.com/akyaiy/GoSally-mvp/src/internal/server/session" + "github.com/akyaiy/GoSally-mvp/src/internal/server/sv1" "github.com/go-chi/chi/v5" "github.com/go-chi/cors" "github.com/spf13/cobra" diff --git a/src/internal/core/corestate/node_uuid.go b/src/internal/core/corestate/node_uuid.go index 6bfa0b6..294a49f 100644 --- a/src/internal/core/corestate/node_uuid.go +++ b/src/internal/core/corestate/node_uuid.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" ) // GetNodeUUID outputs the correct uuid from the file at the path specified in the arguments. diff --git a/src/internal/core/run_manager/run_manager.go b/src/internal/core/run_manager/run_manager.go index 80e725a..71817ac 100644 --- a/src/internal/core/run_manager/run_manager.go +++ b/src/internal/core/run_manager/run_manager.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" ) type RunManagerContract interface { diff --git a/src/internal/core/update/update.go b/src/internal/core/update/update.go index 06cd375..edf7ee4 100644 --- a/src/internal/core/update/update.go +++ b/src/internal/core/update/update.go @@ -13,10 +13,10 @@ import ( "strings" "syscall" - "github.com/akyaiy/GoSally-mvp/internal/core/run_manager" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/core/run_manager" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" "golang.org/x/net/context" ) diff --git a/src/internal/core/utils/uuid.go b/src/internal/core/utils/uuid.go index 0c8df35..0006c58 100644 --- a/src/internal/core/utils/uuid.go +++ b/src/internal/core/utils/uuid.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "errors" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" ) func NewUUIDRaw(length int) ([]byte, error) { diff --git a/src/internal/engine/app/app.go b/src/internal/engine/app/app.go index d5fe23c..d863b59 100644 --- a/src/internal/engine/app/app.go +++ b/src/internal/engine/app/app.go @@ -9,8 +9,8 @@ import ( "sync" "syscall" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" ) type AppContract interface { diff --git a/src/internal/engine/config/print.go b/src/internal/engine/config/print.go index 287bfa7..72feb9b 100644 --- a/src/internal/engine/config/print.go +++ b/src/internal/engine/config/print.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/akyaiy/GoSally-mvp/internal/colors" + "github.com/akyaiy/GoSally-mvp/src/internal/colors" ) func (c *Compositor) Print(v any) { diff --git a/src/internal/engine/logs/logger.go b/src/internal/engine/logs/logger.go index 66872f4..7e521a5 100644 --- a/src/internal/engine/logs/logger.go +++ b/src/internal/engine/logs/logger.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/akyaiy/GoSally-mvp/internal/engine/config" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/config" "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/src/internal/engine/lua/types.go b/src/internal/engine/lua/types.go index 72504e2..625b6f0 100644 --- a/src/internal/engine/lua/types.go +++ b/src/internal/engine/lua/types.go @@ -3,9 +3,9 @@ package lua import ( "net/http" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" ) type LuaEngineDeps struct { diff --git a/src/internal/server/gateway/general_types.go b/src/internal/server/gateway/general_types.go index f6dc796..7d610bc 100644 --- a/src/internal/server/gateway/general_types.go +++ b/src/internal/server/gateway/general_types.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" - "github.com/akyaiy/GoSally-mvp/internal/server/session" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/server/session" ) // serversApiVer is a type alias for string, used to represent API version strings in the GeneralServer. diff --git a/src/internal/server/gateway/init.go b/src/internal/server/gateway/init.go index 75005b4..f10b406 100644 --- a/src/internal/server/gateway/init.go +++ b/src/internal/server/gateway/init.go @@ -3,9 +3,9 @@ package gateway import ( "errors" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" - "github.com/akyaiy/GoSally-mvp/internal/server/session" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/server/session" ) // GeneralServerInit structure only for initialization general server. diff --git a/src/internal/server/gateway/route.go b/src/internal/server/gateway/route.go index e3c7efb..91b0744 100644 --- a/src/internal/server/gateway/route.go +++ b/src/internal/server/gateway/route.go @@ -8,8 +8,8 @@ import ( "net/http" "sync" - "github.com/akyaiy/GoSally-mvp/internal/core/utils" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/core/utils" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" "github.com/google/uuid" ) diff --git a/src/internal/server/rpc/responsers.go b/src/internal/server/rpc/responsers.go index d4deeb9..c83ac05 100644 --- a/src/internal/server/rpc/responsers.go +++ b/src/internal/server/rpc/responsers.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" "github.com/google/uuid" ) diff --git a/src/internal/server/sv1/handle.go b/src/internal/server/sv1/handle.go index fc26307..f6f642b 100644 --- a/src/internal/server/sv1/handle.go +++ b/src/internal/server/sv1/handle.go @@ -5,7 +5,7 @@ import ( "log/slog" "net/http" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" ) func (h *HandlerV1) Handle(_ context.Context, sid string, r *http.Request, req *rpc.RPCRequest) *rpc.RPCResponse { diff --git a/src/internal/server/sv1/lua_handler.go b/src/internal/server/sv1/lua_handler.go index 26defe5..58606f1 100644 --- a/src/internal/server/sv1/lua_handler.go +++ b/src/internal/server/sv1/lua_handler.go @@ -17,8 +17,8 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/akyaiy/GoSally-mvp/internal/colors" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/colors" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" lua "github.com/yuin/gopher-lua" _ "modernc.org/sqlite" ) diff --git a/src/internal/server/sv1/path.go b/src/internal/server/sv1/path.go index a58692a..6a7ea2a 100644 --- a/src/internal/server/sv1/path.go +++ b/src/internal/server/sv1/path.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/akyaiy/GoSally-mvp/internal/server/rpc" + "github.com/akyaiy/GoSally-mvp/src/internal/server/rpc" ) var RPCMethodSeparator = "." diff --git a/src/internal/server/sv1/server.go b/src/internal/server/sv1/server.go index e533b4e..2ea0aa8 100644 --- a/src/internal/server/sv1/server.go +++ b/src/internal/server/sv1/server.go @@ -5,8 +5,8 @@ package sv1 import ( "regexp" - "github.com/akyaiy/GoSally-mvp/internal/core/corestate" - "github.com/akyaiy/GoSally-mvp/internal/engine/app" + "github.com/akyaiy/GoSally-mvp/src/internal/core/corestate" + "github.com/akyaiy/GoSally-mvp/src/internal/engine/app" ) // HandlerV1InitStruct structure is only for initialization diff --git a/src/main.go b/src/main.go index f1e6c1e..0b1f26e 100644 --- a/src/main.go +++ b/src/main.go @@ -2,7 +2,7 @@ package main import ( - "github.com/akyaiy/GoSally-mvp/cmd" + "github.com/akyaiy/GoSally-mvp/src/cmd" _ "modernc.org/sqlite" )