os check while group install and list emulators in separate command

Author: Muntasib-creator

Framework/install_handler/long_poll_handler.py

@@ -7,6 +7,7 @@
 from Framework.install_handler.route import Response, services
 from Framework.install_handler.utils import (
     debug,
+    current_os,
     send_response,
     read_node_id,
     generate_services_list,
@@ -57,29 +58,6 @@ async def on_message(self, message: Response) -> None:
                     }
                 )
 
-                avd_list = await get_filtered_avd_services()
-                if avd_list:
-                    await send_response(
-                        {
-                            "action": "services_update",
-                            "data": {
-                                'category': 'AndroidEmulator',
-                                "services": avd_list['services'],
-                            },
-                        }
-                    )
-
-                simulator_list = await get_filtered_simulator_services()
-                if simulator_list:
-                    await send_response(
-                        {
-                            "action": "services_update",
-                            "data": {
-                                'category': 'iOSSimulator',
-                                "services": simulator_list['services'],
-                            },
-                        }
-                    )
             elif action == "system_info":
                 if debug:
                     print(f"[installer] Received system_info request")
@@ -113,6 +91,21 @@ async def on_message(self, message: Response) -> None:
                 if category["category"] == "AndroidEmulator":
                     service_name = message.value.item.name
 
+                    # Case 0: If list of emulators needed to be sent
+                    if service_name == 'emulator_list':
+                        avd_list = await get_filtered_avd_services()
+                        if avd_list:
+                            await send_response(
+                                {
+                                    "action": "services_update",
+                                    "data": {
+                                        'category': 'AndroidEmulator',
+                                        "services": avd_list['services'],
+                                    },
+                                }
+                            )
+                            return
+
                     # Case 1: No service name or empty - get system images list
                     if not service_name:
                         if (
@@ -176,6 +169,21 @@ async def on_message(self, message: Response) -> None:
                     )
                     service_name = message.value.item.name
 
+                    # Case 0: If list of simulators needed to be sent
+                    if service_name == 'simulator_list':
+                        simulator_list = await get_filtered_simulator_services()
+                        if simulator_list:
+                            await send_response(
+                                {
+                                    "action": "services_update",
+                                    "data": {
+                                        'category': 'iOSSimulator',
+                                        "services": simulator_list['services'],
+                                    },
+                                }
+                            )
+                            return
+
                     # Case 1: No service name or empty - get device types list
                     if not service_name:
                         if action == "install" and "install_function" in category and category["install_function"]:
@@ -269,7 +277,7 @@ async def on_message(self, message: Response) -> None:
                     i for i in services if i["category"] == message.value.item.category
                 ][0]["services"]
                 functions = [
-                    i["status_function"] for i in services_list if i["status_function"]
+                    i["status_function"] for i in services_list if i["status_function"] and current_os in i["os"]
                 ]
                 for func in functions:
                     await func()

Framework/install_handler/route.py

@@ -195,8 +195,8 @@
     {
         "category": "MacOS",
         "group": {
-            "check_text": "",
-            "install_text": "",
+            "check_text": "Check all",
+            "install_text": "Install all",
         },
         "services": [
             {
@@ -268,8 +268,8 @@
     {
         "category": "Windows",
         "group": {
-            "check_text": "",
-            "install_text": "",
+            "check_text": "Check all",
+            "install_text": "Install all",
         },
         "install_function": inspector.install,
         "services": [

Framework/install_handler/utils.py

@@ -5,15 +5,14 @@
 
 debug = False
 version = "2.0.0"
+current_os = platform.system().lower()
 
 
 def read_node_id():
     return CommonUtil.MachineInfo().getLocalUser().lower()
 
 
 def generate_services_list(services):
-    current_os = platform.system().lower()
-    
     filtered_services = []
     for category in services:
         filtered_category = {