refactor file_load_json to be standalone

This commit is contained in:
Matthias
2018-12-28 10:25:12 +01:00
parent 27abdd9788
commit 7dc40cdac5
3 changed files with 39 additions and 15 deletions

View File

@@ -67,18 +67,10 @@ def load_tickerdata_file(
path = make_testdata_path(datadir)
pair_s = pair.replace('/', '_')
file = path.joinpath(f'{pair_s}-{ticker_interval}.json')
gzipfile = file.with_suffix(file.suffix + '.gz')
# Try gzip file first, otherwise regular json file.
if gzipfile.is_file():
logger.debug('Loading ticker data from file %s', gzipfile)
with gzip.open(gzipfile) as tickerdata:
pairdata = misc.json_load(tickerdata)
elif file.is_file():
logger.debug('Loading ticker data from file %s', file)
with open(file) as tickerdata:
pairdata = misc.json_load(tickerdata)
else:
pairdata = misc.file_load_json(file)
if not pairdata:
return None
if timerange: