diff --git a/freqtrade/commands/data_commands.py b/freqtrade/commands/data_commands.py index 756c5a287..4bdfec891 100644 --- a/freqtrade/commands/data_commands.py +++ b/freqtrade/commands/data_commands.py @@ -6,7 +6,7 @@ from typing import Any from freqtrade.constants import DATETIME_PRINT_FORMAT, DL_DATA_TIMEFRAMES, Config from freqtrade.enums import CandleType, RunMode, TradingMode from freqtrade.exceptions import ConfigurationError -from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist +from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist, expand_pairlist logger = logging.getLogger(__name__) @@ -134,7 +134,8 @@ def start_list_data(args: dict[str, Any]) -> None: config["datadir"], config.get("trading_mode", TradingMode.SPOT) ) if args["pairs"]: - paircombs = [comb for comb in paircombs if comb[0] in args["pairs"]] + pl = expand_pairlist(args["pairs"], (p[0] for p in paircombs), keep_invalid=True) + paircombs = [comb for comb in paircombs if comb[0] in pl] title = f"Found {len(paircombs)} pair / timeframe combinations." if not config.get("show_timerange"): groupedpair = defaultdict(list) @@ -197,7 +198,8 @@ def start_list_trades_data(args: dict[str, Any]) -> None: ) if args["pairs"]: - paircombs = [comb for comb in paircombs if comb in args["pairs"]] + pl = expand_pairlist(args["pairs"], (p[0] for p in paircombs), keep_invalid=True) + paircombs = [comb for comb in paircombs if comb[0] in pl] title = f"Found trades data for {len(paircombs)} {plural(len(paircombs), 'pair')}." if not config.get("show_timerange"):