Add explicit tests for ohlcv regex

freqtrade/data/history/hdf5datahandler.py

@@ -30,8 +30,7 @@ class HDF5DataHandler(IDataHandler):
         """
         _tmp = [
             re.search(
-                r'^([a-zA-Z_]+(\:[a-zA-Z]{2,}(\-[0-9]{2,})?)?)\-(\d+\S)\-?([a-zA-Z_]*)?(?=.h5)',
+                cls._OHLCV_REGEX, p.name
-                p.name
             ) for p in datadir.glob("*.h5")
         ]
         return [(match[1].replace('_', '/'), match[2], match[3]) for match in _tmp

freqtrade/data/history/idatahandler.py

@@ -23,6 +23,8 @@ logger = logging.getLogger(__name__)
 
 class IDataHandler(ABC):
 
+    _OHLCV_REGEX = r'^([a-zA-Z_]+)\-(\d+\S+)(?=\.)'
+
     def __init__(self, datadir: Path) -> None:
         self._datadir = datadir
 

freqtrade/data/history/jsondatahandler.py

@@ -31,8 +31,7 @@ class JsonDataHandler(IDataHandler):
         """
         _tmp = [
             re.search(
-                r'^([a-zA-Z_]+(\:[a-zA-Z]{2,}(\-[0-9]{2,})?)?)\-(\d+\S)\-?([a-zA-Z_]*)?(?=.json)',
+                cls._OHLCV_REGEX, p.name
-                p.name
             ) for p in datadir.glob(f"*.{cls._get_file_extension()}")]
         return [(match[1].replace('_', '/'), match[2], match[3]) for match in _tmp
                 if match and len(match.groups()) > 1]

tests/data/test_history.py

@@ -1,6 +1,7 @@
 # pragma pylint: disable=missing-docstring, protected-access, C0103
 
 import json
+import re
 import uuid
 from pathlib import Path
 from shutil import copyfile
@@ -669,6 +670,20 @@ def test_datahandler_ohlcv_get_pairs(testdatadir):
     # assert set(pairs) == {'UNITTEST/BTC'}
 
 
+@pytest.mark.parametrize('filename,pair,timeframe', [
+    ('XMR_BTC-5m.json', 'XMR_BTC', '5m'),
+    ('XMR_USDT-1h.h5', 'XMR_USDT', '1h'),
+    ('BTC_USDT-2h.jsongz', 'BTC_USDT', '2h'),
+])
+def test_datahandler_ohlcv_regex(filename, pair, timeframe):
+    regex = JsonDataHandler._OHLCV_REGEX
+
+    match = re.search(regex, filename)
+    assert len(match.groups()) > 1
+    assert match[1] == pair
+    assert match[2] == timeframe
+
+
 def test_datahandler_ohlcv_get_available_data(testdatadir):
     paircombs = JsonDataHandler.ohlcv_get_available_data(testdatadir)
     # Convert to set to avoid failures due to sorting