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

Introduce pair_to_filename()

Browse Source
This commit is contained in:
hroff-1902 2020-01-04 05:07:51 +03:00
parent 3798f94d4c
commit cb5dc47903
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
freqtrade/data/history.py
View File

@ -224,14 +224,20 @@ def refresh_data(datadir: Path,
exchange=exchange) exchange=exchange)
def pair_to_filename(pair: str) -> str:
for ch in ['/', ' ', '.']:
pair = pair.replace(ch, '_')
return pair
def pair_data_filename(datadir: Path, pair: str, timeframe: str) -> Path: def pair_data_filename(datadir: Path, pair: str, timeframe: str) -> Path:
pair_s = pair.replace("/", "_") pair_s = pair_to_filename(pair)
filename = datadir.joinpath(f'{pair_s}-{timeframe}.json') filename = datadir.joinpath(f'{pair_s}-{timeframe}.json')
return filename return filename
def pair_trades_filename(datadir: Path, pair: str) -> Path: def pair_trades_filename(datadir: Path, pair: str) -> Path:
pair_s = pair.replace("/", "_") pair_s = pair_to_filename(pair)
filename = datadir.joinpath(f'{pair_s}-trades.json.gz') filename = datadir.joinpath(f'{pair_s}-trades.json.gz')
return filename return filename

10
freqtrade/plot/plotting.py
View File

@ -4,10 +4,10 @@ from typing import Any, Dict, List
import pandas as pd import pandas as pd
from freqtrade.configuration import TimeRange from freqtrade.configuration import TimeRange
from freqtrade.data import history
from freqtrade.data.btanalysis import (combine_tickers_with_mean, from freqtrade.data.btanalysis import (combine_tickers_with_mean,
create_cum_profit, create_cum_profit,
extract_trades_of_period, load_trades) extract_trades_of_period, load_trades)
from freqtrade.data.history import load_data, pair_to_filename, trim_dataframe
from freqtrade.resolvers import StrategyResolver from freqtrade.resolvers import StrategyResolver
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -36,7 +36,7 @@ def init_plotscript(config):
# Set timerange to use # Set timerange to use
timerange = TimeRange.parse_timerange(config.get("timerange")) timerange = TimeRange.parse_timerange(config.get("timerange"))
tickers = history.load_data( tickers = load_data(
datadir=config.get("datadir"), datadir=config.get("datadir"),
pairs=pairs, pairs=pairs,
timeframe=config.get('ticker_interval', '5m'), timeframe=config.get('ticker_interval', '5m'),
@ -47,7 +47,7 @@ def init_plotscript(config):
db_url=config.get('db_url'), db_url=config.get('db_url'),
exportfilename=config.get('exportfilename'), exportfilename=config.get('exportfilename'),
) )
trades = history.trim_dataframe(trades, timerange, 'open_time') trades = trim_dataframe(trades, timerange, 'open_time')
return {"tickers": tickers, return {"tickers": tickers,
"trades": trades, "trades": trades,
"pairs": pairs, "pairs": pairs,
@ -304,8 +304,8 @@ def generate_plot_filename(pair, timeframe) -> str:
""" """
Generate filenames per pair/timeframe to be used for storing plots Generate filenames per pair/timeframe to be used for storing plots
""" """
pair_name = pair.replace("/", "_") pair_s = pair_to_filename(pair)
file_name = 'freqtrade-plot-' + pair_name + '-' + timeframe + '.html' file_name = 'freqtrade-plot-' + pair_s + '-' + timeframe + '.html'
logger.info('Generate plot file for %s', pair) logger.info('Generate plot file for %s', pair)