list emulators and simulators implemented in group status check

Author: Muntasib-creator

Framework/install_handler/android/emulator.py

@@ -706,6 +706,23 @@ async def get_available_devices() -> list[dict]:
         traceback.print_exc()
         return []
 
+async def check_emulator_list():
+    """
+    Sends response to server with list of installed emulators for Android.
+    """
+    avd_list = await get_filtered_avd_services()
+    if avd_list:
+        await send_response(
+            {
+                "action": "services_update",
+                "data": {
+                    'category': 'AndroidEmulator',
+                    "services": avd_list['services'],
+                },
+            }
+        )
+        return True
+    return False
 
 async def android_emulator_install():
     """

Framework/install_handler/ios/simulator.py

@@ -405,6 +405,24 @@ async def get_available_runtimes() -> list[dict]:
         return []
 
 
+async def check_simulator_list():
+    """
+    Sends response to server with list of installed simulators for iOS Simulator.
+    """
+    simulator_list = await get_filtered_simulator_services()
+    if simulator_list:
+        await send_response(
+            {
+                "action": "services_update",
+                "data": {
+                    'category': 'iOSSimulator',
+                    "services": simulator_list['services'],
+                },
+            }
+        )
+        return True
+    return False
+
 async def ios_simulator_install():
     """
     Get available device types when install button is clicked.

Framework/install_handler/long_poll_handler.py

@@ -91,21 +91,6 @@ 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 (
@@ -169,21 +154,6 @@ 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"]:
@@ -273,14 +243,23 @@ async def on_message(self, message: Response) -> None:
                         },
                     }
                 )
-                services_list = [
+                category = [
                     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"] and current_os in i["os"]
-                ]
-                for func in functions:
-                    await func()
+                ][0]
+
+                if message.value.item.category == "AndroidEmulator" and current_os in category["os"]:
+                    await category["status_function"]()
+                    
+                if message.value.item.category == "iOSSimulator" and current_os in category["os"]:
+                    await category["status_function"]()
+                    
+                else:
+                    services_list = category["services"]
+                    functions = [
+                        i["status_function"] for i in services_list if i["status_function"] and current_os in i["os"]
+                    ]
+                    for func in functions:
+                        await func()
                 await send_response(
                     {
                         "action": "group_status",

Framework/install_handler/route.py

@@ -14,8 +14,7 @@
 from .macos import xcode as macos_xcode
 from .database import postgresql, mysql, mariadb, oracle
 from .windows import inspector
-from .android.emulator import android_emulator_install
-from .ios.simulator import ios_simulator_install
+from .android import emulator
 
 services = [
     {
@@ -95,14 +94,16 @@
     },
     {
         "group": {
-            "check_text": "",
+            "check_text": "Check all",
             "install_text": "",
         },
         "category": "AndroidEmulator",
         "name": "System Images",
         "check_text":"Check status",
         "install_text": "Install",
-        "install_function": android_emulator_install,
+        "os": ["windows", "linux", "darwin"],
+        "status_function": emulator.check_emulator_list,
+        "install_function": emulator.android_emulator_install,
         "installables": [],
         "services": [],
     },
@@ -139,14 +140,16 @@
     },
     {
         "group": {
-            "check_text": "",
+            "check_text": "Check all",
             "install_text": "",
         },
         "category": "iOSSimulator",
         "name": "Device Types",
         "check_text":"Check status",
         "install_text": "Install",
-        "install_function": ios_simulator_install,
+        "os": ["darwin"],
+        "status_function": None,
+        "install_function": simulator.ios_simulator_install,
         "installables": [],
         "services": [],
     },