From c754877f7de9d0738ac5176ba8624748d8e1d682 Mon Sep 17 00:00:00 2001 From: Sky Johnson Date: Sat, 10 May 2025 13:02:09 -0500 Subject: [PATCH] remove core dir --- {core/http => http}/server.go | 14 +++++++------- {core/http => http}/utils.go | 2 +- main.go | 14 +++++++------- {core/routers => routers}/errors.go | 0 {core/routers => routers}/luaRouter.go | 0 {core/routers => routers}/staticRouter.go | 2 +- {core/runner => runner}/context.go | 0 {core/runner => runner}/crypto.go | 0 {core/runner => runner}/embed.go | 2 +- {core/runner => runner}/fs.go | 2 +- {core/runner => runner}/http.go | 2 +- {core/runner => runner}/lua/crypto.lua | 0 {core/runner => runner}/lua/fs.lua | 0 {core/runner => runner}/lua/json.lua | 0 {core/runner => runner}/lua/math.lua | 0 {core/runner => runner}/lua/sandbox.lua | 0 {core/runner => runner}/lua/sqlite.lua | 0 {core/runner => runner}/lua/string.lua | 0 {core/runner => runner}/lua/table.lua | 0 {core/runner => runner}/lua/time.lua | 0 {core/runner => runner}/lua/util.lua | 0 {core/runner => runner}/moduleLoader.go | 2 +- {core/runner => runner}/password.go | 0 {core/runner => runner}/response.go | 0 {core/runner => runner}/runner.go | 2 +- {core/runner => runner}/sandbox.go | 2 +- {core/runner => runner}/sqlite.go | 2 +- {core/runner => runner}/util.go | 0 {core/sessions => sessions}/manager.go | 0 {core/sessions => sessions}/session.go | 0 {core/utils => utils}/color/color.go | 0 {core/utils => utils}/config/config.go | 0 {core/utils => utils}/debug.go | 4 ++-- {core/utils => utils}/errorPages.go | 0 {core/utils => utils}/logger/logger.go | 0 {core/utils => utils}/metadata/metadata.go | 0 {core/watchers => watchers}/api.go | 6 +++--- {core/watchers => watchers}/dir.go | 2 +- {core/watchers => watchers}/manager.go | 2 +- 39 files changed, 30 insertions(+), 30 deletions(-) rename {core/http => http}/server.go (96%) rename {core/http => http}/utils.go (99%) rename {core/routers => routers}/errors.go (100%) rename {core/routers => routers}/luaRouter.go (100%) rename {core/routers => routers}/staticRouter.go (99%) rename {core/runner => runner}/context.go (100%) rename {core/runner => runner}/crypto.go (100%) rename {core/runner => runner}/embed.go (99%) rename {core/runner => runner}/fs.go (99%) rename {core/runner => runner}/http.go (99%) rename {core/runner => runner}/lua/crypto.lua (100%) rename {core/runner => runner}/lua/fs.lua (100%) rename {core/runner => runner}/lua/json.lua (100%) rename {core/runner => runner}/lua/math.lua (100%) rename {core/runner => runner}/lua/sandbox.lua (100%) rename {core/runner => runner}/lua/sqlite.lua (100%) rename {core/runner => runner}/lua/string.lua (100%) rename {core/runner => runner}/lua/table.lua (100%) rename {core/runner => runner}/lua/time.lua (100%) rename {core/runner => runner}/lua/util.lua (100%) rename {core/runner => runner}/moduleLoader.go (99%) rename {core/runner => runner}/password.go (100%) rename {core/runner => runner}/response.go (100%) rename {core/runner => runner}/runner.go (99%) rename {core/runner => runner}/sandbox.go (99%) rename {core/runner => runner}/sqlite.go (99%) rename {core/runner => runner}/util.go (100%) rename {core/sessions => sessions}/manager.go (100%) rename {core/sessions => sessions}/session.go (100%) rename {core/utils => utils}/color/color.go (100%) rename {core/utils => utils}/config/config.go (100%) rename {core/utils => utils}/debug.go (99%) rename {core/utils => utils}/errorPages.go (100%) rename {core/utils => utils}/logger/logger.go (100%) rename {core/utils => utils}/metadata/metadata.go (100%) rename {core/watchers => watchers}/api.go (96%) rename {core/watchers => watchers}/dir.go (99%) rename {core/watchers => watchers}/manager.go (99%) diff --git a/core/http/server.go b/http/server.go similarity index 96% rename from core/http/server.go rename to http/server.go index d2b214a..6d7e14d 100644 --- a/core/http/server.go +++ b/http/server.go @@ -4,13 +4,13 @@ import ( "context" "time" - "Moonshark/core/routers" - "Moonshark/core/runner" - "Moonshark/core/sessions" - "Moonshark/core/utils" - "Moonshark/core/utils/config" - "Moonshark/core/utils/logger" - "Moonshark/core/utils/metadata" + "Moonshark/routers" + "Moonshark/runner" + "Moonshark/sessions" + "Moonshark/utils" + "Moonshark/utils/config" + "Moonshark/utils/logger" + "Moonshark/utils/metadata" "github.com/valyala/fasthttp" ) diff --git a/core/http/utils.go b/http/utils.go similarity index 99% rename from core/http/utils.go rename to http/utils.go index ac36b53..2618dad 100644 --- a/core/http/utils.go +++ b/http/utils.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" "github.com/valyala/fasthttp" ) diff --git a/main.go b/main.go index 6bd1612..0751d16 100644 --- a/main.go +++ b/main.go @@ -11,13 +11,13 @@ import ( "syscall" "time" - "Moonshark/core/http" - "Moonshark/core/routers" - "Moonshark/core/runner" - "Moonshark/core/sessions" - "Moonshark/core/utils/config" - "Moonshark/core/utils/logger" - "Moonshark/core/watchers" + "Moonshark/http" + "Moonshark/routers" + "Moonshark/runner" + "Moonshark/sessions" + "Moonshark/utils/config" + "Moonshark/utils/logger" + "Moonshark/watchers" ) // Moonshark represents the server and all its dependencies diff --git a/core/routers/errors.go b/routers/errors.go similarity index 100% rename from core/routers/errors.go rename to routers/errors.go diff --git a/core/routers/luaRouter.go b/routers/luaRouter.go similarity index 100% rename from core/routers/luaRouter.go rename to routers/luaRouter.go diff --git a/core/routers/staticRouter.go b/routers/staticRouter.go similarity index 99% rename from core/routers/staticRouter.go rename to routers/staticRouter.go index ce7187d..2075b5b 100644 --- a/core/routers/staticRouter.go +++ b/routers/staticRouter.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" "github.com/valyala/fasthttp" ) diff --git a/core/runner/context.go b/runner/context.go similarity index 100% rename from core/runner/context.go rename to runner/context.go diff --git a/core/runner/crypto.go b/runner/crypto.go similarity index 100% rename from core/runner/crypto.go rename to runner/crypto.go diff --git a/core/runner/embed.go b/runner/embed.go similarity index 99% rename from core/runner/embed.go rename to runner/embed.go index c4ab3ca..6824d62 100644 --- a/core/runner/embed.go +++ b/runner/embed.go @@ -5,7 +5,7 @@ import ( "sync" "sync/atomic" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/core/runner/fs.go b/runner/fs.go similarity index 99% rename from core/runner/fs.go rename to runner/fs.go index 25c3e55..906f425 100644 --- a/core/runner/fs.go +++ b/runner/fs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/core/runner/http.go b/runner/http.go similarity index 99% rename from core/runner/http.go rename to runner/http.go index 78a8ec9..43bc7a1 100644 --- a/core/runner/http.go +++ b/runner/http.go @@ -14,7 +14,7 @@ import ( "github.com/valyala/bytebufferpool" "github.com/valyala/fasthttp" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/core/runner/lua/crypto.lua b/runner/lua/crypto.lua similarity index 100% rename from core/runner/lua/crypto.lua rename to runner/lua/crypto.lua diff --git a/core/runner/lua/fs.lua b/runner/lua/fs.lua similarity index 100% rename from core/runner/lua/fs.lua rename to runner/lua/fs.lua diff --git a/core/runner/lua/json.lua b/runner/lua/json.lua similarity index 100% rename from core/runner/lua/json.lua rename to runner/lua/json.lua diff --git a/core/runner/lua/math.lua b/runner/lua/math.lua similarity index 100% rename from core/runner/lua/math.lua rename to runner/lua/math.lua diff --git a/core/runner/lua/sandbox.lua b/runner/lua/sandbox.lua similarity index 100% rename from core/runner/lua/sandbox.lua rename to runner/lua/sandbox.lua diff --git a/core/runner/lua/sqlite.lua b/runner/lua/sqlite.lua similarity index 100% rename from core/runner/lua/sqlite.lua rename to runner/lua/sqlite.lua diff --git a/core/runner/lua/string.lua b/runner/lua/string.lua similarity index 100% rename from core/runner/lua/string.lua rename to runner/lua/string.lua diff --git a/core/runner/lua/table.lua b/runner/lua/table.lua similarity index 100% rename from core/runner/lua/table.lua rename to runner/lua/table.lua diff --git a/core/runner/lua/time.lua b/runner/lua/time.lua similarity index 100% rename from core/runner/lua/time.lua rename to runner/lua/time.lua diff --git a/core/runner/lua/util.lua b/runner/lua/util.lua similarity index 100% rename from core/runner/lua/util.lua rename to runner/lua/util.lua diff --git a/core/runner/moduleLoader.go b/runner/moduleLoader.go similarity index 99% rename from core/runner/moduleLoader.go rename to runner/moduleLoader.go index 7d0496c..e1ef921 100644 --- a/core/runner/moduleLoader.go +++ b/runner/moduleLoader.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" luajit "git.sharkk.net/Sky/LuaJIT-to-Go" ) diff --git a/core/runner/password.go b/runner/password.go similarity index 100% rename from core/runner/password.go rename to runner/password.go diff --git a/core/runner/response.go b/runner/response.go similarity index 100% rename from core/runner/response.go rename to runner/response.go diff --git a/core/runner/runner.go b/runner/runner.go similarity index 99% rename from core/runner/runner.go rename to runner/runner.go index 997a54a..ba84bce 100644 --- a/core/runner/runner.go +++ b/runner/runner.go @@ -1,7 +1,7 @@ package runner import ( - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" "context" "errors" "fmt" diff --git a/core/runner/sandbox.go b/runner/sandbox.go similarity index 99% rename from core/runner/sandbox.go rename to runner/sandbox.go index 2997ac6..b9b374c 100644 --- a/core/runner/sandbox.go +++ b/runner/sandbox.go @@ -7,7 +7,7 @@ import ( "github.com/goccy/go-json" "github.com/valyala/fasthttp" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" "maps" diff --git a/core/runner/sqlite.go b/runner/sqlite.go similarity index 99% rename from core/runner/sqlite.go rename to runner/sqlite.go index 4d1879f..a93db12 100644 --- a/core/runner/sqlite.go +++ b/runner/sqlite.go @@ -11,7 +11,7 @@ import ( sqlite "zombiezen.com/go/sqlite" "zombiezen.com/go/sqlite/sqlitex" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" "maps" diff --git a/core/runner/util.go b/runner/util.go similarity index 100% rename from core/runner/util.go rename to runner/util.go diff --git a/core/sessions/manager.go b/sessions/manager.go similarity index 100% rename from core/sessions/manager.go rename to sessions/manager.go diff --git a/core/sessions/session.go b/sessions/session.go similarity index 100% rename from core/sessions/session.go rename to sessions/session.go diff --git a/core/utils/color/color.go b/utils/color/color.go similarity index 100% rename from core/utils/color/color.go rename to utils/color/color.go diff --git a/core/utils/config/config.go b/utils/config/config.go similarity index 100% rename from core/utils/config/config.go rename to utils/config/config.go diff --git a/core/utils/debug.go b/utils/debug.go similarity index 99% rename from core/utils/debug.go rename to utils/debug.go index 10bc085..0f12e91 100644 --- a/core/utils/debug.go +++ b/utils/debug.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "Moonshark/core/utils/config" - "Moonshark/core/utils/metadata" + "Moonshark/utils/config" + "Moonshark/utils/metadata" ) // ComponentStats holds stats from various system components diff --git a/core/utils/errorPages.go b/utils/errorPages.go similarity index 100% rename from core/utils/errorPages.go rename to utils/errorPages.go diff --git a/core/utils/logger/logger.go b/utils/logger/logger.go similarity index 100% rename from core/utils/logger/logger.go rename to utils/logger/logger.go diff --git a/core/utils/metadata/metadata.go b/utils/metadata/metadata.go similarity index 100% rename from core/utils/metadata/metadata.go rename to utils/metadata/metadata.go diff --git a/core/watchers/api.go b/watchers/api.go similarity index 96% rename from core/watchers/api.go rename to watchers/api.go index 958cc78..19ff086 100644 --- a/core/watchers/api.go +++ b/watchers/api.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "Moonshark/core/routers" - "Moonshark/core/runner" - "Moonshark/core/utils/logger" + "Moonshark/routers" + "Moonshark/runner" + "Moonshark/utils/logger" ) // Global watcher manager instance with explicit creation diff --git a/core/watchers/dir.go b/watchers/dir.go similarity index 99% rename from core/watchers/dir.go rename to watchers/dir.go index b4e8d4c..182d6b5 100644 --- a/core/watchers/dir.go +++ b/watchers/dir.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" ) // Default debounce time between detected change and callback diff --git a/core/watchers/manager.go b/watchers/manager.go similarity index 99% rename from core/watchers/manager.go rename to watchers/manager.go index 87b6356..635008c 100644 --- a/core/watchers/manager.go +++ b/watchers/manager.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "Moonshark/core/utils/logger" + "Moonshark/utils/logger" ) // DefaultPollInterval is the time between directory checks