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

fix: don't use different configuration keys, just add as 2nd argument

Browse Source
This commit is contained in:
Joe Schr 2022-02-02 12:45:03 +01:00
parent a3e045f69d
commit e84a58de28
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/commands/arguments.py
View File

@ -74,8 +74,7 @@ ARGS_PLOT_DATAFRAME = ["pairs", "indicators1", "indicators2", "plot_limit",
"db_url", "trade_source", "export", "exportfilename", "db_url", "trade_source", "export", "exportfilename",
"timerange", "timeframe", "no_trades"] "timerange", "timeframe", "no_trades"]
ARGS_PLOT_PROFIT = ["pairs", "timerange", "export", "exportfilename", "backtestfilename", "db_url", ARGS_PLOT_PROFIT = [ "pairs", "timerange", "export", "exportfilename", "db_url", "trade_source", "timeframe", "plot_auto_open", ]
"trade_source", "timeframe", "plot_auto_open"]
ARGS_INSTALL_UI = ["erase_ui_only", 'ui_version'] ARGS_INSTALL_UI = ["erase_ui_only", 'ui_version']

9
freqtrade/commands/cli_options.py
View File

@ -183,17 +183,12 @@ AVAILABLE_CLI_OPTIONS = {
), ),
"exportfilename": Arg( "exportfilename": Arg(
"--export-filename", "--export-filename",
help="Save backtest results to the file with this filename. " "--backtest-filename",
help="Use this filename for backtest results."
"Requires `--export` to be set as well. " "Requires `--export` to be set as well. "
"Example: `--export-filename=user_data/backtest_results/backtest_today.json`", "Example: `--export-filename=user_data/backtest_results/backtest_today.json`",
metavar="PATH", metavar="PATH",
), ),
"backtestfilename": Arg(
"--backtest-filename",
help="Use backtest results from this filename."
"Example: `--backtest-filename=user_data/backtest_results/backtest_today.json`",
metavar="PATH",
),
"disableparamexport": Arg( "disableparamexport": Arg(
'--disable-param-export', '--disable-param-export',
help="Disable automatic hyperopt parameter export.", help="Disable automatic hyperopt parameter export.",

7
freqtrade/configuration/configuration.py
View File

@ -430,13 +430,6 @@ class Configuration:
self._args_to_config(config, argname='dataformat_trades', self._args_to_config(config, argname='dataformat_trades',
logstring='Using "{}" to store trades data.') logstring='Using "{}" to store trades data.')
if self.args.get('backtestfilename'):
self._args_to_config(config, argname='backtestfilename',
logstring='Fetching backtest results from {} ...')
config['backtestfilename'] = Path(config['backtestfilename'])
else:
config['backtestfilename'] = (config['user_data_dir']
/ 'backtest_results')
def _process_data_options(self, config: Dict[str, Any]) -> None: def _process_data_options(self, config: Dict[str, Any]) -> None:

8
freqtrade/plot/plotting.py
View File

@ -61,12 +61,8 @@ def init_plotscript(config, markets: List, startup_candles: int = 0):
startup_candles, min_date) startup_candles, min_date)
no_trades = False no_trades = False
for arg_name in ['exportfilename', 'backtestfilename']: filename = config.get("exportfilename")
filename = config.get(arg_name) if config.get("no_trades", False):
if filename is not None:
break
if config.get('no_trades', False):
no_trades = True no_trades = True
elif config['trade_source'] == 'file': elif config['trade_source'] == 'file':
if not filename.is_dir() and not filename.is_file(): if not filename.is_dir() and not filename.is_file():