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

refactor format_ms_time to misc.py

Browse Source
This commit is contained in:
Matthias Voppichler 2018-03-25 13:38:17 +02:00
parent 016232a8e9
commit f51ef1a791
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/misc.py
View File

@ -72,3 +72,11 @@ def file_dump_json(filename, data) -> None:
""" """
with open(filename, 'w') as fp: with open(filename, 'w') as fp:
json.dump(data, fp, default=str) json.dump(data, fp, default=str)
def format_ms_time(date: str) -> str:
"""
convert MS date to readable format.
: epoch-string in ms
"""
return datetime.fromtimestamp(date/1000.0).strftime('%Y-%m-%dT%H:%M:%S')

13
freqtrade/optimize/__init__.py
View File

@ -4,7 +4,6 @@ import gzip
import json import json
import os import os
from typing import Optional, List, Dict, Tuple from typing import Optional, List, Dict, Tuple
from datetime import datetime
from freqtrade import misc from freqtrade import misc
from freqtrade.exchange import get_ticker_history from freqtrade.exchange import get_ticker_history
@ -136,8 +135,8 @@ def download_backtesting_testdata(datadir: str, pair: str, interval: int = 5) ->
if os.path.isfile(filename): if os.path.isfile(filename):
with open(filename, "rt") as file: with open(filename, "rt") as file:
data = json.load(file) data = json.load(file)
logger.debug("Current Start: %s", format_ms_time(data[1][0])) logger.debug("Current Start: %s", misc.format_ms_time(data[1][0]))
logger.debug("Current End: %s", format_ms_time(data[-1:][0][0])) logger.debug("Current End: %s", misc.format_ms_time(data[-1:][0][0]))
else: else:
data = [] data = []
logger.debug("Current Start: None") logger.debug("Current Start: None")
@ -147,14 +146,10 @@ def download_backtesting_testdata(datadir: str, pair: str, interval: int = 5) ->
for row in new_data: for row in new_data:
if row not in data: if row not in data:
data.append(row) data.append(row)
logger.debug("New Start: %s", format_ms_time(data[0][0])) logger.debug("New Start: %s", misc.format_ms_time(data[0][0]))
logger.debug("New End: %s", format_ms_time(data[-1:][0][0])) logger.debug("New End: %s", misc.format_ms_time(data[-1:][0][0]))
data = sorted(data, key=lambda data: data[0]) data = sorted(data, key=lambda data: data[0])
misc.file_dump_json(filename, data) misc.file_dump_json(filename, data)
return True return True
def format_ms_time(date: str) -> str:
return datetime.fromtimestamp(date/1000.0).strftime('%Y-%m-%dT%H:%M:%S')