Merge pull request #40 from JdeRobot/issue-39

Autodetection in manager.py

Author: ReyDoran

manager/libs/applications/compatibility/robotics_application_wrapper.py

@@ -28,8 +28,6 @@ def __init__(self, update_callback):
         self.start_console()
         self.user_process = None
         self.entrypoint_path = None
-        self.python_command = "python"
-        self.check_python_version()
 
     def _create_process(self, cmd):
         #print("creando procesos")
@@ -47,7 +45,7 @@ def load_code(self, path: str):
         self.entrypoint_path = path
 
     def run(self):     
-        self.user_process = self._create_process(f"DISPLAY=:2 {self.python_command} {self.entrypoint_path}")
+        self.user_process = self._create_process(f"DISPLAY=:2 python3 {self.entrypoint_path}")
         self.running = True
 
     def stop(self):
@@ -96,12 +94,4 @@ def suspend_resume(self, signal):
                 if(signal == "resume"):
                     p.resume()
             except psutil.NoSuchProcess:
-                pass
-
-    def check_python_version(self):
-        output = subprocess.check_output(['bash', '-c', 'echo $ROS_VERSION'])
-        output_str = output.decode('utf-8')
-        if (output_str == 1):
-            self.python_command = "python"
-        else:
-            self.python_command = "python3"
+                pass

manager/manager/manager.py

@@ -11,7 +11,7 @@
 import base64
 from queue import Queue
 from uuid import uuid4
-
+import subprocess
 
 
 from src.manager.manager.launcher.launcher_engine import LauncherEngine
@@ -64,7 +64,8 @@ class Manager:
     ]
 
     def __init__(self, host: str, port: int):
-        self.version = "5.1.0"
+        self.version = "5.1.0"        
+        self.ros_version = self.get_ros_version()
         self.__code_loaded = False
         self.exercise_id = None
         self.machine = Machine(model=self, states=Manager.states, transitions=Manager.transitions,
@@ -288,6 +289,9 @@ def signal_handler(sign, frame):
                 self.consumer.send_message(ex)
                 LogManager.logger.error(e, exc_info=True)
 
+    def get_ros_version(self):
+        output = subprocess.check_output(['bash', '-c', 'echo $ROS_VERSION'])
+        return output.decode('utf-8')
 
 if __name__ == "__main__":
     import argparse