From 76637d3939994219e1ec15e1cdf7e513217536a5 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Mon, 16 May 2022 19:53:01 +0200
Subject: [PATCH] Simplify timeframe-transition

---
 freqtrade/data/history/hdf5datahandler.py | 7 +++----
 freqtrade/data/history/idatahandler.py    | 9 ++++++---
 freqtrade/data/history/jsondatahandler.py | 7 +++----
 tests/data/test_history.py                | 4 ++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/freqtrade/data/history/hdf5datahandler.py b/freqtrade/data/history/hdf5datahandler.py
index 6099c22bc..dadc9c7e6 100644
--- a/freqtrade/data/history/hdf5datahandler.py
+++ b/freqtrade/data/history/hdf5datahandler.py
@@ -77,8 +77,7 @@ class HDF5DataHandler(IDataHandler):
         key = self._pair_ohlcv_key(pair, timeframe)
         _data = data.copy()
 
-        filename = self._pair_data_filename(
-            self._datadir, pair, self.timeframe_to_file(timeframe), candle_type)
+        filename = self._pair_data_filename(self._datadir, pair, timeframe, candle_type)
         self.create_dir_if_needed(filename)
 
         _data.loc[:, self._columns].to_hdf(
@@ -105,14 +104,14 @@ class HDF5DataHandler(IDataHandler):
         filename = self._pair_data_filename(
             self._datadir,
             pair,
-            self.timeframe_to_file(timeframe),
+            timeframe,
             candle_type=candle_type
         )
 
         if not filename.exists():
             # Fallback mode for 1M files
             filename = self._pair_data_filename(
-                self._datadir, pair, timeframe, candle_type=candle_type)
+                self._datadir, pair, timeframe, candle_type=candle_type, no_timeframe_modify=True)
             if not filename.exists():
                 return pd.DataFrame(columns=self._columns)
         where = []
diff --git a/freqtrade/data/history/idatahandler.py b/freqtrade/data/history/idatahandler.py
index 69d6212ee..07dc7c763 100644
--- a/freqtrade/data/history/idatahandler.py
+++ b/freqtrade/data/history/idatahandler.py
@@ -98,8 +98,7 @@ class IDataHandler(ABC):
         :param candle_type: Any of the enum CandleType (must match trading mode!)
         :return: True when deleted, false if file did not exist.
         """
-        filename = self._pair_data_filename(
-            self._datadir, pair, self.timeframe_to_file(timeframe), candle_type)
+        filename = self._pair_data_filename(self._datadir, pair, timeframe, candle_type)
         if filename.exists():
             filename.unlink()
             return True
@@ -194,10 +193,14 @@ class IDataHandler(ABC):
         datadir: Path,
         pair: str,
         timeframe: str,
-        candle_type: CandleType
+        candle_type: CandleType,
+        no_timeframe_modify: bool = False
     ) -> Path:
         pair_s = misc.pair_to_filename(pair)
         candle = ""
+        if not no_timeframe_modify:
+            timeframe = cls.timeframe_to_file(timeframe)
+
         if candle_type != CandleType.SPOT:
             datadir = datadir.joinpath('futures')
             candle = f"-{candle_type}"
diff --git a/freqtrade/data/history/jsondatahandler.py b/freqtrade/data/history/jsondatahandler.py
index 38402a113..83ec183df 100644
--- a/freqtrade/data/history/jsondatahandler.py
+++ b/freqtrade/data/history/jsondatahandler.py
@@ -77,8 +77,7 @@ class JsonDataHandler(IDataHandler):
         :param candle_type: Any of the enum CandleType (must match trading mode!)
         :return: None
         """
-        filename = self._pair_data_filename(
-            self._datadir, pair, self.timeframe_to_file(timeframe), candle_type)
+        filename = self._pair_data_filename(self._datadir, pair, timeframe, candle_type)
         self.create_dir_if_needed(filename)
         _data = data.copy()
         # Convert date to int
@@ -105,11 +104,11 @@ class JsonDataHandler(IDataHandler):
         :return: DataFrame with ohlcv data, or empty DataFrame
         """
         filename = self._pair_data_filename(
-            self._datadir, pair, self.timeframe_to_file(timeframe), candle_type=candle_type)
+            self._datadir, pair, timeframe, candle_type=candle_type)
         if not filename.exists():
             # Fallback mode for 1M files
             filename = self._pair_data_filename(
-                self._datadir, pair, timeframe, candle_type=candle_type)
+                self._datadir, pair, timeframe, candle_type=candle_type, no_timeframe_modify=True)
             if not filename.exists():
                 return DataFrame(columns=self._columns)
         try:
diff --git a/tests/data/test_history.py b/tests/data/test_history.py
index 1e7d8855e..9709e7ad0 100644
--- a/tests/data/test_history.py
+++ b/tests/data/test_history.py
@@ -173,7 +173,7 @@ def test_json_pair_data_filename(pair, timeframe, expected_result, candle_type):
     fn = JsonDataHandler._pair_data_filename(
         Path('freqtrade/hello/world'),
         pair,
-        JsonDataHandler.timeframe_to_file(timeframe),
+        timeframe,
         CandleType.from_string(candle_type)
     )
     assert isinstance(fn, Path)
@@ -181,7 +181,7 @@ def test_json_pair_data_filename(pair, timeframe, expected_result, candle_type):
     fn = JsonGzDataHandler._pair_data_filename(
         Path('freqtrade/hello/world'),
         pair,
-        JsonGzDataHandler.timeframe_to_file(timeframe),
+        timeframe,
         candle_type=CandleType.from_string(candle_type)
     )
     assert isinstance(fn, Path)