Anything configurable from command line is configurable from toml (#80)

* Move configs

* Refactor config

* All configurations are now available with toml

* Update README

Author: kyuridenamida

README.md

@@ -132,18 +132,31 @@ optional arguments:
 
 - コードスタイルの設定が幅4のスペースインデントである
 - コード生成テンプレートとして`~/my_template.cpp`を使う
+- ワークスペースのルートは `~/atcoder-workspace/`
+- 言語設定は `cpp` (提出時もしくはデフォルトのコードジェネレーター生成時に使われます)
 - 問題用ディレクトリ内で毎回`clang-format`を実行して、最後に`CMakeLists.txt`(空)をコンテスト用ディレクトリに生成する
-- カスタムコードジェネレーター `custom_code_generator.py`を指定す
+- カスタムコードジェネレーター `custom_code_generator.py`を指定する
+- AtCoderにログインせずにダウンロードを行う機能を使わない (公開コンテストに対してのみ可能)
+- データの並列ダウンロードを無効にする
+- ログイン情報のクッキーを保存する
 
 ```$xslt
 [codestyle]
 indent_type = 'space' # 'tab' or 'space'
 indent_width = 4
 template_file='~/my_template.cpp'
+workspace_dir = '~/atcoder-workspace/'
+lang = 'cpp' # 'cpp' or 'java' (Currently)
 [postprocess]
 exec_on_each_problem_dir='clang-format -i ./*.cpp'
 exec_on_contest_dir='touch CMakeLists.txt'
 code_generator_file="~/custom_code_generator.py"
+
+[etc]
+download_without_login=false
+parallel_download=false
+save_no_session_cache=false
+
 ```
 
 ### カスタムコードジェネレーター

atcodertools/codegen/code_style_config.py

@@ -1,8 +1,9 @@
 import importlib.machinery as imm
 import os
+from os.path import expanduser
 from typing import Optional
-
 from atcodertools.fileutils.normalize import normalize_path
+from atcodertools.tools.templates import get_default_template_path
 
 INDENT_TYPE_SPACE = 'space'
 INDENT_TYPE_TAB = 'tab'
@@ -12,13 +13,19 @@ class CodeStyleConfigInitError(Exception):
     pass
 
 
+DEFAULT_WORKSPACE_DIR_PATH = os.path.join(expanduser("~"), "atcoder-workspace")
+SUPPORTED_LANGUAGES = ["cpp", "java"]
+
+
 class CodeStyleConfig:
 
     def __init__(self,
                  indent_type: str = INDENT_TYPE_SPACE,
                  indent_width: int = 4,
                  code_generator_file: Optional[str] = None,
                  template_file: Optional[str] = None,
+                 workspace_dir: Optional[str] = None,
+                 lang: str = "cpp",
                  ):
         code_generator_file = normalize_path(code_generator_file)
         template_file = normalize_path(template_file)
@@ -41,9 +48,12 @@ def __init__(self,
                     template_file)
             )
 
+        if lang and lang not in SUPPORTED_LANGUAGES:
+            raise CodeStyleConfigInitError(
+                "language must be one of {}".format(SUPPORTED_LANGUAGES))
+
         self.indent_type = indent_type
         self.indent_width = indent_width
-        self.code_generator = None
 
         if code_generator_file is not None:
             try:
@@ -53,7 +63,20 @@ def __init__(self,
             except AttributeError as e:
                 raise CodeStyleConfigInitError(e, "Error while loading {}".format(
                     code_generator_file))
-        self.template_file = template_file
+        else:
+            assert lang is not None
+            if lang == "cpp":
+                from atcodertools.codegen.code_generators import cpp
+                self.code_generator = cpp.main
+            else:
+                from atcodertools.codegen.code_generators import java
+                self.code_generator = java.main
+
+        self.template_file = normalize_path(
+            template_file or get_default_template_path(lang))
+        self.workspace_dir = normalize_path(
+            workspace_dir or DEFAULT_WORKSPACE_DIR_PATH)
+        self.lang = lang
 
     def indent(self, depth):
         if self.indent_type == INDENT_TYPE_SPACE:

atcodertools/config/config.py

@@ -1,26 +1,56 @@
-from typing import TextIO
+from argparse import Namespace
+from typing import TextIO, Dict, Any, Optional
 
 import toml
 
 from atcodertools.codegen.code_style_config import CodeStyleConfig
-from atcodertools.tools.postprocess_config import PostprocessConfig
+from atcodertools.config.etc_config import EtcConfig
+from atcodertools.config.postprocess_config import PostprocessConfig
+
+
+def _update_config_dict(target_dic: Dict[str, Any], update_dic: Dict[str, Any]):
+    return {
+        **target_dic,
+        **dict((k, v) for k, v in update_dic.items() if v is not None)
+    }
 
 
 class Config:
 
     def __init__(self,
                  code_style_config: CodeStyleConfig = CodeStyleConfig(),
                  postprocess_config: PostprocessConfig = PostprocessConfig(),
+                 etc_config: EtcConfig = EtcConfig()
                  ):
         self.code_style_config = code_style_config
         self.postprocess_config = postprocess_config
+        self.etc_config = etc_config
 
     @classmethod
-    def load(cls, fp: TextIO):
+    def load(cls, fp: TextIO, args: Optional[Namespace] = 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))
+
         return Config(
             code_style_config=CodeStyleConfig(**code_style_config_dic),
             postprocess_config=PostprocessConfig(**postprocess_config_dic),
+            etc_config=EtcConfig(**etc_config_dic)
         )

atcodertools/config/etc_config.py

@@ -0,0 +1,10 @@
+class EtcConfig:
+
+    def __init__(self,
+                 download_without_login: str = False,
+                 parallel_download: bool = False,
+                 save_no_session_cache: bool = False,
+                 ):
+        self.download_without_login = download_without_login
+        self.parallel_download = parallel_download
+        self.save_no_session_cache = save_no_session_cache

atcodertools/tools/postprocess_config.py renamed to atcodertools/config/postprocess_config.py

@@ -0,0 +1,5 @@
+import os
+
+
+def get_default_config_path():
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), "atcodertools-default.toml")

atcodertools/tools/__init__.py

@@ -2,13 +2,17 @@
 indent_type = 'space' # 'tab' or 'space'
 indent_width = 4
 
+workspace_dir = '~/atcoder-workspace/'
+lang = 'cpp' # 'cpp' or 'java' (Currently)
+
 ## template_file is a file path to template code
 #template_file=
 
 ## code_generator_file is a path to .py file defining custom code generator function.
 ## Please check README.md for details.
 #code_generator_file=
 
+
 [postprocess]
 ## exec_on_each_problem_dir is executed after every problem directory's creation
 ## with its problem directory as cwd like arc001/A
@@ -17,3 +21,8 @@ indent_width = 4
 ## exec_on_contest_dir is executed once after `atcoder-tools gen`
 ## with the contest directory as cwd like arc001/
 #exec_on_contest_dir=
+
+[etc]
+download_without_login=false
+parallel_download=false
+save_no_session_cache=false