trial of new databasecaller method

This commit is contained in:
Neythen Treloar
2022-03-05 14:03:11 +00:00
parent c2891a66bb
commit c53038b8ed
3 changed files with 68 additions and 127 deletions

124
server.py
View File

@@ -29,11 +29,11 @@ import sys
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 api_caller.py")
api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
time.sleep(3)
api_caller.sendline('A')
#api_caller.sendline('A')
#os.system("sudo ./check_update.sh")
@@ -82,7 +82,8 @@ def process_file(path, filename):
class DummyProcess():
def close(self):
return True
app = Flask(__name__)
@app.route("/", methods=['GET', 'POST'])
@@ -156,6 +157,8 @@ def index():
'api_keys':api_keys,
'wifi_SSID':wifi_SSID
}
#print('database caller:', api_caller.isalive())
return render_template('index.html', **templateData)
@@ -196,21 +199,21 @@ def start():
global displaying_screensaver
global ticker
global api_caller
#global api_caller
global professional
global ticker_stopped
if displaying_screensaver:
screensaver_p.close()
ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 api_caller.py")
api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
displaying_screensaver = False
if ticker_stopped:
ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
ticker_stopped = False
api_caller.sendline('A')
#api_caller.sendline('A')
ticker.sendline('K')
@@ -222,7 +225,7 @@ def stop():
print('stop')
global displaying_screensaver
global ticker
global api_caller
#global api_caller
global professional
global ticker_stopped
@@ -245,7 +248,7 @@ def stop():
screensaver_p.close()
ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 api_caller.py")
api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
#api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 database_caller.py")
displaying_screensaver = False
return index()
@@ -496,7 +499,7 @@ def saveWeatherAPIKey():
def screensaver():
global displaying_screensaver
global ticker
global api_caller
#global api_caller
global screensaver_p
data = str(request.data)
@@ -504,7 +507,7 @@ def screensaver():
if displaying_screensaver:
screensaver_p.close()
else:
api_caller.close()
#api_caller.close()
ticker.close()
@@ -550,11 +553,12 @@ def combine_dict(current_settings, input_symbols, current_key):
return new_settings
def save_trade_settings(input_settings):
filename = input_settings['feature'].lower() + '_settings.json'
current_settings = json.load(open('csv/' + filename, 'r'))
f = open('csv/' + filename, 'r')
current_settings = json.load(f)
f.close()
current_settings['speed'] = input_settings['speed'].lower()
current_settings['animation'] = input_settings['animation'].lower()
@@ -566,14 +570,18 @@ def save_trade_settings(input_settings):
current_settings = combine_dict(current_settings, input_settings['symbols'], 'symbols')
json.dump(current_settings, open('csv/' + filename, 'w+'))
f = open('csv/' + filename, 'w+')
json.dump(current_settings, f)
f.close()
if input_settings['feature'].lower() == 'stocks':
api_caller.sendline('s')
#api_caller.sendline('s')
pass
elif input_settings['feature'].lower() == 'crypto':
api_caller.sendline('c')
#api_caller.sendline('c')
pass
elif input_settings['feature'].lower() == 'forex':
api_caller.sendline('f')
#api_caller.sendline('f')
pass
def save_weather_settings(input_settings):
@@ -605,7 +613,7 @@ def save_weather_settings(input_settings):
current_settings = combine_dict(current_settings, input_settings['locations'], 'locations')
json.dump(current_settings, open('csv/' + filename, 'w+'))
api_caller.sendline('w')
#api_caller.sendline('w')
def save_news_settings(input_settings):
filename = 'news_settings.json'
@@ -628,7 +636,7 @@ def save_news_settings(input_settings):
print(current_settings)
json.dump(current_settings, open('csv/' + filename, 'w+'))
api_caller.sendline('n')
#api_caller.sendline('n')
def save_sports_settings(input_settings):
@@ -654,7 +662,7 @@ def save_sports_settings(input_settings):
json.dump(current_settings, open('csv/' + filename, 'w+'))
api_caller.sendline('S')
#api_caller.sendline('S')
# for images and GIFs
def save_image_settings(input_settings):
@@ -702,81 +710,7 @@ def shutdown():
@app.route("/matrix")
def matrix():
if "Run Stocks" in request.form:
ticker.sendline('K')
ticker.sendline('S')
elif "Run Crypto" in request.form:
ticker.sendline('K')
ticker.sendline('C')
elif "Run Forex" in request.form:
ticker.sendline('K')
ticker.sendline('F')
elif "Run News" in request.form:
ticker.sendline('K')
ticker.sendline('N')
elif "Run Weather" in request.form:
ticker.sendline('K')
ticker.sendline('W')
elif "Run Daily Weather" in request.form:
ticker.sendline('K')
ticker.sendline('D')
elif "Past NHL" in request.form:
ticker.sendline('K')
ticker.sendline('P')
elif "Future NHL" in request.form:
ticker.sendline('K')
ticker.sendline('l')
elif "Live NHL" in request.form:
ticker.sendline('K')
ticker.sendline('L')
elif "Premier league table" in request.form:
ticker.sendline('K')
ticker.sendline('t')
elif "Professional" in request.form:
ticker.sendline('K')
ticker.sendline('b')
elif "All" in request.form:
ticker.sendline('K')
ticker.sendline('A')
elif "Multiple" in request.form:
ticker.sendline('K')
ticker.sendline('+')
elif "Stop Display" in request.form:
LastCommand = 'Stop display at next checkpoint'
ticker.sendline('K')
elif "Shutdown the pi" in request.form:
try:
os.system("sudo shutdown now")
except:
print("couldn't shutdown")
return index()
if __name__ == "__main__":