Change to use ohlcv_purge

freqtrade · Dec 28, 2019 · 91c70a0 · 91c70a0
1 parent 37c5b68
commit 91c70a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/freqtrade/data/datahandlers/jsondatahandler.py b/freqtrade/data/datahandlers/jsondatahandler.py
@@ -74,6 +74,19 @@ def _ohlcv_load(self, pair: str, timeframe: str,
                                        infer_datetime_format=True)
         return pairdata
 
+    def ohlcv_purge(self, pair: str, timeframe: str) -> bool:
+        """
+        Remove data for this pair
+        :param pair: Delete data for this pair.
+        :param timeframe: Ticker timeframe (e.g. "5m")
+        :return: True when deleted, false if file did not exist.
+        """
+        filename = self._pair_data_filename(self._datadir, pair, timeframe)
+        if filename.is_file():
+            filename.unlink()
+            return True
+        return False
+
     def ohlcv_append(self, pair: str, timeframe: str, data: DataFrame) -> None:
         """
         Append data to existing data structures

diff --git a/freqtrade/data/history.py b/freqtrade/data/history.py
@@ -374,7 +374,7 @@ def refresh_backtest_trades_data(exchange: Exchange, pairs: List[str], datadir:
                 logger.info(f'Deleting existing data for pair {pair}.')
 
         logger.info(f'Downloading trades for pair {pair}.')
-        _download_trades_history(datadir=datadir, exchange=exchange,
+        _download_trades_history(exchange=exchange,
                                  pair=pair,
                                  timerange=timerange,
                                  data_handler=data_handler)
@@ -392,10 +392,9 @@ def convert_trades_to_ohlcv(pairs: List[str], timeframes: List[str],
     for pair in pairs:
         trades = data_handler_trades.trades_load(pair)
         for timeframe in timeframes:
-            ohlcv_file = pair_data_filename(datadir, pair, timeframe)
-            if erase and ohlcv_file.exists():
-                logger.info(f'Deleting existing data for pair {pair}, interval {timeframe}.')
-                ohlcv_file.unlink()
+            if erase:
+                if data_handler_ohlcv.ohlcv_purge(pair, timeframe):
+                    logger.info(f'Deleting existing data for pair {pair}, interval {timeframe}.')
             ohlcv = trades_to_ohlcv(trades, timeframe)
             # Store ohlcv
             data_handler_ohlcv.ohlcv_store(pair, timeframe, data=ohlcv)