From 19bcc90ae9f4ed405c02c0ca0bd53bd95f4b0965 Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Tue, 11 Feb 2025 11:03:30 -0500
Subject: [PATCH] refactor: move internal/conf to cmd/joj3

---
 {internal => cmd/joj3}/conf/conf.go      |  0
 {internal => cmd/joj3}/conf/conf_test.go |  0
 {internal => cmd/joj3}/conf/model.go     |  0
 cmd/joj3/log.go                          |  2 +-
 cmd/joj3/main.go                         | 16 ++++++++--------
 cmd/joj3/stage/run.go                    |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename {internal => cmd/joj3}/conf/conf.go (100%)
 rename {internal => cmd/joj3}/conf/conf_test.go (100%)
 rename {internal => cmd/joj3}/conf/model.go (100%)

diff --git a/internal/conf/conf.go b/cmd/joj3/conf/conf.go
similarity index 100%
rename from internal/conf/conf.go
rename to cmd/joj3/conf/conf.go
diff --git a/internal/conf/conf_test.go b/cmd/joj3/conf/conf_test.go
similarity index 100%
rename from internal/conf/conf_test.go
rename to cmd/joj3/conf/conf_test.go
diff --git a/internal/conf/model.go b/cmd/joj3/conf/model.go
similarity index 100%
rename from internal/conf/model.go
rename to cmd/joj3/conf/model.go
diff --git a/cmd/joj3/log.go b/cmd/joj3/log.go
index c15a04e..387ac9c 100644
--- a/cmd/joj3/log.go
+++ b/cmd/joj3/log.go
@@ -7,8 +7,8 @@ import (
 	"log/slog"
 	"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/internal/conf"
 )
 
 var runningTest bool
diff --git a/cmd/joj3/main.go b/cmd/joj3/main.go
index ccd7ab3..b9a2f11 100644
--- a/cmd/joj3/main.go
+++ b/cmd/joj3/main.go
@@ -7,9 +7,9 @@ import (
 	"os"
 	"strings"
 
+	joj3Conf "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"
-	internalConf "github.com/joint-online-judge/JOJ3/internal/conf"
 	internalStage "github.com/joint-online-judge/JOJ3/internal/stage"
 )
 
@@ -31,7 +31,7 @@ func init() {
 }
 
 func mainImpl() (err error) {
-	conf := new(internalConf.Conf)
+	conf := new(joj3Conf.Conf)
 
 	logger := slog.New(slog.NewTextHandler(os.Stderr, nil))
 	slog.SetDefault(logger)
@@ -46,13 +46,13 @@ func mainImpl() (err error) {
 		fallbackConfFileName = confFileName
 	}
 	slog.Info("start joj3", "version", Version)
-	commitMsg, err := internalConf.GetCommitMsg()
+	commitMsg, err := joj3Conf.GetCommitMsg()
 	if err != nil {
 		slog.Error("get commit msg", "error", err)
 		return err
 	}
 	env.Attr.CommitMsg = commitMsg
-	confPath, confStat, conventionalCommit, err := internalConf.GetConfPath(
+	confPath, confStat, conventionalCommit, err := joj3Conf.GetConfPath(
 		confFileRoot, confFileName, fallbackConfFileName, commitMsg, tag,
 	)
 	if err != nil {
@@ -60,7 +60,7 @@ func mainImpl() (err error) {
 		return err
 	}
 	slog.Info("try to load conf", "path", confPath)
-	conf, err = internalConf.ParseConfFile(confPath)
+	conf, err = joj3Conf.ParseConfFile(confPath)
 	if err != nil {
 		slog.Error("parse conf", "error", err)
 		return err
@@ -74,20 +74,20 @@ func mainImpl() (err error) {
 	}
 
 	// log conf file info
-	confSHA256, err := internalConf.GetSHA256(confPath)
+	confSHA256, err := joj3Conf.GetSHA256(confPath)
 	if err != nil {
 		slog.Error("get sha256", "error", err)
 		return err
 	}
 	slog.Info("conf info", "sha256", confSHA256, "modTime", confStat.ModTime(),
 		"size", confStat.Size())
-	if err := internalConf.CheckExpire(conf); err != nil {
+	if err := joj3Conf.CheckExpire(conf); err != nil {
 		slog.Error("conf check expire", "error", err)
 		return err
 	}
 
 	// run stages
-	groups := internalConf.MatchGroups(conf, conventionalCommit)
+	groups := joj3Conf.MatchGroups(conf, conventionalCommit)
 	env.Attr.Groups = strings.Join(groups, ",")
 	env.Set()
 	_, forceQuitStageName, err := stage.Run(
diff --git a/cmd/joj3/stage/run.go b/cmd/joj3/stage/run.go
index de309b7..daa71f9 100644
--- a/cmd/joj3/stage/run.go
+++ b/cmd/joj3/stage/run.go
@@ -5,7 +5,7 @@ import (
 	"log/slog"
 	"strings"
 
-	"github.com/joint-online-judge/JOJ3/internal/conf"
+	"github.com/joint-online-judge/JOJ3/cmd/joj3/conf"
 	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"