Cleanup commit, plus more data!

wlanpi_core/api/api_v1/endpoints/network_api.py

@@ -212,7 +212,7 @@ async def delete_ethernet_vlan(
 @router.get("/wlan/interfaces", response_model=network.Interfaces)
 async def get_wireless_interfaces(timeout: int = API_DEFAULT_TIMEOUT):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Queries wpa_supplicant via dbus to get all interfaces known to the supplicant.
     """
 
     try:
@@ -233,7 +233,7 @@ async def do_wireless_network_scan(
     scan_type: str, interface: str, timeout: int = API_DEFAULT_TIMEOUT
 ):
     """
-    Queries systemd via dbus to get a scan of the available networks.
+    Queries wpa_supplicant via dbus to get a scan of the available networks for an interface.
     """
 
     try:
@@ -254,7 +254,7 @@ async def add_wireless_network(
     timeout: int = API_DEFAULT_TIMEOUT,
 ):
     """
-    Queries systemd via dbus to set a single network.
+    Queries wpa_supplicant via dbus to set a single network.
     """
 
     try:
@@ -277,7 +277,7 @@ async def get_current_wireless_network_details(
     interface: str, timeout: int = API_DEFAULT_TIMEOUT
 ):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Queries wpa_supplicant via dbus to get the details of the currently connected network.
     """
 
     try:
@@ -300,7 +300,7 @@ async def disconnect_wireless_network(
     interface: str, timeout: int = API_DEFAULT_TIMEOUT
 ):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Disconnects the currently connected network for the specified interface.
     """
 
     try:
@@ -319,7 +319,7 @@ async def disconnect_wireless_network(
 )
 async def get_all_wireless_networks(interface: str, timeout: int = API_DEFAULT_TIMEOUT):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Queries wpa_supplicant via dbus to get all network on an interface.
     """
 
     try:
@@ -338,7 +338,7 @@ async def get_all_wireless_networks(interface: str, timeout: int = API_DEFAULT_T
 )
 async def get_current_network(interface: str, timeout: int = API_DEFAULT_TIMEOUT):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Queries wpa_supplicant via dbus to get the details of the currently selected network.
     """
 
     try:
@@ -357,7 +357,7 @@ async def get_current_network(interface: str, timeout: int = API_DEFAULT_TIMEOUT
 )
 async def get_wireless_network(interface: str, network_id: int):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Queries wpa_supplicant via dbus to get the details of a specific network.
     """
 
     try:
@@ -395,7 +395,7 @@ async def remove_all_wireless_networks(interface: str):
 )
 async def disconnect_wireless_network(interface: str, network_id: int):
     """
-    Queries systemd via dbus to get the details of the currently connected network.
+    Disconnects the specified wireless network.
     """
 
     try:

wlanpi_core/services/network_service.py

@@ -12,9 +12,7 @@
 from wlanpi_core.models.validation_error import ValidationError
 from wlanpi_core.schemas import network
 from wlanpi_core.schemas.network.network import SupplicantNetwork
-from wlanpi_core.utils.network import (
-    get_interface_details,
-)
+from wlanpi_core.utils.network import get_interface_details
 
 """
 These are the functions used to deliver the API

wlanpi_core/utils/network.py

@@ -299,11 +299,21 @@ def get_interface_details(
         iw_list_data = parse_iw_list(run_command(["iw", "list"]).stdout.split("\n"))
 
     return {
-        get_phy_interface_name(k.split(" ")[1].split("phy")[1]): v
+        get_phy_interface_name(k.split(" ")[1].split("phy")[1]): {
+            "phy_name": k.split(" ")[1],
+            "mac": get_interface_mac(
+                get_phy_interface_name(k.split(" ")[1].split("phy")[1])
+            ),
+            "details": v,
+        }
         for k, v in iw_list_data.items()
         if "phy" in k
     }
 
 
+def get_interface_mac(interface: str) -> str:
+    return run_command(["jc", "ifconfig", interface]).output_from_json()[0]["mac_addr"]
+
+
 if __name__ == "__main__":
     print(json.dumps(get_interface_details()))