Project Name: BattleBot

Commit Type: Bugfix

Fixed a number of imports

- Changed the import location of the client and server packages after option selection
- fixed import paths inside of the server and client head files
- Changed the name of the control_loop function in the ApplicationController class to run

Signed-off-by: ButrosGroot <[email protected]>

main.py

@@ -1,18 +1,19 @@
 import sys
 
-from src.server.server import Server
-from src.client.client import Client
-
 
 def main():
     if len(sys.argv) > 1:
         script_mode = sys.argv[1]
 
         if script_mode == 'server':
+            from src.server.server import Server
+
             server = Server()
             server.start()
 
         elif script_mode == 'client':
+            from src.client.client import Client
+
             client = Client()
             client.start()
 

src/client/client.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from logic import ApplicationController
+from src.client.logic import ApplicationController
 
 
 class Client:

src/client/logic.py

@@ -1,7 +1,7 @@
 import asyncio
 
-from client.communications import WebSocketClient
-from client.inputs import KeyboardController
+from src.client.communications import WebSocketClient
+from src.client.inputs import KeyboardController
 
 
 class CommandGenerator:
@@ -27,7 +27,7 @@ def __init__(self, uri):
         self.keyboard_controller = KeyboardController()
         self.state_old = ""
 
-    async def control_loop(self):
+    async def run(self):
         await self.ws_client.connect()
         self.keyboard_controller.start()
         while True:

src/server/server.py

@@ -1,5 +1,5 @@
-from server.motor_controller import MotorController
-from server.communications import MotorWebSocketServer
+from src.server.motor_controller import MotorController
+from src.server.communications import MotorWebSocketServer
 
 
 class Server: