From 87783646c72c1834b18f26bb2f948f11c2107aeb Mon Sep 17 00:00:00 2001
From: Tim Camise <tcamise@gopro.com>
Date: Fri, 6 Sep 2024 14:37:38 -0700
Subject: [PATCH] Fix wifi scanning on macos

---
 .../open_gopro/wifi/adapters/wireless.py      | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py
index 43eb6909..8c351b89 100644
--- a/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py
+++ b/demos/python/sdk_wireless_camera_control/open_gopro/wifi/adapters/wireless.py
@@ -569,6 +569,19 @@ def power(self, power: bool) -> bool:
 
         return True
 
+def scan_for_ssid(ssid: str, timeout_sec: float = 30.0, invert: bool = False) -> bool:
+    while time.time() - start_time <= timeout_sec:
+        output: bytes = subprocess.check_output([str(path_system_profiler), 'SPAirPortDataType'])
+        text: str = output.decode()
+        regex = re.compile(r'\n\s+([\x20-\x7E]{1,32}):\n\s+PHY Mode:') # 0x20...0x7E --> ASCII for printable characters
+        for _ssid in sorted(list(set(regex.findall(text)))):
+            if _ssid not in ssids:
+                ssids.append(_ssid)
+            if not invert and ssid in ssids:
+                return True
+        #print(f'Scanning... ssids found: {sorted(ssids)}')  # debug
+
+    return invert
 
 class WpasupplicantWireless(WifiController):
     """Linux wpa_supplicant Driver."""
@@ -712,23 +725,9 @@ def connect(self, ssid: str, password: str, timeout: float = 15) -> bool:
         discovered = False
         while not discovered and (time.time() - start) <= timeout:
             # Scan for network
-            # Surprisingly, yes this is the industry standard location for this and no, there's no shortcut for it
-            response = cmd(
-                r"/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport --scan"
-            )
-            # TODO Sometimes the response is blank?
-            if not response:
-                logger.warning("MacOS did not return a response to SSID scanning.")
-                continue
-            lines = response.splitlines()
-            ssid_end_index = lines[0].index("SSID") + 4  # Find where the SSID column ends
-
-            for result in lines[1:]:  # Skip title row
-                current_ssid = result[:ssid_end_index].strip()
-                if current_ssid == ssid.strip():
-                    discovered = True
-                    break
-            if discovered:
+            response = cmd(r"/usr/sbin/system_profiler SPAirPortDataType")
+            regex = re.compile(r'\n\s+([\x20-\x7E]{1,32}):\n\s+PHY Mode:') # 0x20...0x7E --> ASCII for printable characters
+            if ssid in sorted(regex.findall(response)):
                 break
             time.sleep(1)
         else: