adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance Regex to work for mark candles

Browse Source
This commit is contained in:
Matthias 2021-11-28 14:37:54 +01:00
parent c096c7f5cb
commit 8d70672bee
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/data/history/idatahandler.py
View File

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

15
tests/data/test_history.py
View File

@ -670,18 +670,23 @@ def test_datahandler_ohlcv_get_pairs(testdatadir):
# assert set(pairs) == {'UNITTEST/BTC'} # assert set(pairs) == {'UNITTEST/BTC'}
@pytest.mark.parametrize('filename,pair,timeframe', [ @pytest.mark.parametrize('filename,pair,timeframe,candletype', [
('XMR_BTC-5m.json', 'XMR_BTC', '5m'), ('XMR_BTC-5m.json', 'XMR_BTC', '5m', ''),
('XMR_USDT-1h.h5', 'XMR_USDT', '1h'), ('XMR_USDT-1h.h5', 'XMR_USDT', '1h', ''),
('BTC_USDT-2h.jsongz', 'BTC_USDT', '2h'), ('BTC_USDT-2h.jsongz', 'BTC_USDT', '2h', ''),
('BTC_USDT-2h-mark.jsongz', 'BTC_USDT', '2h', 'mark'),
('XMR_USDT-1h-mark.h5', 'XMR_USDT', '1h', 'mark'),
('XMR_USDT-1h-random.h5', 'XMR_USDT', '1h', 'random'),
('XMR_USDT_USDT-1h-mark.h5', 'XMR_USDT_USDT', '1h', 'mark'),
]) ])
def test_datahandler_ohlcv_regex(filename, pair, timeframe): def test_datahandler_ohlcv_regex(filename, pair, timeframe, candletype):
regex = JsonDataHandler._OHLCV_REGEX regex = JsonDataHandler._OHLCV_REGEX
match = re.search(regex, filename) match = re.search(regex, filename)
assert len(match.groups()) > 1 assert len(match.groups()) > 1
assert match[1] == pair assert match[1] == pair
assert match[2] == timeframe assert match[2] == timeframe
assert match[3] == candletype
def test_datahandler_ohlcv_get_available_data(testdatadir): def test_datahandler_ohlcv_get_available_data(testdatadir):