c0de/fintic-tracker
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

more news countries

Browse Source
This commit is contained in:
Justin 2023-03-17 19:03:20 +08:00 committed by GitHub
parent 67e0d8b5bc
commit 31d9b47a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
database_caller.py
View File

@ -516,24 +516,16 @@ def updateForex(api_key, logf):
def updateNews(api_key, logf): def updateNews(api_key, logf):
#'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news?category=technology'
#'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news?country=GB'
#'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news?lang=en'
try: try:
f = open('csv/news_settings.json', 'r') f = open('csv/news_settings.json', 'r')
all_settings = json.load(f) all_settings = json.load(f)
f.close() f.close()
if all_settings['use_country']: if all_settings['use_country']:
if all_settings['country'] == 'Worldwide': if all_settings['country'] == 'Worldwide':
url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news_worldwide?' url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news_worldwide?'
else: else:
c_dict = {'United States':'US', 'Australia':'AU', 'Canada': 'CA', 'Great Britain':'GB', 'New Zealand':'NZ', 'Ireland':'IE', 'Singapore':'SG', 'South Africa': 'ZA'} c_dict = {'United States':'US', 'Australia':'AU', 'Canada': 'CA', 'Great Britain':'GB', 'New Zealand':'NZ', 'Ireland':'IE', 'Singapore':'SG', 'South Africa': 'ZA', 'Germany': 'DE', 'Hong Kong': 'HK', 'Japan': 'JP', 'South Korea': 'KR', 'China': 'CN', 'France': 'FR', 'India': 'IN', 'Italy': 'IT', 'Switzerland': 'CH', 'Netherlands': 'NL', 'Spain': 'ES', 'Brazil': 'BR', 'Portugal': 'PT'}
cc = c_dict[all_settings['country']] cc = c_dict[all_settings['country']]
url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news?country={}'.format(cc) url = 'https://bm7p954xoh.execute-api.us-east-2.amazonaws.com/default/ScriptsAPI/news?country={}'.format(cc)
elif all_settings['use_category']: elif all_settings['use_category']:
@ -548,8 +540,6 @@ def updateNews(api_key, logf):
#load user settings #load user settings
headlines = data[:max_headlines] headlines = data[:max_headlines]
headline_sources = [headline['source'] for headline in headlines] headline_sources = [headline['source'] for headline in headlines]
headline_titles = [headline['title'] for headline in headlines] headline_titles = [headline['title'] for headline in headlines]
headline_times = [headline['publishedAt'] for headline in headlines] headline_times = [headline['publishedAt'] for headline in headlines]