Trying to connect: LiveSplit vs LiveSplitOne

Author: AlexKnauth

src/splitguides/server/split_server.py

@@ -78,8 +78,8 @@ def event_stream():
                 except (ConnectionError, TimeoutError):
                     connected = client.connect()
                     yield (
-                        f"data: <h2>Trying to connect to livesplit.</h2>"
-                        f"<h3>Make sure Livesplit server is running.</h3>{data}\n\n"
+                        f"data: <h2>Trying to connect to {settings.timer}.</h2>"
+                        f"<h3>Make sure {settings.timer} server is running.</h3>{data}\n\n"
                     )
                 else:
                     if current_note_index != new_index or disconnected:
@@ -104,8 +104,8 @@ def event_stream():
                 disconnected = True
                 connected = client.connect()
                 yield (
-                    f"data: <h2>Trying to connect to livesplit.</h2>"
-                    f"<h3>Make sure Livesplit server is running.</h3>{data}\n\n"
+                    f"data: <h2>Trying to connect to {settings.timer}.</h2>"
+                    f"<h3>Make sure {settings.timer} server is running.</h3>{data}\n\n"
                 )
             time.sleep(0.5)
 

src/splitguides/ui/main_window.py

@@ -226,11 +226,11 @@ def increase_offset(self):
         if not self.ls.connected:
             self.update_notes(0)
             self.ui.statusbar.showMessage(
-                f"Trying to connect to Livesplit. | Split Offset: {self.split_offset}"
+                f"Trying to connect to {self.settings.timer}. | Split Offset: {self.split_offset}"
             )
         else:
             self.ui.statusbar.showMessage(
-                f"Connected to Livesplit. | Split Offset: {self.split_offset}"
+                f"Connected to {self.settings.timer}. | Split Offset: {self.split_offset}"
             )
 
     def decrease_offset(self):
@@ -239,11 +239,11 @@ def decrease_offset(self):
         if not self.ls.connected:
             self.update_notes(0)
             self.ui.statusbar.showMessage(
-                f"Trying to connect to Livesplit. | Split Offset: {self.split_offset}"
+                f"Trying to connect to {self.settings.timer}. | Split Offset: {self.split_offset}"
             )
         else:
             self.ui.statusbar.showMessage(
-                f"Connected to Livesplit. | Split Offset: {self.split_offset}"
+                f"Connected to {self.settings.timer}. | Split Offset: {self.split_offset}"
             )
 
     def start_loops(self):
@@ -483,13 +483,13 @@ def update_status(self, message):
 
     def ls_connect(self):
         self.update_status(
-            f"Trying to connect to Livesplit. | "
+            f"Trying to connect to {self.main_window.settings.timer}. | "
             f"Split Offset: {self.main_window.split_offset}"
         )
         self.connected = self.client.connect()
         if self.connected:
             self.update_status(
-                f"Connected to Livesplit. | "
+                f"Connected to {self.main_window.settings.timer}. | "
                 f"Split Offset: {self.main_window.split_offset}"
             )