Add language-level config (#233)

chaemon · web-flow · commit f7a4121c2b55 · 2021-06-20T03:38:29.000+09:00
* 言語別configを追加

* 整形

* testを追加

* set[ConfigType]はtest通らないらしい
diff --git a/README.md b/README.md
@@ -218,15 +218,18 @@ optional arguments:
 - `code_generator_file="~/custom_code_generator.py"` カスタムコードジェネレーター `~/custom_code_generator.py`を指定する
 - `exec_on_each_problem_dir='clang-format -i ./*.cpp'` `exec_on_contest_dir='touch CMakeLists.txt'`
     - 問題用ディレクトリ内で毎回`clang-format`を実行して、最後に`CMakeLists.txt`(空)をコンテスト用ディレクトリに生成する
+
+- `compile_before_testing` テスト前にコンパイルを実行するか否かをTrue/Falseで指定。何も指定しないとFalseとなります。
+- `compile_only_when_diff_detected` テスト前のコンパイルの際、元のソースに変更があった場合のみ実行するかをTrue/Falseで指定。何も指定しないとFalseとなります。
+
+なお、`compile_before_testing`, `compile_only_when_diff_detected`はいずれもtesterの引数で指定することも可能で、指定した場合はそちらが優先されます。
+
 - `download_without_login=false` AtCoderにログインせずにダウンロードを行う機能を使わない (公開コンテストに対してのみ可能)
 - `parallel_download=false` データの並列ダウンロードを無効にする
 - `save_no_session_cache=false` ログイン情報のクッキーを保存する
 - `skip_existing_problems=false` ディレクトリが既に存在する問題の処理をスキップする
 - `in_example_format="in_{}.txt"` テストケース(input)のフォーマットを`in_1.txt, in_2.txt, ...`とする
 - `out_example_format="out_{}.txt"` テストケース(output)のフォーマットを`out_1.txt, out_2.txt, ...`とする
-- `compile_before_testing` テスト前にコンパイルを実行するか否かをTrue/Falseで指定。何も指定しないとFalseとなります。
-- `compile_only_when_diff_detected` テスト前のコンパイルの際、元のソースに変更があった場合のみ実行するかをTrue/Falseで指定。何も指定しないとFalseとなります。
-
 
 ```toml
 [codestyle]
@@ -239,7 +242,9 @@ code_generator_file="~/custom_code_generator.py"
 [postprocess]
 exec_on_each_problem_dir='clang-format -i ./*.cpp'
 exec_on_contest_dir='touch CMakeLists.txt'
-
+[tester]
+compile_before_testing=true
+compile_only_when_diff_detected=true
 [etc]
 download_without_login=false
 parallel_download=false
diff --git a/atcodertools/atcoder_tools.py b/atcodertools/atcoder_tools.py
@@ -42,6 +42,8 @@ def main():
     if len(sys.argv) < 2 or sys.argv[1] not in ("gen", "test", "submit", "codegen", "compile", "version"):
         print("Usage:")
         print("{} gen -- to generate workspace".format(sys.argv[0]))
+        print(
+            "{} compile -- to compile codes in your workspace".format(sys.argv[0]))
         print("{} test -- to test codes in your workspace".format(sys.argv[0]))
         print(
             "{} submit -- to submit a code to the contest system".format(sys.argv[0]))
diff --git a/atcodertools/common/language.py b/atcodertools/common/language.py
@@ -51,8 +51,10 @@ def source_code_name(self, name_without_extension: str) -> str:
         # put extension to the name
         return "{}.{}".format(name_without_extension, self.extension)
 
-    def get_compile_command(self, filename: str):
-        return self.compile_command.format(filename=filename)
+    def get_compile_command(self, filename: str, base_command: str = None):
+        if base_command is None:
+            base_command = self.compile_command
+        return base_command.format(filename=filename)
 
     def get_code_filename(self, filename: str):
         return self.code_filename.format(filename=filename)
diff --git a/atcodertools/config/config.py b/atcodertools/config/config.py
@@ -1,11 +1,20 @@
 from argparse import Namespace
 from typing import TextIO, Dict, Any, Optional
+from enum import Enum
 
 import toml
 
 from atcodertools.codegen.code_style_config import CodeStyleConfig
 from atcodertools.config.etc_config import EtcConfig
 from atcodertools.config.postprocess_config import PostprocessConfig
+from atcodertools.config.tester_config import TesterConfig
+
+
+class ConfigType(Enum):
+    CODESTYLE = "codestyle"
+    POSTPROCESS = "postprocess"
+    TESTER = "tester"
+    ETC = "etc"
 
 
 def _update_config_dict(target_dic: Dict[str, Any], update_dic: Dict[str, Any]):
@@ -15,45 +24,82 @@ def _update_config_dict(target_dic: Dict[str, Any], update_dic: Dict[str, Any]):
     }
 
 
+def get_config_dic(config_dic, config_type: ConfigType, lang=None):
+    result = dict()
+    d = config_dic.get(config_type.value, {})
+    lang_dic = {}
+    for k, v in d.items():
+        if type(v) is dict:
+            if k == lang:
+                lang_dic = v
+        else:
+            result[k] = v
+    result = _update_config_dict(result, lang_dic)
+    return result
+
+
 class Config:
 
     def __init__(self,
                  code_style_config: CodeStyleConfig = CodeStyleConfig(),
                  postprocess_config: PostprocessConfig = PostprocessConfig(),
+                 tester_config: TesterConfig = TesterConfig(),
                  etc_config: EtcConfig = EtcConfig()
                  ):
         self.code_style_config = code_style_config
         self.postprocess_config = postprocess_config
+        self.tester_config = tester_config
         self.etc_config = etc_config
 
     @classmethod
-    def load(cls, fp: TextIO, args: Optional[Namespace] = None):
+    def load(cls, fp: TextIO, get_config_type, args: Optional[Namespace] = None, lang=None):
         """
         :param fp: .toml file's file pointer
         :param args: command line arguments
         :return: Config instance
         """
         config_dic = toml.load(fp)
 
-        code_style_config_dic = config_dic.get('codestyle', {})
-        postprocess_config_dic = config_dic.get('postprocess', {})
-        etc_config_dic = config_dic.get('etc', {})
-
-        if args:
-            code_style_config_dic = _update_config_dict(code_style_config_dic,
-                                                        dict(
-                                                            template_file=args.template,
-                                                            workspace_dir=args.workspace,
-                                                            lang=args.lang))
-            etc_config_dic = _update_config_dict(etc_config_dic,
-                                                 dict(
-                                                     download_without_login=args.without_login,
-                                                     parallel_download=args.parallel,
-                                                     save_no_session_cache=args.save_no_session_cache,
-                                                     skip_existing_problems=args.skip_existing_problems))
-
-        return Config(
-            code_style_config=CodeStyleConfig(**code_style_config_dic),
-            postprocess_config=PostprocessConfig(**postprocess_config_dic),
-            etc_config=EtcConfig(**etc_config_dic)
-        )
+        result = Config()
+        if not lang:
+            if args and args.lang:
+                lang = args.lang
+            elif "codestyle" in config_dic:
+                lang = config_dic["codestyle"].get("lang", None)
+
+        if ConfigType.CODESTYLE in get_config_type:
+            code_style_config_dic = get_config_dic(
+                config_dic, ConfigType.CODESTYLE, lang)
+            if args:
+                code_style_config_dic = _update_config_dict(code_style_config_dic,
+                                                            dict(
+                                                                template_file=args.template,
+                                                                workspace_dir=args.workspace,
+                                                                lang=lang))
+            result.code_style_config = CodeStyleConfig(**code_style_config_dic)
+        if ConfigType.POSTPROCESS in get_config_type:
+            postprocess_config_dic = get_config_dic(
+                config_dic, ConfigType.POSTPROCESS)
+            result.postprocess_config = PostprocessConfig(
+                **postprocess_config_dic)
+        if ConfigType.TESTER in get_config_type:
+            tester_config_dic = get_config_dic(
+                config_dic, ConfigType.TESTER, lang)
+            if args:
+                tester_config_dic = _update_config_dict(tester_config_dic,
+                                                        dict(compile_before_testing=args.compile_before_testing,
+                                                             compile_only_when_diff_detected=args.compile_only_when_diff_detected,
+                                                             compile_command=args.compile_command))
+            result.tester_config = TesterConfig(**tester_config_dic)
+        if ConfigType.ETC in get_config_type:
+            etc_config_dic = get_config_dic(config_dic, ConfigType.ETC)
+            if args:
+                etc_config_dic = _update_config_dict(etc_config_dic,
+                                                     dict(
+                                                         download_without_login=args.without_login,
+                                                         parallel_download=args.parallel,
+                                                         save_no_session_cache=args.save_no_session_cache,
+                                                         skip_existing_problems=args.skip_existing_problems))
+            result.etc_config = EtcConfig(**etc_config_dic)
+
+        return result
diff --git a/atcodertools/config/etc_config.py b/atcodertools/config/etc_config.py
@@ -6,15 +6,11 @@ def __init__(self,
                  save_no_session_cache: bool = False,
                  skip_existing_problems: bool = False,
                  in_example_format: str = "in_{}.txt",
-                 out_example_format: str = "out_{}.txt",
-                 compile_before_testing: bool = False,
-                 compile_only_when_diff_detected: bool = False
+                 out_example_format: str = "out_{}.txt"
                  ):
         self.download_without_login = download_without_login
         self.parallel_download = parallel_download
         self.save_no_session_cache = save_no_session_cache
         self.skip_existing_problems = skip_existing_problems
         self.in_example_format = in_example_format
         self.out_example_format = out_example_format
-        self.compile_before_testing = compile_before_testing
-        self.compile_only_when_diff_detected = compile_only_when_diff_detected
diff --git a/atcodertools/config/tester_config.py b/atcodertools/config/tester_config.py
@@ -0,0 +1,12 @@
+class TesterConfig:
+
+    def __init__(self,
+                 compile_before_testing: bool = False,
+                 compile_only_when_diff_detected: bool = False,
+                 compile_command: str = None,
+                 run_command: str = None
+                 ):
+        self.compile_before_testing = compile_before_testing
+        self.compile_only_when_diff_detected = compile_only_when_diff_detected
+        self.compile_command = compile_command
+        self.run_command = run_command
diff --git a/atcodertools/tools/compiler.py b/atcodertools/tools/compiler.py
@@ -32,6 +32,7 @@ def compile_main_and_judge_programs(lang: Language, cwd="./", force_compile=Fals
     print("[Main Program]")
     if compile_command is None:
         compile_command = lang.get_compile_command('main')
+    print("compile command: ", compile_command)
     code_filename = lang.get_code_filename('main')
     exec_filename = lang.get_exec_filename('main')
 
diff --git a/atcodertools/tools/envgen.py b/atcodertools/tools/envgen.py
@@ -28,6 +28,7 @@
 from atcodertools.tools import get_default_config_path
 from atcodertools.tools.models.metadata import Metadata
 from atcodertools.tools.utils import with_color
+from atcodertools.config.config import ConfigType
 
 
 class BannedFileDetectedError(Exception):
@@ -225,7 +226,7 @@ def get_config(args: argparse.Namespace) -> Config:
     def _load(path: str) -> Config:
         logger.info("Going to load {} as config".format(path))
         with open(path, 'r') as f:
-            return Config.load(f, args)
+            return Config.load(f, {ConfigType.CODESTYLE, ConfigType.POSTPROCESS, ConfigType.ETC}, args)
 
     if args.config:
         return _load(args.config)
diff --git a/atcodertools/tools/tester.py b/atcodertools/tools/tester.py
@@ -19,7 +19,7 @@
 from atcodertools.tools.models.metadata import Metadata, DEFAULT_METADATA
 from atcodertools.tools.utils import with_color
 from atcodertools.tools.compiler import compile_main_and_judge_programs, BadStatusCodeException
-from atcodertools.config.config import Config
+from atcodertools.config.config import Config, ConfigType
 from atcodertools.tools import get_default_config_path
 
 DEFAULT_EPS = 0.000000001
@@ -337,13 +337,15 @@ def main(prog, args) -> bool:
 
     parser.add_argument('--compile-before-testing',
                         help='compile source before testing: '
-                             ' [Default]: disable',
-                        action='store_true')
+                             ' [Default]: None',
+                        action='store_true',
+                        default=None)
 
     parser.add_argument('--compile-only-when-diff-detected',
                         help='compile only when diff detected'
-                             ' [Default]: disable',
-                        action='store_true')
+                             ' [Default]: None',
+                        action='store_true',
+                        default=None)
 
     parser.add_argument('--compile-command',
                         help='set compile command'
@@ -374,11 +376,7 @@ def main(prog, args) -> bool:
     # TODO: https://github.com/kyuridenamida/atcoder-tools/issues/177
 
     with open(args.config, "r") as f:
-        config = Config.load(f)
-    if args.compile_before_testing:
-        config.etc_config.compile_before_testing = True
-    if args.compile_only_when_diff_detected:
-        config.etc_config.compile_only_when_diff_detected = True
+        config = Config.load(f, {ConfigType.TESTER}, args, lang.name)
 
     in_sample_file_list = sorted(
         glob.glob(os.path.join(args.dir, metadata.sample_in_pattern)))
@@ -393,15 +391,18 @@ def main(prog, args) -> bool:
 
     if args.exec is not None:
         exec_file = args.exec
-    elif config.etc_config.compile_before_testing:
+    elif config.tester_config.compile_before_testing:
         # Use atcoder-tools's functionality to compile source code
-        force_compile = not config.etc_config.compile_only_when_diff_detected
+        force_compile = not config.tester_config.compile_only_when_diff_detected
+        compile_command = config.tester_config.compile_command
+        if compile_command:
+            compile_command = lang.get_compile_command("main", compile_command)
         try:
             compile_main_and_judge_programs(
                 metadata.lang,
                 args.dir,
                 force_compile=force_compile,
-                compile_command=args.compile_command
+                compile_command=compile_command
             )
         except BadStatusCodeException as e:
             raise e
diff --git a/tests/resources/test_config/cpp_options.toml b/tests/resources/test_config/cpp_options.toml
@@ -0,0 +1,5 @@
+[codestyle]
+lang = 'cpp'
+indent_width = 3141
+[codestyle.cpp]
+indent_width = 4
diff --git a/tests/resources/test_config/nim_options.toml b/tests/resources/test_config/nim_options.toml
@@ -0,0 +1,5 @@
+[codestyle]
+lang = 'nim'
+indent_width = 3141
+[codestyle.nim]
+indent_width = 2
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -3,7 +3,7 @@
 
 from atcodertools.codegen.code_style_config import CodeStyleConfig, INDENT_TYPE_SPACE, CodeStyleConfigInitError, \
     INDENT_TYPE_TAB
-from atcodertools.config.config import Config
+from atcodertools.config.config import Config, ConfigType
 from atcodertools.tools import get_default_config_path
 
 RESOURCE_DIR = os.path.join(
@@ -15,7 +15,7 @@ class TestConfig(unittest.TestCase):
 
     def test_load_code_style_config(self):
         with open(os.path.join(RESOURCE_DIR, "with_indent_width.toml"), 'r') as f:
-            config = Config.load(f).code_style_config
+            config = Config.load(f, {ConfigType.CODESTYLE}).code_style_config
 
         self.assertEqual(8, config.indent_width)
         self.assertEqual(INDENT_TYPE_SPACE, config.indent_type)
@@ -24,7 +24,8 @@ def test_load_config(self):
         os.chdir(RESOURCE_DIR)
 
         with open(os.path.join(RESOURCE_DIR, "all_options.toml"), 'r') as f:
-            config = Config.load(f)
+            config = Config.load(
+                f, {ConfigType.CODESTYLE, ConfigType.POSTPROCESS})
 
         self.assertEqual(8, config.code_style_config.indent_width)
         self.assertEqual(INDENT_TYPE_TAB, config.code_style_config.indent_type)
@@ -38,16 +39,31 @@ def test_load_config(self):
         with open(config.code_style_config.template_file, 'r') as f:
             self.assertEqual("this is custom_template.cpp", f.read())
 
+    def test_load_config_multi_lang(self):
+        os.chdir(RESOURCE_DIR)
+
+        with open(os.path.join(RESOURCE_DIR, "cpp_options.toml"), 'r') as f:
+            config = Config.load(
+                f, {ConfigType.CODESTYLE, ConfigType.POSTPROCESS})
+
+        self.assertEqual(4, config.code_style_config.indent_width)
+
+        with open(os.path.join(RESOURCE_DIR, "nim_options.toml"), 'r') as f:
+            config = Config.load(
+                f, {ConfigType.CODESTYLE, ConfigType.POSTPROCESS})
+
+        self.assertEqual(2, config.code_style_config.indent_width)
+
     def test_load_config_fails_due_to_typo(self):
         try:
             with open(os.path.join(RESOURCE_DIR, "typo_in_postprocess.toml"), 'r') as f:
-                Config.load(f)
+                Config.load(f, {ConfigType.CODESTYLE})
         except TypeError:
             pass
 
     def test_load_default_config(self):
         with open(get_default_config_path(), 'r') as f:
-            Config.load(f)
+            Config.load(f, {ConfigType.CODESTYLE})
 
     def test_init_code_style_config_with_invalid_parameters(self):
         self._expect_error_when_init_config(
