diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py index e6210df..bb5dfbb 100644 --- a/joj3_config_generator/convert.py +++ b/joj3_config_generator/convert.py @@ -71,6 +71,18 @@ 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) diff --git a/joj3_config_generator/lib/task.py b/joj3_config_generator/lib/task.py index 3b8208c..a5b0d36 100644 --- a/joj3_config_generator/lib/task.py +++ b/joj3_config_generator/lib/task.py @@ -25,8 +25,10 @@ def fix_comment(task_stage: TaskStage, conf_stage: ResultStage) -> ResultStage: 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)) + if getattr(task_stage, parser.replace("-", "_"), None) is not None: + comment_parser_.with_.update( + getattr(task_stage, parser.replace("-", "_")) + ) else: continue return conf_stage diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index dcf13ea..83c624a 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -18,7 +18,7 @@ "//repo-health-checker", + "0x7fbd328431a0>/repo-health-checker", "-root=.", "-repoSize=50.5", "-meta=main.py", @@ -71,8 +71,8 @@ "cpuRateLimit": 0, "cpuSetLimit": "", "copyIn": { - "//tmp/repo-checker-90ztqsoq/repo-health-checker": { - "src": "//tmp/repo-checker-41mcx5_x/repo-health-checker", + "//tmp/repo-checker-04l9les6/repo-health-checker": { + "src": "//tmp/repo-checker-_34sofm5/repo-health-checker", "content": null, "fileId": null, "name": null,