From e95665cecaeec2337dee47660674401535b406a7 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 15 Mar 2020 15:36:23 +0100
Subject: [PATCH] Make backtestresult storing independent from printing

---
 freqtrade/optimize/backtesting.py      |  6 ++++-
 freqtrade/optimize/optimize_reports.py | 36 ++++++++++++--------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py
index 323331bc6..1725a7d13 100644
--- a/freqtrade/optimize/backtesting.py
+++ b/freqtrade/optimize/backtesting.py
@@ -18,7 +18,8 @@ from freqtrade.data.converter import trim_dataframe
 from freqtrade.data.dataprovider import DataProvider
 from freqtrade.exceptions import OperationalException
 from freqtrade.exchange import timeframe_to_minutes, timeframe_to_seconds
-from freqtrade.optimize.optimize_reports import show_backtest_results
+from freqtrade.optimize.optimize_reports import (show_backtest_results,
+                                                 store_backtest_result)
 from freqtrade.persistence import Trade
 from freqtrade.resolvers import ExchangeResolver, StrategyResolver
 from freqtrade.state import RunMode
@@ -396,5 +397,8 @@ class Backtesting:
                 max_open_trades=max_open_trades,
                 position_stacking=position_stacking,
             )
+
+        if self.config.get('export', False):
+            store_backtest_result(self.config['exportfilename'], all_results)
         # Show backtest results
         show_backtest_results(self.config, data, all_results)
diff --git a/freqtrade/optimize/optimize_reports.py b/freqtrade/optimize/optimize_reports.py
index fef0accb0..701432071 100644
--- a/freqtrade/optimize/optimize_reports.py
+++ b/freqtrade/optimize/optimize_reports.py
@@ -11,22 +11,22 @@ from freqtrade.misc import file_dump_json
 logger = logging.getLogger(__name__)
 
 
-def store_backtest_result(recordfilename: Path, results: DataFrame,
-                          strategyname: Optional[str] = None) -> None:
+def store_backtest_result(recordfilename: Path, all_results: Dict[str, DataFrame]) -> None:
 
-    records = [(t.pair, t.profit_percent, t.open_time.timestamp(),
-                t.close_time.timestamp(), t.open_index - 1, t.trade_duration,
-                t.open_rate, t.close_rate, t.open_at_end, t.sell_reason.value)
-               for index, t in results.iterrows()]
+    for strategy, results in all_results.items():
+        records = [(t.pair, t.profit_percent, t.open_time.timestamp(),
+                    t.close_time.timestamp(), t.open_index - 1, t.trade_duration,
+                    t.open_rate, t.close_rate, t.open_at_end, t.sell_reason.value)
+                   for index, t in results.iterrows()]
 
-    if records:
-        if strategyname:
-            # Inject strategyname to filename
-            recordfilename = Path.joinpath(
-                recordfilename.parent,
-                f'{recordfilename.stem}-{strategyname}').with_suffix(recordfilename.suffix)
-        logger.info(f'Dumping backtest results to {recordfilename}')
-        file_dump_json(recordfilename, records)
+        if records:
+            if len(all_results) > 1:
+                # Inject strategy to filename
+                recordfilename = Path.joinpath(
+                    recordfilename.parent,
+                    f'{recordfilename.stem}-{strategy}').with_suffix(recordfilename.suffix)
+            logger.info(f'Dumping backtest results to {recordfilename}')
+            file_dump_json(recordfilename, records)
 
 
 def generate_text_table(data: Dict[str, Dict], stake_currency: str, max_open_trades: int,
@@ -203,10 +203,6 @@ def show_backtest_results(config: Dict, btdata: Dict[str, DataFrame],
                           all_results: Dict[str, DataFrame]):
     for strategy, results in all_results.items():
 
-        if config.get('export', False):
-            store_backtest_result(config['exportfilename'], results,
-                                  strategy if len(all_results) > 1 else None)
-
         print(f"Result for strategy {strategy}")
         table = generate_text_table(btdata, stake_currency=config['stake_currency'],
                                     max_open_trades=config['max_open_trades'],
@@ -235,8 +231,8 @@ def show_backtest_results(config: Dict, btdata: Dict[str, DataFrame],
     if len(all_results) > 1:
         # Print Strategy summary table
         table = generate_text_table_strategy(config['stake_currency'],
-                                                config['max_open_trades'],
-                                                all_results=all_results)
+                                             config['max_open_trades'],
+                                             all_results=all_results)
         print(' STRATEGY SUMMARY '.center(len(table.splitlines()[0]), '='))
         print(table)
         print('=' * len(table.splitlines()[0]))