From 2b287492deb8494ff46d58be423804f21953c533 Mon Sep 17 00:00:00 2001
From: Cole Deck <cdeck@hawk.iit.edu>
Date: Thu, 18 Jan 2024 16:41:57 -0600
Subject: [PATCH] Make firefox start faster, verbose start

---
 run.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/run.py b/run.py
index e57607d..d29a890 100755
--- a/run.py
+++ b/run.py
@@ -112,7 +112,7 @@ def setup_server(pool):
     global arm_ready
     global serverproc
 
-    fprint("Starting Jukebox control system...")
+    
     pool.apply_async(ur5_control.init, (config["arm"]["ip"],), callback=arm_start_callback)
     #pool.apply_async(led_control.init, callback=led_start_callback)
     #pool.apply_async(camera_control.init, callback=camera_start_callback)
@@ -169,6 +169,8 @@ def run_loading_app():
 
 def setup_client(pool):
     # Windows client setup
+    firefox = webdriver.Firefox()
+    firefox.fullscreen_window()
     global config
     global vm_ready
     global serverproc
@@ -176,8 +178,7 @@ def setup_client(pool):
     p = Process(target=run_loading_app)
     p.start()
 
-    firefox = webdriver.Firefox()
-    firefox.fullscreen_window()
+    
     firefox.get('http://localhost:7000')
     
     # start Linux server VM
@@ -198,7 +199,7 @@ def setup_client(pool):
         while vm_ready is False:
             sleep(0.1)
     p.terminate()
-    firefox.get("http://" + config["core"]["serverip"] + ":5000")
+    firefox.get("http://" + config["core"]["serverip"] + ":8000")
     return True
     
 
@@ -270,17 +271,19 @@ if __name__ == "__main__":
     #sys.stdout = Logger(filename="output.log")
     #sys.stderr = Logger(filename="output.log")
     #log_to_stderr(logging.DEBUG)
-
+    fprint("Starting Jukebox control system...")
     with open('config.yml', 'r') as fileread:
         #global config
         config = yaml.safe_load(fileread)
 
     with Manager() as manager:
+        fprint("Spawning threads...")
         pool = LoggingPool(processes=10)
         counter = 0
         killme = manager.Value('d', 0)
         signal.signal(signal.SIGINT, killall_signal)
         if config["core"]["mode"] == "winclient":
+            fprint("Starting in client mode.")
             from selenium import webdriver
             if setup_client(pool):
                 fprint("Entering main loop...")
@@ -288,6 +291,7 @@ if __name__ == "__main__":
                     mainloop_client(pool)
 
         elif config["core"]["mode"] == "linuxserver":
+            fprint("Starting in server mode.")
             if setup_server(pool):
                 fprint("Entering main loop...")
                 while(keeprunning):