JOJ/JOJ3
25
5
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: JOJ:31c310960ff478823500fb2b101a275657270477
Branches Tags
JOJ:master
..
compare: JOJ:2a3ccb71df70fe986c7995fd418a644dd0a9d18d
Branches Tags
JOJ:master

2 Commits
31c310960f ... 2a3ccb71df

Author SHA1 Message Date
张泊明518370910136
2a3ccb71df
refactor: move cmd/joj3/conf to internal/conf
Some checks failed
build / build (push) Failing after 4s
Details
build / trigger-build-image (push) Has been skipped
Details
submodules sync / sync (push) Successful in 31s
Details
2024-11-28 10:32:57 -05:00
张泊明518370910136
5236916858
refactor: conf with less import 2024-11-28 10:29:45 -05:00
7 changed files with 10 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
cmd/joj3/log.go
View File

@ -7,8 +7,8 @@ import (
"log/slog" "log/slog"
"os" "os"
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
"github.com/joint-online-judge/JOJ3/cmd/joj3/env" "github.com/joint-online-judge/JOJ3/cmd/joj3/env"
"github.com/joint-online-judge/JOJ3/internal/conf"
) )
var runningTest bool var runningTest bool

6
cmd/joj3/main.go
View File

@ -6,9 +6,10 @@ import (
"log/slog" "log/slog"
"os" "os"
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf" "github.com/joint-online-judge/JOJ3/cmd/joj3/env"
"github.com/joint-online-judge/JOJ3/cmd/joj3/stage" "github.com/joint-online-judge/JOJ3/cmd/joj3/stage"
"github.com/joint-online-judge/JOJ3/cmd/joj3/teapot" "github.com/joint-online-judge/JOJ3/cmd/joj3/teapot"
"github.com/joint-online-judge/JOJ3/internal/conf"
internalStage "github.com/joint-online-judge/JOJ3/internal/stage" internalStage "github.com/joint-online-judge/JOJ3/internal/stage"
) )
@ -85,11 +86,12 @@ func mainImpl() (err error) {
return err return err
} }
slog.Info("try to load conf", "path", confPath) slog.Info("try to load conf", "path", confPath)
confObj, err = conf.ParseConfFile(confPath) confObj, confName, err := conf.ParseConfFile(confPath)
if err != nil { if err != nil {
slog.Error("parse conf", "error", err) slog.Error("parse conf", "error", err)
return err return err
} }
env.Attr.ConfName = confName
slog.Debug("conf loaded", "conf", confObj) slog.Debug("conf loaded", "conf", confObj)
if err := setupSlog(confObj); err != nil { // after conf is loaded if err := setupSlog(confObj); err != nil { // after conf is loaded
slog.Error("setup slog", "error", err) slog.Error("setup slog", "error", err)

2
cmd/joj3/stage/run.go
View File

@ -5,8 +5,8 @@ import (
"log/slog" "log/slog"
"strings" "strings"
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
"github.com/joint-online-judge/JOJ3/cmd/joj3/teapot" "github.com/joint-online-judge/JOJ3/cmd/joj3/teapot"
"github.com/joint-online-judge/JOJ3/internal/conf"
executors "github.com/joint-online-judge/JOJ3/internal/executor" executors "github.com/joint-online-judge/JOJ3/internal/executor"
_ "github.com/joint-online-judge/JOJ3/internal/parser" _ "github.com/joint-online-judge/JOJ3/internal/parser"
"github.com/joint-online-judge/JOJ3/internal/stage" "github.com/joint-online-judge/JOJ3/internal/stage"

2
cmd/joj3/teapot/check.go
View File

@ -7,8 +7,8 @@ import (
"os" "os"
"strings" "strings"
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
"github.com/joint-online-judge/JOJ3/cmd/joj3/env" "github.com/joint-online-judge/JOJ3/cmd/joj3/env"
"github.com/joint-online-judge/JOJ3/internal/conf"
) )
type CheckResult struct { type CheckResult struct {

2
cmd/joj3/teapot/run.go
View File

@ -8,8 +8,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
"github.com/joint-online-judge/JOJ3/cmd/joj3/env" "github.com/joint-online-judge/JOJ3/cmd/joj3/env"
"github.com/joint-online-judge/JOJ3/internal/conf"
) )
type RunResult struct { type RunResult struct {

5
cmd/joj3/conf/conf.go → internal/conf/conf.go
View File

@ -14,7 +14,6 @@ import (
"time" "time"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/joint-online-judge/JOJ3/cmd/joj3/env"
"github.com/joint-online-judge/JOJ3/internal/stage" "github.com/joint-online-judge/JOJ3/internal/stage"
"github.com/koding/multiconfig" "github.com/koding/multiconfig"
) )
@ -165,7 +164,7 @@ func parseConventionalCommit(commit string) (*ConventionalCommit, error) {
return cc, nil return cc, nil
} }
func ParseConfFile(path string) (conf *Conf, err error) { func ParseConfFile(path string) (conf *Conf, name string, err error) {
conf = new(Conf) conf = new(Conf)
d := &multiconfig.DefaultLoader{} d := &multiconfig.DefaultLoader{}
d.Loader = multiconfig.MultiLoader( d.Loader = multiconfig.MultiLoader(
@ -181,7 +180,7 @@ func ParseConfFile(path string) (conf *Conf, err error) {
slog.Error("validate stages conf", "error", err) slog.Error("validate stages conf", "error", err)
return return
} }
env.Attr.ConfName = conf.Name name = conf.Name
// TODO: remove the following backward compatibility codes // TODO: remove the following backward compatibility codes
if conf.MaxTotalScore < 0 && conf.Teapot.MaxTotalScore >= 0 { if conf.MaxTotalScore < 0 && conf.Teapot.MaxTotalScore >= 0 {
conf.MaxTotalScore = conf.Teapot.MaxTotalScore conf.MaxTotalScore = conf.Teapot.MaxTotalScore

0
cmd/joj3/conf/conf_test.go → internal/conf/conf_test.go
View File