diff --git a/server.py b/server.py index 32ff37d..fa325bc 100755 --- a/server.py +++ b/server.py @@ -168,7 +168,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() @@ -241,7 +241,12 @@ def index(): general_settings = json.load(f) f.close() - + try: + f = open('csv/scheduler.json','r') + scheduler_settings = json.load(f) + f.close() + except: + scheduler_settings = '' try: # incase this doesnt exist api_keys = api_key2[1] @@ -298,7 +303,8 @@ def index(): 'movie_api_key':movie_api_key, 'ipo_api_key':ipo_api_key, 'wifi_SSID':wifi_SSID, - 'wifi_PSK':wifi_PSK + 'wifi_PSK':wifi_PSK, + 'scheduler_settings':scheduler_settings }