From 3945331740ed1a072bd46eb02dccec73702706e7 Mon Sep 17 00:00:00 2001
From: TerenceLiu <terenceliu1012@gmail.com>
Date: Sun, 30 Jan 2022 16:33:06 +0800
Subject: [PATCH] fix bugs

---
 CEDA/__init__.py           |  2 +-
 CEDA/economic/XinHua.py    | 46 +++++++++++++++++++++++++-------------
 CEDA/market/duka.py        |  6 -----
 CEDA/market/marketwatch.py |  3 ---
 requirements.txt           |  1 -
 setup.py                   |  3 +--
 6 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/CEDA/__init__.py b/CEDA/__init__.py
index 4ca03bb..269a406 100644
--- a/CEDA/__init__.py
+++ b/CEDA/__init__.py
@@ -1,7 +1,7 @@
 import sys
 import os
 
-__version__ = "0.3.0"
+__version__ = "0.3.2"
 __author__ = "Terence Lau"
 
 
diff --git a/CEDA/economic/XinHua.py b/CEDA/economic/XinHua.py
index b0f0cb9..1dcc53b 100644
--- a/CEDA/economic/XinHua.py
+++ b/CEDA/economic/XinHua.py
@@ -15,25 +15,41 @@ url = {
 }
 
 class XHData(object):
-    def __init__(self):
+    def __init__(self, country:str=None):
+        self.country = country
         pass
 
     
     def toc(self):
         urls, tid, titles, titles_en = [], [], [], []
-        for i in tqdm(range(12005, 12100)):
-            url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
-            r = requests.get(url)
-            if r.ok:
-                data = r.json()
-                if data["data"] == "图表数据不存在":
-                    pass
-                else:
-                    urls.append(url)
-                    tid.append(i)
-                    title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
-                    titles.append(title)
-                    titles_en.append(translate(text=title))
+        if self.country == "CN":
+            for i in tqdm(range(12005, 12100)):
+                url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
+                r = requests.get(url)
+                if r.ok:
+                    data = r.json()
+                    if data["data"] == "图表数据不存在":
+                        pass
+                    else:
+                        urls.append(url)
+                        tid.append(i)
+                        title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
+                        titles.append(title)
+                        titles_en.append(translate(text=title))
+        elif self.country == "USA":
+            for i in tqdm(range(6361, 6394)):
+                url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
+                r = requests.get(url)
+                if r.ok:
+                    data = r.json()
+                    if data["data"] == "图表数据不存在":
+                        pass
+                    else:
+                        urls.append(url)
+                        tid.append(i)
+                        title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
+                        titles.append(title)
+                        titles_en.append(translate(text=title))
 
         return pd.DataFrame({"urls":urls, "id":tid, "title_zh":titles, "title_en":titles_en})
     
@@ -49,6 +65,6 @@ class XHData(object):
             return ValueError("Something went wrong, try again later")
 
 if __name__ == "__main__":
-    xhdata = XHData()
+    xhdata = XHData(country="CN")
     toc = xhdata.toc()
     data = xhdata.download_data(iid=12006) # GDP
diff --git a/CEDA/market/duka.py b/CEDA/market/duka.py
index 1ec8919..1f2756b 100644
--- a/CEDA/market/duka.py
+++ b/CEDA/market/duka.py
@@ -1,11 +1,5 @@
-import re
-import io
 import requests
-import demjson
 import pandas as pd
-from bs4 import BeautifulSoup
-from datetime import datetime
-from urllib.parse import quote, urlencode
 from fake_useragent import UserAgent
 
 url = {
diff --git a/CEDA/market/marketwatch.py b/CEDA/market/marketwatch.py
index 6281a5a..68ae11c 100644
--- a/CEDA/market/marketwatch.py
+++ b/CEDA/market/marketwatch.py
@@ -1,9 +1,6 @@
-import re
 import io
 import requests
-import demjson
 import pandas as pd
-from bs4 import BeautifulSoup
 from datetime import datetime
 from urllib.parse import quote, urlencode
 from fake_useragent import UserAgent
diff --git a/requirements.txt b/requirements.txt
index fc3d247..24b29b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,5 @@
 certifi==2020.12.5
 chardet==4.0.0
-demjson
 fake-useragent==0.1.11
 idna==2.10
 numpy==1.21.0
diff --git a/setup.py b/setup.py
index b616b18..4d7af8c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os
 setup(
     name = "CEDApy",
-    version = "0.3.0",
+    version = "0.3.2",
     keywords = "quantitative economic data",
     long_description = open(
     os.path.join(
@@ -19,7 +19,6 @@ setup(
         "numpy>=1.15.4",
         "pandas>=0.25",
         "requests>=2.22.0",
-        "demjson>=2.2.4",
         "html5lib>=1.0.1",
         "xlrd==1.2.0",
         "bs4",