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

Merge branch 'dev' of https://github.com/fin-tic/fintic into dev

Browse Source
This commit is contained in:
Neythen Treloar 2022-03-07 19:56:31 +00:00
commit 98ec1aab63
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database_caller.py
View File

@ -223,7 +223,7 @@ def updateNews(api_key, logf):
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'}
cc = c_dict[all_settings['country']] cc = c_dict[all_settings['country']]

9
server.py
View File

@ -262,13 +262,8 @@ def stop():
@app.route("/update", methods=['PUT','POST']) @app.route("/update", methods=['PUT','POST'])
def update(): def update():
uptodate = os.system('sudo ./check_update.sh') os.system("./update.sh")
print('python:', uptodate) os.system("sudo reboot now")
print(uptodate == 'not up to date')
print(uptodate == 'up to date')
#os.system("./update.sh")
#os.system("sudo reboot now")
return index() return index()
@app.route("/restart") @app.route("/restart")