From 8116ca847ba942fcc4876ca92fc429c3104503a2 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 18 Sep 2022 16:57:03 +0200 Subject: [PATCH] move trades_get_pairs to parent class --- freqtrade/data/history/hdf5datahandler.py | 16 +--------------- freqtrade/data/history/idatahandler.py | 6 +++++- freqtrade/data/history/jsondatahandler.py | 16 +--------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/freqtrade/data/history/hdf5datahandler.py b/freqtrade/data/history/hdf5datahandler.py index bc44f5f8b..01b7af7e7 100644 --- a/freqtrade/data/history/hdf5datahandler.py +++ b/freqtrade/data/history/hdf5datahandler.py @@ -1,7 +1,5 @@ import logging -import re -from pathlib import Path -from typing import List, Optional +from typing import Optional import numpy as np import pandas as pd @@ -101,18 +99,6 @@ class HDF5DataHandler(IDataHandler): """ raise NotImplementedError() - @classmethod - def trades_get_pairs(cls, datadir: Path) -> List[str]: - """ - Returns a list of all pairs for which trade data is available in this - :param datadir: Directory to search for ohlcv files - :return: List of Pairs - """ - _tmp = [re.search(r'^(\S+)(?=\-trades.h5)', p.name) - for p in datadir.glob("*trades.h5")] - # Check if regex found something and only return these results to avoid exceptions. - return [cls.rebuild_pair_from_filename(match[0]) for match in _tmp if match] - def trades_store(self, pair: str, data: TradeList) -> None: """ Store trades data (list of Dicts) to file diff --git a/freqtrade/data/history/idatahandler.py b/freqtrade/data/history/idatahandler.py index 08e591c5c..8abccacdc 100644 --- a/freqtrade/data/history/idatahandler.py +++ b/freqtrade/data/history/idatahandler.py @@ -152,13 +152,17 @@ class IDataHandler(ABC): """ @classmethod - @abstractmethod def trades_get_pairs(cls, datadir: Path) -> List[str]: """ Returns a list of all pairs for which trade data is available in this :param datadir: Directory to search for ohlcv files :return: List of Pairs """ + _ext = cls._get_file_extension() + _tmp = [re.search(r'^(\S+)(?=\-trades.' + _ext + ')', p.name) + for p in datadir.glob(f"*trades.{_ext}")] + # Check if regex found something and only return these results to avoid exceptions. + return [cls.rebuild_pair_from_filename(match[0]) for match in _tmp if match] @abstractmethod def trades_store(self, pair: str, data: TradeList) -> None: diff --git a/freqtrade/data/history/jsondatahandler.py b/freqtrade/data/history/jsondatahandler.py index a54b44601..f016c0ec1 100644 --- a/freqtrade/data/history/jsondatahandler.py +++ b/freqtrade/data/history/jsondatahandler.py @@ -1,7 +1,5 @@ import logging -import re -from pathlib import Path -from typing import List, Optional +from typing import Optional import numpy as np from pandas import DataFrame, read_json, to_datetime @@ -99,18 +97,6 @@ class JsonDataHandler(IDataHandler): """ raise NotImplementedError() - @classmethod - def trades_get_pairs(cls, datadir: Path) -> List[str]: - """ - Returns a list of all pairs for which trade data is available in this - :param datadir: Directory to search for ohlcv files - :return: List of Pairs - """ - _tmp = [re.search(r'^(\S+)(?=\-trades.json)', p.name) - for p in datadir.glob(f"*trades.{cls._get_file_extension()}")] - # Check if regex found something and only return these results to avoid exceptions. - return [cls.rebuild_pair_from_filename(match[0]) for match in _tmp if match] - def trades_store(self, pair: str, data: TradeList) -> None: """ Store trades data (list of Dicts) to file