JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: dev #6

Closed
李衍志523370910113 wants to merge 131 commits from dev into master
pull from: dev
merge into: JOJ:master
Conversation 4 Commits 131 Files Changed 34 +14 -13
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fae6713210 - Show all commits

15
joj3_config_generator/convert.py
View File

@ -20,7 +20,7 @@ from joj3_config_generator.lib.task import (
)
from joj3_config_generator.models import joj1, repo, result, task
from joj3_config_generator.lib.repo import getHealthcheckConfig, getTeapotConfig
from joj3_config_generator.lib.task import fix_keyword
from joj3_config_generator.lib.task import fix_comment, fix_keyword
from joj3_config_generator.models import (
Cmd,
CmdFile,
@ -91,18 +91,7 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
if task_stage.result_detail is not None:
result_detail_parser.with_.update(task_stage.result_detail)
if "dummy" in task_stage.parsers:
dummy_parser = next(p for p in conf_stage.parsers if p.name == "dummy")
if task_stage.dummy is not None:
dummy_parser.with_.update(task_stage.dummy)
if "result-status" in task_stage.parsers:
result_status_parser = next(
p for p in conf_stage.parsers if p.name == "result-status"
)
if task_stage.result_status is not None:
result_status_parser.with_.update(task_stage.result_status)
conf_stage = fix_comment(task_stage, conf_stage)
conf_stage = fix_keyword(task_stage, conf_stage)
result_conf.stage.stages.append(conf_stage)

12
joj3_config_generator/lib/task.py
View File

@ -18,3 +18,15 @@ def fix_keyword(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
else:
continue
return conf_stage
def fix_comment(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage:
comment_parser = ["dummy", "result-status"]
for parser in task_stage.parsers:
if parser in comment_parser:
comment_parser_ = next(p for p in conf_stage.parsers if p.name == parser)
if getattr(task_stage, parser, None) is not None:
comment_parser_.with_.update(getattr(task_stage, parser))
else:
continue
return conf_stage