From cb5dc479039ee049d1d984e159fabcbcca03461d Mon Sep 17 00:00:00 2001
From: hroff-1902 <hroff_raeyd9tzpttf@mail.ru>
Date: Sat, 4 Jan 2020 05:07:51 +0300
Subject: [PATCH] Introduce pair_to_filename()

---
 freqtrade/data/history.py  | 10 ++++++++--
 freqtrade/plot/plotting.py | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/freqtrade/data/history.py b/freqtrade/data/history.py
index 30d168f78..cfdd6008f 100644
--- a/freqtrade/data/history.py
+++ b/freqtrade/data/history.py
@@ -224,14 +224,20 @@ def refresh_data(datadir: Path,
                                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:
-    pair_s = pair.replace("/", "_")
+    pair_s = pair_to_filename(pair)
     filename = datadir.joinpath(f'{pair_s}-{timeframe}.json')
     return filename
 
 
 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')
     return filename
 
diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py
index e1989b249..955d09b83 100644
--- a/freqtrade/plot/plotting.py
+++ b/freqtrade/plot/plotting.py
@@ -4,10 +4,10 @@ from typing import Any, Dict, List
 
 import pandas as pd
 from freqtrade.configuration import TimeRange
-from freqtrade.data import history
 from freqtrade.data.btanalysis import (combine_tickers_with_mean,
                                        create_cum_profit,
                                        extract_trades_of_period, load_trades)
+from freqtrade.data.history import load_data, pair_to_filename, trim_dataframe
 from freqtrade.resolvers import StrategyResolver
 
 logger = logging.getLogger(__name__)
@@ -36,7 +36,7 @@ def init_plotscript(config):
     # Set timerange to use
     timerange = TimeRange.parse_timerange(config.get("timerange"))
 
-    tickers = history.load_data(
+    tickers = load_data(
         datadir=config.get("datadir"),
         pairs=pairs,
         timeframe=config.get('ticker_interval', '5m'),
@@ -47,7 +47,7 @@ def init_plotscript(config):
                          db_url=config.get('db_url'),
                          exportfilename=config.get('exportfilename'),
                          )
-    trades = history.trim_dataframe(trades, timerange, 'open_time')
+    trades = trim_dataframe(trades, timerange, 'open_time')
     return {"tickers": tickers,
             "trades": trades,
             "pairs": pairs,
@@ -304,8 +304,8 @@ def generate_plot_filename(pair, timeframe) -> str:
     """
     Generate filenames per pair/timeframe to be used for storing plots
     """
-    pair_name = pair.replace("/", "_")
-    file_name = 'freqtrade-plot-' + pair_name + '-' + timeframe + '.html'
+    pair_s = pair_to_filename(pair)
+    file_name = 'freqtrade-plot-' + pair_s + '-' + timeframe + '.html'
 
     logger.info('Generate plot file for %s', pair)