From 5bbbcb14aae72f97ec5e826c947a1a805276ca19 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Wed, 9 Oct 2024 05:38:30 -0400 Subject: [PATCH] refactor(internal): rename executor & parser dir --- cmd/joj3/stage/main.go | 4 ++-- internal/{executors => executor}/all.go | 4 ++-- .../{executors => executor}/dummy/executor.go | 0 internal/{executors => executor}/dummy/meta.go | 0 .../{executors => executor}/sandbox/convert.go | 0 .../{executors => executor}/sandbox/executor.go | 0 internal/{executors => executor}/sandbox/grpc.go | 0 internal/{executors => executor}/sandbox/meta.go | 0 internal/{executors => executor}/sandbox/util.go | 0 internal/parser/all.go | 16 ++++++++++++++++ .../{parsers => parser}/clangtidy/convert.go | 0 .../{parsers => parser}/clangtidy/formatter.go | 0 internal/{parsers => parser}/clangtidy/meta.go | 0 internal/{parsers => parser}/clangtidy/parser.go | 0 internal/{parsers => parser}/clangtidy/score.go | 0 internal/{parsers => parser}/cppcheck/meta.go | 0 internal/{parsers => parser}/cppcheck/parser.go | 0 internal/{parsers => parser}/cppcheck/score.go | 0 internal/{parsers => parser}/cpplint/meta.go | 0 internal/{parsers => parser}/cpplint/parser.go | 0 internal/{parsers => parser}/diff/meta.go | 0 internal/{parsers => parser}/diff/parser.go | 0 internal/{parsers => parser}/dummy/meta.go | 0 internal/{parsers => parser}/dummy/parser.go | 0 internal/{parsers => parser}/healthcheck/meta.go | 0 .../{parsers => parser}/healthcheck/parser.go | 0 internal/{parsers => parser}/keyword/meta.go | 0 internal/{parsers => parser}/keyword/parser.go | 0 .../{parsers => parser}/resultstatus/meta.go | 0 .../{parsers => parser}/resultstatus/parser.go | 0 internal/{parsers => parser}/sample/meta.go | 0 internal/{parsers => parser}/sample/parser.go | 0 internal/parsers/all.go | 16 ---------------- 33 files changed, 20 insertions(+), 20 deletions(-) rename internal/{executors => executor}/all.go (69%) rename internal/{executors => executor}/dummy/executor.go (100%) rename internal/{executors => executor}/dummy/meta.go (100%) rename internal/{executors => executor}/sandbox/convert.go (100%) rename internal/{executors => executor}/sandbox/executor.go (100%) rename internal/{executors => executor}/sandbox/grpc.go (100%) rename internal/{executors => executor}/sandbox/meta.go (100%) rename internal/{executors => executor}/sandbox/util.go (100%) create mode 100644 internal/parser/all.go rename internal/{parsers => parser}/clangtidy/convert.go (100%) rename internal/{parsers => parser}/clangtidy/formatter.go (100%) rename internal/{parsers => parser}/clangtidy/meta.go (100%) rename internal/{parsers => parser}/clangtidy/parser.go (100%) rename internal/{parsers => parser}/clangtidy/score.go (100%) rename internal/{parsers => parser}/cppcheck/meta.go (100%) rename internal/{parsers => parser}/cppcheck/parser.go (100%) rename internal/{parsers => parser}/cppcheck/score.go (100%) rename internal/{parsers => parser}/cpplint/meta.go (100%) rename internal/{parsers => parser}/cpplint/parser.go (100%) rename internal/{parsers => parser}/diff/meta.go (100%) rename internal/{parsers => parser}/diff/parser.go (100%) rename internal/{parsers => parser}/dummy/meta.go (100%) rename internal/{parsers => parser}/dummy/parser.go (100%) rename internal/{parsers => parser}/healthcheck/meta.go (100%) rename internal/{parsers => parser}/healthcheck/parser.go (100%) rename internal/{parsers => parser}/keyword/meta.go (100%) rename internal/{parsers => parser}/keyword/parser.go (100%) rename internal/{parsers => parser}/resultstatus/meta.go (100%) rename internal/{parsers => parser}/resultstatus/parser.go (100%) rename internal/{parsers => parser}/sample/meta.go (100%) rename internal/{parsers => parser}/sample/parser.go (100%) delete mode 100644 internal/parsers/all.go diff --git a/cmd/joj3/stage/main.go b/cmd/joj3/stage/main.go index 1f86c1b..8d88791 100644 --- a/cmd/joj3/stage/main.go +++ b/cmd/joj3/stage/main.go @@ -6,8 +6,8 @@ import ( "os" "github.com/joint-online-judge/JOJ3/cmd/joj3/conf" - "github.com/joint-online-judge/JOJ3/internal/executors" - _ "github.com/joint-online-judge/JOJ3/internal/parsers" + executors "github.com/joint-online-judge/JOJ3/internal/executor" + _ "github.com/joint-online-judge/JOJ3/internal/parser" "github.com/joint-online-judge/JOJ3/internal/stage" "github.com/jinzhu/copier" diff --git a/internal/executors/all.go b/internal/executor/all.go similarity index 69% rename from internal/executors/all.go rename to internal/executor/all.go index 6885d66..b0e5111 100644 --- a/internal/executors/all.go +++ b/internal/executor/all.go @@ -1,8 +1,8 @@ package executors import ( - _ "github.com/joint-online-judge/JOJ3/internal/executors/dummy" - "github.com/joint-online-judge/JOJ3/internal/executors/sandbox" + _ "github.com/joint-online-judge/JOJ3/internal/executor/dummy" + "github.com/joint-online-judge/JOJ3/internal/executor/sandbox" ) // this file does nothing but imports to ensure all the init() functions diff --git a/internal/executors/dummy/executor.go b/internal/executor/dummy/executor.go similarity index 100% rename from internal/executors/dummy/executor.go rename to internal/executor/dummy/executor.go diff --git a/internal/executors/dummy/meta.go b/internal/executor/dummy/meta.go similarity index 100% rename from internal/executors/dummy/meta.go rename to internal/executor/dummy/meta.go diff --git a/internal/executors/sandbox/convert.go b/internal/executor/sandbox/convert.go similarity index 100% rename from internal/executors/sandbox/convert.go rename to internal/executor/sandbox/convert.go diff --git a/internal/executors/sandbox/executor.go b/internal/executor/sandbox/executor.go similarity index 100% rename from internal/executors/sandbox/executor.go rename to internal/executor/sandbox/executor.go diff --git a/internal/executors/sandbox/grpc.go b/internal/executor/sandbox/grpc.go similarity index 100% rename from internal/executors/sandbox/grpc.go rename to internal/executor/sandbox/grpc.go diff --git a/internal/executors/sandbox/meta.go b/internal/executor/sandbox/meta.go similarity index 100% rename from internal/executors/sandbox/meta.go rename to internal/executor/sandbox/meta.go diff --git a/internal/executors/sandbox/util.go b/internal/executor/sandbox/util.go similarity index 100% rename from internal/executors/sandbox/util.go rename to internal/executor/sandbox/util.go diff --git a/internal/parser/all.go b/internal/parser/all.go new file mode 100644 index 0000000..8b74641 --- /dev/null +++ b/internal/parser/all.go @@ -0,0 +1,16 @@ +package parsers + +import ( + _ "github.com/joint-online-judge/JOJ3/internal/parser/clangtidy" + _ "github.com/joint-online-judge/JOJ3/internal/parser/cppcheck" + _ "github.com/joint-online-judge/JOJ3/internal/parser/cpplint" + _ "github.com/joint-online-judge/JOJ3/internal/parser/diff" + _ "github.com/joint-online-judge/JOJ3/internal/parser/dummy" + _ "github.com/joint-online-judge/JOJ3/internal/parser/healthcheck" + _ "github.com/joint-online-judge/JOJ3/internal/parser/keyword" + _ "github.com/joint-online-judge/JOJ3/internal/parser/resultstatus" + _ "github.com/joint-online-judge/JOJ3/internal/parser/sample" +) + +// this file does nothing but imports to ensure all the init() functions +// in the subpackages are called diff --git a/internal/parsers/clangtidy/convert.go b/internal/parser/clangtidy/convert.go similarity index 100% rename from internal/parsers/clangtidy/convert.go rename to internal/parser/clangtidy/convert.go diff --git a/internal/parsers/clangtidy/formatter.go b/internal/parser/clangtidy/formatter.go similarity index 100% rename from internal/parsers/clangtidy/formatter.go rename to internal/parser/clangtidy/formatter.go diff --git a/internal/parsers/clangtidy/meta.go b/internal/parser/clangtidy/meta.go similarity index 100% rename from internal/parsers/clangtidy/meta.go rename to internal/parser/clangtidy/meta.go diff --git a/internal/parsers/clangtidy/parser.go b/internal/parser/clangtidy/parser.go similarity index 100% rename from internal/parsers/clangtidy/parser.go rename to internal/parser/clangtidy/parser.go diff --git a/internal/parsers/clangtidy/score.go b/internal/parser/clangtidy/score.go similarity index 100% rename from internal/parsers/clangtidy/score.go rename to internal/parser/clangtidy/score.go diff --git a/internal/parsers/cppcheck/meta.go b/internal/parser/cppcheck/meta.go similarity index 100% rename from internal/parsers/cppcheck/meta.go rename to internal/parser/cppcheck/meta.go diff --git a/internal/parsers/cppcheck/parser.go b/internal/parser/cppcheck/parser.go similarity index 100% rename from internal/parsers/cppcheck/parser.go rename to internal/parser/cppcheck/parser.go diff --git a/internal/parsers/cppcheck/score.go b/internal/parser/cppcheck/score.go similarity index 100% rename from internal/parsers/cppcheck/score.go rename to internal/parser/cppcheck/score.go diff --git a/internal/parsers/cpplint/meta.go b/internal/parser/cpplint/meta.go similarity index 100% rename from internal/parsers/cpplint/meta.go rename to internal/parser/cpplint/meta.go diff --git a/internal/parsers/cpplint/parser.go b/internal/parser/cpplint/parser.go similarity index 100% rename from internal/parsers/cpplint/parser.go rename to internal/parser/cpplint/parser.go diff --git a/internal/parsers/diff/meta.go b/internal/parser/diff/meta.go similarity index 100% rename from internal/parsers/diff/meta.go rename to internal/parser/diff/meta.go diff --git a/internal/parsers/diff/parser.go b/internal/parser/diff/parser.go similarity index 100% rename from internal/parsers/diff/parser.go rename to internal/parser/diff/parser.go diff --git a/internal/parsers/dummy/meta.go b/internal/parser/dummy/meta.go similarity index 100% rename from internal/parsers/dummy/meta.go rename to internal/parser/dummy/meta.go diff --git a/internal/parsers/dummy/parser.go b/internal/parser/dummy/parser.go similarity index 100% rename from internal/parsers/dummy/parser.go rename to internal/parser/dummy/parser.go diff --git a/internal/parsers/healthcheck/meta.go b/internal/parser/healthcheck/meta.go similarity index 100% rename from internal/parsers/healthcheck/meta.go rename to internal/parser/healthcheck/meta.go diff --git a/internal/parsers/healthcheck/parser.go b/internal/parser/healthcheck/parser.go similarity index 100% rename from internal/parsers/healthcheck/parser.go rename to internal/parser/healthcheck/parser.go diff --git a/internal/parsers/keyword/meta.go b/internal/parser/keyword/meta.go similarity index 100% rename from internal/parsers/keyword/meta.go rename to internal/parser/keyword/meta.go diff --git a/internal/parsers/keyword/parser.go b/internal/parser/keyword/parser.go similarity index 100% rename from internal/parsers/keyword/parser.go rename to internal/parser/keyword/parser.go diff --git a/internal/parsers/resultstatus/meta.go b/internal/parser/resultstatus/meta.go similarity index 100% rename from internal/parsers/resultstatus/meta.go rename to internal/parser/resultstatus/meta.go diff --git a/internal/parsers/resultstatus/parser.go b/internal/parser/resultstatus/parser.go similarity index 100% rename from internal/parsers/resultstatus/parser.go rename to internal/parser/resultstatus/parser.go diff --git a/internal/parsers/sample/meta.go b/internal/parser/sample/meta.go similarity index 100% rename from internal/parsers/sample/meta.go rename to internal/parser/sample/meta.go diff --git a/internal/parsers/sample/parser.go b/internal/parser/sample/parser.go similarity index 100% rename from internal/parsers/sample/parser.go rename to internal/parser/sample/parser.go diff --git a/internal/parsers/all.go b/internal/parsers/all.go deleted file mode 100644 index e8bb941..0000000 --- a/internal/parsers/all.go +++ /dev/null @@ -1,16 +0,0 @@ -package parsers - -import ( - _ "github.com/joint-online-judge/JOJ3/internal/parsers/clangtidy" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/cppcheck" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/cpplint" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/diff" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/dummy" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/healthcheck" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/keyword" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/resultstatus" - _ "github.com/joint-online-judge/JOJ3/internal/parsers/sample" -) - -// this file does nothing but imports to ensure all the init() functions -// in the subpackages are called