Merge branch 'master' into dev

server.py

@@ -36,7 +36,7 @@ import sys
 #api_caller.sendline('A')
 
 
-os.system("./check_update.sh")
+#pexpect.spawn("./check_update.sh")
 
 displaying_screensaver = False
 uploading = False
@@ -135,6 +135,7 @@ def index():
     timeString = now.strftime("%Y-%m-%d %H:%M")
     logos_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos')
     LogoList = os.listdir(logos_path)
+
     f = open('csv/stocks_settings.json', 'r')
     stocks_settings = json.load(f)
     f.close()
@@ -190,6 +191,9 @@ def index():
     f = open('csv/general_settings.json', 'r')
     general_settings = json.load(f)
     f.close()
+
+
+   
     try: # incase this doesnt exist
         api_keys = api_key2[1]
     except:
@@ -322,6 +326,7 @@ def stop():
 
 @app.route("/update", methods=['PUT','POST'])
 def update():
+
     
     f = open('csv/system_info.json', 'w+')
     try:
@@ -334,6 +339,7 @@ def update():
     json.dump(system_info, f)
     f.close()
     
+
     os.system("./update.sh")
     os.system("sudo reboot now")
     return index()