adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify configuration init where possible

Browse Source
This commit is contained in:
Matthias 2019-09-13 07:02:36 +02:00
parent 4d566e8bad
commit f163240710
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freqtrade/configuration/configuration.py
View File

@ -106,10 +106,7 @@ class Configuration:
the -v/--verbose, --logfile options the -v/--verbose, --logfile options
""" """
# Log level # Log level
if 'verbosity' in self.args and self.args["verbosity"]: config.update({'verbosity': self.args.get("verbosity", 0)})
config.update({'verbosity': self.args["verbosity"]})
else:
config.update({'verbosity': 0})
if 'logfile' in self.args and self.args["logfile"]: if 'logfile' in self.args and self.args["logfile"]:
config.update({'logfile': self.args["logfile"]}) config.update({'logfile': self.args["logfile"]})
@ -121,8 +118,8 @@ class Configuration:
self._process_logging_options(config) self._process_logging_options(config)
# Set strategy if not specified in config and or if it's non default # Set strategy if not specified in config and or if it's non default
if self.args["strategy"] != constants.DEFAULT_STRATEGY or not config.get('strategy'): if self.args.get("strategy") != constants.DEFAULT_STRATEGY or not config.get('strategy'):
config.update({'strategy': self.args["strategy"]}) config.update({'strategy': self.args.get("strategy")})
self._args_to_config(config, argname='strategy_path', self._args_to_config(config, argname='strategy_path',
logstring='Using additional Strategy lookup path: {}') logstring='Using additional Strategy lookup path: {}')
@ -175,10 +172,7 @@ class Configuration:
config['user_data_dir'] = create_userdata_dir(config['user_data_dir'], create_dir=False) config['user_data_dir'] = create_userdata_dir(config['user_data_dir'], create_dir=False)
logger.info('Using user-data directory: %s ...', config['user_data_dir']) logger.info('Using user-data directory: %s ...', config['user_data_dir'])
if 'datadir' in self.args and self.args["datadir"]: config.update({'datadir': create_datadir(config, self.args.get("datadir", None))})
config.update({'datadir': create_datadir(config, self.args["datadir"])})
else:
config.update({'datadir': create_datadir(config, None)})
logger.info('Using data directory: %s ...', config.get('datadir')) logger.info('Using data directory: %s ...', config.get('datadir'))
def _process_optimize_options(self, config: Dict[str, Any]) -> None: def _process_optimize_options(self, config: Dict[str, Any]) -> None: