Merge pull request freqtrade#823 from creslinux/timerange_unixtime_ar…

…gument Timerange unixtime argument
KorzunAV · Jun 3, 2018 · 7edafbb · 7edafbb
2 parents a657e3d + 94e586c
commit 7edafbb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/docs/backtesting.md b/docs/backtesting.md
@@ -83,6 +83,8 @@ The full timerange specification:
 - Use tickframes till 2018/01/31: `--timerange=-20180131`
 - Use tickframes since 2018/01/31: `--timerange=20180131-`
 - Use tickframes since 2018/01/31 till 2018/03/01 : `--timerange=20180131-20180301`
+- Use tickframes between POSIX timestamps 1527595200 1527618600:
+                                                `--timerange=1527595200-1527618600`
 
 
 **Update testdata directory**

diff --git a/freqtrade/arguments.py b/freqtrade/arguments.py
@@ -222,6 +222,9 @@ def parse_timerange(text: str) -> Optional[Tuple[List, int, int]]:
         syntax = [(r'^-(\d{8})$', (None, 'date')),
                   (r'^(\d{8})-$', ('date', None)),
                   (r'^(\d{8})-(\d{8})$', ('date', 'date')),
+                  (r'^-(\d{10})$', (None, 'date')),
+                  (r'^(\d{10})-$', ('date', None)),
+                  (r'^(\d{10})-(\d{10})$', ('date', 'date')),
                   (r'^(-\d+)$', (None, 'line')),
                   (r'^(\d+)-$', ('line', None)),
                   (r'^(\d+)-(\d+)$', ('index', 'index'))]
@@ -236,14 +239,16 @@ def parse_timerange(text: str) -> Optional[Tuple[List, int, int]]:
                 if stype[0]:
                     start = rvals[index]
                     if stype[0] == 'date':
-                        start = arrow.get(start, 'YYYYMMDD').timestamp
+                        start = int(start) if len(start) == 10 \
+                            else arrow.get(start, 'YYYYMMDD').timestamp
                     else:
                         start = int(start)
                     index += 1
                 if stype[1]:
                     stop = rvals[index]
                     if stype[1] == 'date':
-                        stop = arrow.get(stop, 'YYYYMMDD').timestamp
+                        stop = int(stop) if len(stop) == 10 \
+                            else arrow.get(stop, 'YYYYMMDD').timestamp
                     else:
                         stop = int(stop)
                 return stype, start, stop

diff --git a/freqtrade/tests/test_arguments.py b/freqtrade/tests/test_arguments.py
@@ -116,6 +116,12 @@ def test_parse_timerange_incorrect() -> None:
     timerange = Arguments.parse_timerange('20100522-20150730')
     assert timerange == (('date', 'date'), 1274486400, 1438214400)
 
+    # Added test for unix timestamp - BTC genesis date
+    assert (('date', None), 1231006505, None) == Arguments.parse_timerange('1231006505-')
+    assert ((None, 'date'), None, 1233360000) == Arguments.parse_timerange('-1233360000')
+    timerange = Arguments.parse_timerange('1231006505-1233360000')
+    assert timerange == (('date', 'date'), 1231006505, 1233360000)
+
     with pytest.raises(Exception, match=r'Incorrect syntax.*'):
         Arguments.parse_timerange('-')