enable compiler config by toml (#243)

* enable compiler config

* fix code style

* revise compile-only-when-diff-detected default

* add testcases for compiler

Co-authored-by: tommy <[email protected]>

Author: trickstar0301

README.md

@@ -234,6 +234,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'
+[compiler]
+compile_command='g++ main.cpp -o main -std=c++17'
+compile_only_when_diff_detected=true
 [tester]
 compile_before_testing=true
 compile_only_when_diff_detected=true

atcodertools/config/compiler_config.py

@@ -0,0 +1,8 @@
+class CompilerConfig:
+
+    def __init__(self,
+                 compile_only_when_diff_detected: bool = False,
+                 compile_command: str = None
+                 ):
+        self.compile_only_when_diff_detected = compile_only_when_diff_detected
+        self.compile_command = compile_command

atcodertools/config/config.py

@@ -8,13 +8,15 @@
 from atcodertools.config.etc_config import EtcConfig
 from atcodertools.config.postprocess_config import PostprocessConfig
 from atcodertools.config.tester_config import TesterConfig
+from atcodertools.config.compiler_config import CompilerConfig
 
 
 class ConfigType(Enum):
     CODESTYLE = "codestyle"
     POSTPROCESS = "postprocess"
     TESTER = "tester"
     ETC = "etc"
+    COMPILER = "compiler"
 
 
 def _update_config_dict(target_dic: Dict[str, Any], update_dic: Dict[str, Any]):
@@ -44,7 +46,8 @@ def __init__(self,
                  code_style_config: CodeStyleConfig = CodeStyleConfig(),
                  postprocess_config: PostprocessConfig = PostprocessConfig(),
                  tester_config: TesterConfig = TesterConfig(),
-                 etc_config: EtcConfig = EtcConfig()
+                 etc_config: EtcConfig = EtcConfig(),
+                 compiler_config: CompilerConfig = CompilerConfig()
                  ):
         self.code_style_config = code_style_config
         self.postprocess_config = postprocess_config
@@ -101,5 +104,13 @@ def load(cls, fp: TextIO, get_config_type, args: Optional[Namespace] = None, lan
                                                          save_no_session_cache=args.save_no_session_cache,
                                                          skip_existing_problems=args.skip_existing_problems))
             result.etc_config = EtcConfig(**etc_config_dic)
+        if ConfigType.COMPILER in get_config_type:
+            compiler_config_dic = get_config_dic(
+                config_dic, ConfigType.COMPILER)
+            if args:
+                compiler_config_dic = _update_config_dict(compiler_config_dic,
+                                                          dict(compile_only_when_diff_detected=args.compile_only_when_diff_detected,
+                                                               compile_command=args.compile_command))
+            result.compiler_config = CompilerConfig(**compiler_config_dic)
 
         return result

atcodertools/tools/compiler.py

@@ -1,11 +1,16 @@
 #!/usr/bin/python3
 import argparse
+from os.path import expanduser
 
 from atcodertools.executils.run_command import run_command_with_returncode
 from atcodertools.tools.models.metadata import Metadata
 from atcodertools.common.language import Language
 import os
 import pathlib
+from atcodertools.config.config import Config, ConfigType
+from atcodertools.tools import get_default_config_path
+
+USER_CONFIG_PATH = os.path.join(expanduser("~"), ".atcodertools.toml")
 
 
 class BadStatusCodeException(Exception):
@@ -56,13 +61,40 @@ def main(prog, args):
 
     parser.add_argument('--compile-only-when-diff-detected',
                         help='compile only when diff detected [true, false]'
-                             ' [Default]: true',
+                             ' [Default]: false',
                         type=bool,
-                        default=False)
+                        default=None)
+
+    parser.add_argument("--config",
+                        help="File path to your config file\n{0}{1}".format("[Default (Primary)] {}\n".format(
+                            USER_CONFIG_PATH),
+                            "[Default (Secondary)] {}\n".format(
+                                get_default_config_path())),
+                        default=None)
 
     args = parser.parse_args(args)
+    if args.config is None:
+        if os.path.exists(USER_CONFIG_PATH):
+            args.config = USER_CONFIG_PATH
+        else:
+            args.config = get_default_config_path()
 
     metadata = Metadata.load_from("./metadata.json")
-    force_compile = not args.compile_only_when_diff_detected
+    lang = metadata.lang
+
+    with open(args.config, "r") as f:
+        config = Config.load(f, {ConfigType.COMPILER}, args, lang.name)
+
+    if args.compile_only_when_diff_detected:
+        force_compile = not args.compile_only_when_diff_detected
+    else:
+        force_compile = not config.compiler_config.compile_only_when_diff_detected
+
+    if args.compile_command:
+        compile_command = args.compile_command
+    else:
+        compile_command = config.compiler_config.compile_command
+    if compile_command:
+        compile_command = lang.get_compile_command("main", compile_command)
     compile_main_and_judge_programs(metadata.lang, force_compile=force_compile,
-                                    compile_command=args.compile_command)
+                                    compile_command=compile_command)

tests/resources/test_config/compiler_options.toml

@@ -0,0 +1,5 @@
+[codestyle]
+indent_width = 8
+[compiler]
+compile_command='g++ main.cpp -o main -std=c++17'
+compile_only_when_diff_detected=true

tests/test_compiler.py

@@ -0,0 +1,29 @@
+import os
+import unittest
+import shutil
+import tempfile
+
+from atcodertools.tools import compiler
+
+RESOURCE_DIR = os.path.abspath(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)),
+    "./resources/test_tester/"))
+
+
+class TestTester(unittest.TestCase):
+    def setUp(self):
+        self.temp_dir = tempfile.mkdtemp()
+
+    def test_compiler(self):
+        test_dir = os.path.join(self.temp_dir, "test")
+        shutil.copytree(os.path.join(
+            RESOURCE_DIR, "test_compiler_and_tester"), test_dir)
+        os.chdir(test_dir)
+        compiler.main(
+            '', ["--compile-command", "touch compile-command-success"])
+        lst = os.listdir('./')
+        self.assertTrue("compile-command-success" in lst)
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_config.py

@@ -127,6 +127,18 @@ def _expect_error_when_init_config(self, **kwargs):
         except CodeStyleConfigInitError:
             pass
 
+    def test_load_config_compiler(self):
+        os.chdir(RESOURCE_DIR)
+
+        with open(os.path.join(RESOURCE_DIR, "compiler_options.toml"), 'r') as f:
+            config = Config.load(
+                f, {ConfigType.CODESTYLE, ConfigType.COMPILER})
+
+        self.assertEqual(
+            True, config.compiler_config.compile_only_when_diff_detected)
+        self.assertEqual('g++ main.cpp -o main -std=c++17',
+                         config.compiler_config.compile_command)
+
 
 if __name__ == "__main__":
     unittest.main()