From c2d6731f0ff9810735a08defab587794dbd46212 Mon Sep 17 00:00:00 2001
From: Rohit Gupta <rohitgtech+git@gmail.com>
Date: Mon, 30 Nov 2020 22:00:15 +0530
Subject: [PATCH] use web-api for data retrieval

---
 cryptocmd/core.py  | 29 ++++++++++++++----
 cryptocmd/utils.py | 74 +++++++++++++---------------------------------
 2 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/cryptocmd/core.py b/cryptocmd/core.py
index 8db0322..69b018a 100644
--- a/cryptocmd/core.py
+++ b/cryptocmd/core.py
@@ -15,7 +15,7 @@
 import tablib
 import warnings
 from datetime import datetime
-from .utils import download_coin_data, extract_data, InvalidParameters
+from .utils import download_coin_data, InvalidParameters
 
 
 class CmcScraper(object):
@@ -46,7 +46,7 @@ def __init__(
         self.end_date = end_date
         self.all_time = bool(all_time)
         self.order_ascending = order_ascending
-        self.headers = []
+        self.headers = ["Date", "Open", "High", "Low", "Close", "Volume", "Market Cap"]
         self.rows = []
 
         # enable all_time download if start_time or end_time is not given
@@ -72,15 +72,34 @@ def _download_data(self, **kwargs):
 
         forced = kwargs.get("forced")
 
-        if self.headers and self.rows and not forced:
+        if self.rows and not forced:
             return
 
         if self.all_time:
             self.start_date, self.end_date = None, None
 
-        table = download_coin_data(self.coin_code, self.start_date, self.end_date)
+        coin_data = download_coin_data(self.coin_code, self.start_date, self.end_date)
 
-        self.end_date, self.start_date, self.headers, self.rows = extract_data(table)
+        for _row in coin_data["data"]["quotes"]:
+
+            _row_quote = list(_row["quote"].values())[0]
+            date = datetime.strptime(
+                _row_quote["timestamp"], "%Y-%m-%dT%H:%M:%S.%fZ"
+            ).strftime("%d-%m-%Y")
+
+            row = [
+                date,
+                _row_quote["open"],
+                _row_quote["high"],
+                _row_quote["low"],
+                _row_quote["close"],
+                _row_quote["volume"],
+                _row_quote["market_cap"],
+            ]
+
+            self.rows.insert(0, row)
+
+        self.end_date, self.start_date = self.rows[0][0], self.rows[-1][0]
 
         if self.order_ascending:
             self.rows.sort(key=lambda x: datetime.strptime(x[0], "%d-%m-%Y"))
diff --git a/cryptocmd/utils.py b/cryptocmd/utils.py
index 0007131..e0ef942 100644
--- a/cryptocmd/utils.py
+++ b/cryptocmd/utils.py
@@ -74,17 +74,31 @@ def download_coin_data(coin_code, start_date, end_date):
 
     coin_id = get_coin_id(coin_code)
 
-    # Format the dates as required for the url.
-    start_date = datetime.datetime.strptime(start_date, "%d-%m-%Y").strftime("%Y%m%d")
-    end_date = datetime.datetime.strptime(end_date, "%d-%m-%Y").strftime("%Y%m%d")
+    # convert the dates to timestamp for the url
+    start_date_timestamp = int(
+        (
+            datetime.datetime.strptime(start_date, "%d-%m-%Y")
+            - datetime.timedelta(days=1)
+        )
+        .replace(tzinfo=datetime.timezone.utc)
+        .timestamp()
+    )
+
+    end_date_timestamp = int(
+        datetime.datetime.strptime(end_date, "%d-%m-%Y")
+        .replace(tzinfo=datetime.timezone.utc)
+        .timestamp()
+    )
 
-    url = "https://coinmarketcap.com/currencies/{0}/historical-data/?start={1}&end={2}".format(
-        coin_id, start_date, end_date
+    api_url = "https://web-api.coinmarketcap.com/v1/cryptocurrency/ohlcv/historical?convert=USD&slug={}&time_end={}&time_start={}".format(
+        coin_id, end_date_timestamp, start_date_timestamp
     )
 
     try:
-        html = get_url_data(url).text
-        return html
+        json_data = get_url_data(api_url).json()
+        if json_data["status"]["error_code"] != 0:
+            raise Exception(json_data["status"]["error_message"])
+        return json_data
     except Exception as e:
         print(
             "Error fetching price data for {} for interval '{}' and '{}'",
@@ -99,22 +113,6 @@ def download_coin_data(coin_code, start_date, end_date):
             print("Error message (download_data) :", e)
 
 
-def _native_type(s):
-    """
-    Convert value in the string to its native (i.e. either int, float or str) type.
-    :param s: string
-    :return: value in native type
-    """
-
-    try:
-        return int(s)
-    except ValueError:
-        try:
-            return float(s)
-        except ValueError:
-            return s
-
-
 def _replace(s, bad_chars):
     if sys.version_info > (3, 0):
         # For Python 3
@@ -128,36 +126,6 @@ def _replace(s, bad_chars):
         return s.translate(identity, bad_chars)
 
 
-def extract_data(html):
-    """
-    Extract the price history from the HTML.
-
-    :param html: html having historical price data
-    :return: end_date, start_date, headers(column name of data), rows(price data)
-    """
-
-    raw_data = pq(html)
-
-    headers = [col.text_content().strip("*") for col in raw_data("table:first>thead>tr>th")]
-
-    rows = []
-
-    for _row in raw_data(".cmc-tab-historical-data table tbody>tr"):
-        row = [
-            _native_type(_replace(col.text_content().strip(), ",-*?"))
-            for col in _row.findall("td")
-        ]
-
-        # change format of date ('Aug 24 2017' to '24-08-2017')
-        row[0] = datetime.datetime.strptime(row[0], "%b %d %Y").strftime("%d-%m-%Y")
-
-        rows.append(row)
-
-    end_date, start_date = rows[0][0], rows[-1][0]
-
-    return end_date, start_date, headers, rows
-
-
 class InvalidParameters(ValueError):
     """Passed parameters are invalid."""