_1btcxe ticker timestamp and parseDate added to js/py/php

joacub · Feb 27, 2018 · e49e928 · e49e928
1 parent 2529ea5
commit e49e928
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/js/_1btcxe.js b/js/_1btcxe.js
@@ -118,6 +118,7 @@ module.exports = class _1btcxe extends Exchange {
             'currency': this.marketId (symbol),
         }, params));
         let ticker = response['stats'];
+        let last = parseFloat (ticker['last_price']);
         return {
             'symbol': symbol,
             'timestamp': undefined,
@@ -128,9 +129,9 @@ module.exports = class _1btcxe extends Exchange {
             'ask': parseFloat (ticker['ask']),
             'vwap': undefined,
             'open': parseFloat (ticker['open']),
-            'close': undefined,
-            'first': undefined,
-            'last': parseFloat (ticker['last_price']),
+            'close': last,
+            'last': last,
+            'previousClose': undefined,
             'change': parseFloat (ticker['daily_change']),
             'percentage': undefined,
             'average': undefined,

diff --git a/js/base/Exchange.js b/js/base/Exchange.js
@@ -170,7 +170,13 @@ module.exports = class Exchange {
 
         this.iso8601          = timestamp => ((typeof timestamp === 'undefined') ? timestamp : new Date (timestamp).toISOString ())
         this.parse8601        = x => Date.parse (((x.indexOf ('+') >= 0) || (x.slice (-1) === 'Z')) ? x : (x + 'Z'))
-        this.parseDate        = x => ((x.indexOf ('GMT') >= 0) ? Date.parse (x) : this.parse8601 (x))
+        this.parseDate        = (x) => {
+            if (typeof x === 'undefined')
+                return x
+            return ((x.indexOf ('GMT') >= 0) ?
+                Date.parse (x) :
+                this.parse8601 (x))
+        }
         this.microseconds     = () => now () * 1000 // TODO: utilize performance.now for that purpose
         this.seconds          = () => Math.floor (now () / 1000)
 

diff --git a/php/Exchange.php b/php/Exchange.php
@@ -443,6 +443,14 @@ public static function iso8601 ($timestamp) {
         return str_replace ('+', sprintf (".%03d+", $msec), $result);
     }
 
+    public static function parse_date ($timestamp) {
+        if (!isset ($timestamp))
+            return $timestamp;
+        if (strstr ($timestamp, 'GMT'))
+            return strtotime ($timestamp) * 1000;
+        return static::parse8601 ($timestamp);
+    }
+
     public static function parse8601 ($timestamp) {
         $time = strtotime ($timestamp) * 1000;
         if (preg_match ('/\.(?<milliseconds>[0-9]{1,3})/', $timestamp, $match)) {

diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py
@@ -663,6 +663,8 @@ def ymdhms(timestamp, infix=' '):
 
     @staticmethod
     def parse_date(timestamp):
+        if timestamp is None:
+            return timestamp
         if 'GMT' in timestamp:
             string = ''.join([str(value) for value in parsedate(timestamp)[:6]]) + '.000Z'
             dt = datetime.datetime.strptime(string, "%Y%m%d%H%M%S.%fZ")