bug fixes

server.py

@@ -39,7 +39,6 @@ ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
 ticker.sendline('*') # run by default 
 ticker.sendline('A') # run by default 
 
-
 def allowed_file(filename):
     return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
 
@@ -50,7 +49,9 @@ def process_file(path, filename):
     for row in new_csv:
         default_csv.writerow(row)
 
-    
+class DummyProcess():
+    def close(self):
+        return True
     
 
 app = Flask(__name__)
@@ -92,6 +93,7 @@ def index():
     image_settings = json.load(open('csv/image_settings.json', 'r'))
     GIF_settings = json.load(open('csv/GIF_settings.json', 'r'))
     message_settings = json.load(open('csv/message_settings.json', 'r'))
+    general_settings = json.load(open('csv/general_settings.json', 'r'))
 
 
     templateData = {
@@ -110,7 +112,8 @@ def index():
         'image_settings':image_settings,
         'GIF_settings':GIF_settings, 
         'message_settings':message_settings,
-        'professional':professional
+        'professional':professional,
+        'general_settings':general_settings
       }
     return render_template('index.html', **templateData)
 
@@ -125,8 +128,8 @@ def start():
     global professional
     if displaying_screensaver:
         screensaver_p.close()
-        api_caller = pexpect.spawn("sudo -E python3 api_caller.py")
-        ticker = pexpect.spawn("sudo -E taskset -c 3 python3 stockTicker.py")
+        ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
+        api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 api_caller.py")
         displaying_screensaver = False
         
         
@@ -167,8 +170,10 @@ def start():
 @app.route("/stop")
 def stop():
     print('stop')
-    global ticker
     global displaying_screensaver
+    global ticker
+    global api_caller
+    global professional
     if not displaying_screensaver:
         ticker.sendline('K')
     else:
@@ -177,8 +182,8 @@ def stop():
     
     if displaying_screensaver:
         screensaver_p.close()
-        api_caller = pexpect.spawn("sudo -E python3 api_caller.py")
-        ticker = pexpect.spawn("sudo -E taskset -c 3 python3 stockTicker.py")
+        ticker = pexpect.spawn("sudo -E python3 stockTicker.py")
+        api_caller = pexpect.spawn("sudo -E taskset -c 3 python3 api_caller.py")
         displaying_screensaver = False
     return index()
 
@@ -250,23 +255,13 @@ def brightness():
     settings = json.loads(data)
     print(settings)
     brightness =settings['brightness']
-    print(str(int(brightness) - 1))
-    ticker.sendline(str(int(brightness) - 1))
+
+    ticker.sendline(str(int(brightness)))
     
-    f = open('csv/settings.csv', 'r')
-    CSV = csv.reader(f)
-    next(CSV)
-    for line in CSV:
-        speed, _ = line 
-    f.close()
+    general_settings = json.load(open('csv/general_settings.json', 'r'))
     
-    f = open('csv/settings.csv', 'w+')
-    f.write('speed,brightness\n')
-    f.write(str(speed) + ',' + str(int(brightness) - 1))
-    f.close()
-    
-    global LastCommand
-    LastCommand = 'Change Brightness'
+    general_settings['brightness'] = int(brightness)
+    json.dump(general_settings, open('csv/general_settings.json', 'w+'))
     return index()
 
 
@@ -303,6 +298,11 @@ def wifi():
     ssid = settings['ssid']
     pwd = settings['pwd']
     
+    general_settings = json.load(open('csv/general_settings.json', 'r'))
+    
+    general_settings['country_code'] = country
+    json.dump(general_settings, open('csv/general_settings.json', 'w+'))
+    
     edit_wpa_sup(country, ssid, pwd)
     # resstart netoworking
     os.system('wpa_cli -i wlan0 reconfigure')
@@ -334,6 +334,11 @@ def hostname():
     os.system("sudo hostnamectl set-hostname {}".format(hostname))
     os.system("sudo systemctl restart avahi-daemon")
     
+    general_settings = json.load(open('csv/general_settings.json', 'r'))
+    
+    general_settings['hostname'] = hostname
+    json.dump(general_settings, open('csv/general_settings.json', 'w+'))
+    
     return index()
     
     
@@ -349,7 +354,7 @@ def screensaver():
     
     if displaying_screensaver:
         screensaver_p.close()
-    
+
     
     if "Pulsating Colors" in data:
         screensaver_p = pexpect.spawn("sudo -E python3 ./rpi-rgb-led-matrix/bindings/python/samples/pulsing-colors.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1")
@@ -363,6 +368,9 @@ def screensaver():
     elif "Game of Life" in data:
         screensaver_p = pexpect.spawn("sudo -E python3 game_of_life.py")
         
+    elif "Sleep" in data:
+        screensaver_p = DummyProcess()
+        
     displaying_screensaver = True
     return index()