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

feat(parser): make stdout & stderr file in conf

Browse Source
This commit is contained in:
张泊明518370910136 2024-10-29 17:02:35 -04:00
parent d56e3e5ebc
commit cda3faeb9a
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/parser/clangtidy/parser.go
View File

@ -17,13 +17,15 @@ type Conf struct {
Score int `default:"100"` Score int `default:"100"`
RootDir string `default:"/w"` RootDir string `default:"/w"`
Matches []Match Matches []Match
Stdout string `default:"stdout"`
Stderr string `default:"stderr"`
} }
type ClangTidy struct{} type ClangTidy struct{}
func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult { func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult {
stdout := executorResult.Files["stdout"] stdout := executorResult.Files[conf.Stdout]
stderr := executorResult.Files["stderr"] stderr := executorResult.Files[conf.Stderr]
if executorResult.Status != stage.Status(envexec.StatusAccepted) { if executorResult.Status != stage.Status(envexec.StatusAccepted) {
if !((executorResult.Status == stage.Status(envexec.StatusNonzeroExitStatus)) && if !((executorResult.Status == stage.Status(envexec.StatusNonzeroExitStatus)) &&
(executorResult.ExitStatus == 1)) { (executorResult.ExitStatus == 1)) {

6
internal/parser/cppcheck/parser.go
View File

@ -19,6 +19,8 @@ type Match struct {
type Conf struct { type Conf struct {
Score int `default:"100"` Score int `default:"100"`
Matches []Match Matches []Match
Stdout string `default:"stdout"`
Stderr string `default:"stderr"`
} }
type Record struct { type Record struct {
@ -31,8 +33,8 @@ type Record struct {
} }
func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult { func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult {
// stdout := executorResult.Files["stdout"] // stdout := executorResult.Files[conf.Stdout]
stderr := executorResult.Files["stderr"] stderr := executorResult.Files[conf.Stderr]
if executorResult.Status != stage.Status(envexec.StatusAccepted) { if executorResult.Status != stage.Status(envexec.StatusAccepted) {
return stage.ParserResult{ return stage.ParserResult{

17
internal/parser/healthcheck/parser.go
View File

@ -9,9 +9,14 @@ import (
type Healthcheck struct{} type Healthcheck struct{}
func Parse(executorResult stage.ExecutorResult) (stage.ParserResult, bool) { type Conf struct {
stdout := executorResult.Files["stdout"] Stdout string `default:"stdout"`
stderr := executorResult.Files["stderr"] Stderr string `default:"stderr"`
}
func Parse(executorResult stage.ExecutorResult, conf Conf) (stage.ParserResult, bool) {
stdout := executorResult.Files[conf.Stdout]
stderr := executorResult.Files[conf.Stderr]
if executorResult.Status != stage.Status(envexec.StatusAccepted) { if executorResult.Status != stage.Status(envexec.StatusAccepted) {
return stage.ParserResult{ return stage.ParserResult{
Score: 0, Score: 0,
@ -30,10 +35,14 @@ func Parse(executorResult stage.ExecutorResult) (stage.ParserResult, bool) {
func (*Healthcheck) Run(results []stage.ExecutorResult, confAny any) ( func (*Healthcheck) Run(results []stage.ExecutorResult, confAny any) (
[]stage.ParserResult, bool, error, []stage.ParserResult, bool, error,
) { ) {
conf, err := stage.DecodeConf[Conf](confAny)
if err != nil {
return nil, true, err
}
var res []stage.ParserResult var res []stage.ParserResult
forceQuit := false forceQuit := false
for _, result := range results { for _, result := range results {
parserResult, forceQuitResult := Parse(result) parserResult, forceQuitResult := Parse(result, *conf)
res = append(res, parserResult) res = append(res, parserResult)
forceQuit = forceQuit || forceQuitResult forceQuit = forceQuit || forceQuitResult
} }

6
internal/parser/sample/parser.go
View File

@ -12,13 +12,15 @@ import (
type Conf struct { type Conf struct {
Score int Score int
Comment string Comment string
Stdout string `default:"stdout"`
Stderr string `default:"stderr"`
} }
type Sample struct{} type Sample struct{}
func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult { func Parse(executorResult stage.ExecutorResult, conf Conf) stage.ParserResult {
stdout := executorResult.Files["stdout"] stdout := executorResult.Files[conf.Stdout]
stderr := executorResult.Files["stderr"] stderr := executorResult.Files[conf.Stderr]
if executorResult.Status != stage.Status(envexec.StatusAccepted) { if executorResult.Status != stage.Status(envexec.StatusAccepted) {
return stage.ParserResult{ return stage.ParserResult{
Score: 0, Score: 0,