From f51ef1a7915611459657d44234e2258548621338 Mon Sep 17 00:00:00 2001 From: Matthias Voppichler Date: Sun, 25 Mar 2018 13:38:17 +0200 Subject: [PATCH] refactor format_ms_time to misc.py --- freqtrade/misc.py | 8 ++++++++ freqtrade/optimize/__init__.py | 13 ++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/freqtrade/misc.py b/freqtrade/misc.py index f5d045c44..bc04d6b88 100644 --- a/freqtrade/misc.py +++ b/freqtrade/misc.py @@ -72,3 +72,11 @@ def file_dump_json(filename, data) -> None: """ with open(filename, 'w') as fp: 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') diff --git a/freqtrade/optimize/__init__.py b/freqtrade/optimize/__init__.py index be2300de7..30be5dc33 100644 --- a/freqtrade/optimize/__init__.py +++ b/freqtrade/optimize/__init__.py @@ -4,7 +4,6 @@ import gzip import json import os from typing import Optional, List, Dict, Tuple -from datetime import datetime from freqtrade import misc 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): with open(filename, "rt") as file: data = json.load(file) - logger.debug("Current Start: %s", format_ms_time(data[1][0])) - logger.debug("Current End: %s", format_ms_time(data[-1:][0][0])) + logger.debug("Current Start: %s", misc.format_ms_time(data[1][0])) + logger.debug("Current End: %s", misc.format_ms_time(data[-1:][0][0])) else: data = [] 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: if row not in data: data.append(row) - logger.debug("New Start: %s", format_ms_time(data[0][0])) - logger.debug("New End: %s", format_ms_time(data[-1:][0][0])) + logger.debug("New Start: %s", misc.format_ms_time(data[0][0])) + logger.debug("New End: %s", misc.format_ms_time(data[-1:][0][0])) data = sorted(data, key=lambda data: data[0]) misc.file_dump_json(filename, data) return True - - -def format_ms_time(date: str) -> str: - return datetime.fromtimestamp(date/1000.0).strftime('%Y-%m-%dT%H:%M:%S')