Fix issue with WiFi on but not connected

Author: tuxudo

scripts/wifi

@@ -46,14 +46,16 @@ def get_wifi_info():
             info['agrctlrssi'] = re.sub('[^0-9-]','', remove_all('    RSSI                 : ', line).strip())
         elif "    Noise                : " in line:
             info['agrctlnoise'] = re.sub('[^0-9-]','', remove_all('    Noise                : ', line).strip())
-        
+
         elif "    Tx Rate              : " in line:
             info['lasttxrate'] = re.sub('[^0-9]','', remove_all('    Tx Rate              : ', line.split(".")[0]).strip())
         elif "    MCS Index            : " in line:
             info['mcs'] = re.sub('[^0-9]','', remove_all('    MCS Index            : ', line).strip())
 
         elif "    Power                : On" in line:
-            info['state'] = "running"
+            if 'state' in info and info['state'] != "init":
+                info['state'] = "running"
+
         elif "    Op Mode              : " in line:
             info['op_mode'] = remove_all('    Op Mode              : ', line.replace('STA', 'station')).strip()
 
@@ -63,11 +65,14 @@ def get_wifi_info():
             info['phy_mode'] = "802." + remove_all('    PHY Mode             : ', line).strip()
         elif "    Country Code         : " in line:
             info['country_code'] = remove_all('    Country Code         : ', line).strip()
-        elif "    BSSID                : " in line:
-            info['bssic'] = format_mac_address(remove_all('    BSSID                : ', line).strip())
+
+        elif "    BSSID                : " in line and "None" not in line:
+            info['bssid'] = format_mac_address(remove_all('    BSSID                : ', line).strip())
+        elif "    BSSID                : " in line and "None" in line:
+            info['state'] = "init" # Show that the wifi is on, but not connected
         elif "    SSID                 : " in line:
             info['ssid'] = remove_all('    SSID                 : ', line).strip()
-        
+
         elif "    Guard Interval       : " in line:
             info['guardinterval'] = remove_all('    Guard Interval       : ', line).strip()
         elif "    NSS                  : " in line:
@@ -265,9 +270,9 @@ def get_networks():
                                             channel_history["timestamp"] = string_to_time(channel[channel_entry])
                                             # Get historical channel by comparing last connected with channel's timestamp
                                             if "JoinedBySystemAt" in plist[network] and channel[channel_entry] == plist[network]["JoinedBySystemAt"]:
-                                                ssid_entry["channel"] = channel["Channel"]            
+                                                ssid_entry["channel"] = channel["Channel"]
                                             elif "JoinedByUserAt" in plist[network] and channel[channel_entry] == plist[network]["JoinedByUserAt"]:
-                                                ssid_entry["channel"] = channel["Channel"]                                                
+                                                ssid_entry["channel"] = channel["Channel"]
                                     history.append(channel_history)
                                 ssid_entry["channel_history"] = history
                             except Exception:
@@ -292,7 +297,7 @@ def get_networks():
             networks_json.append(ssid_entry)
 
         return {"known_networks":json.dumps(networks_json)}
-        
+
     except Exception:
         return {"known_networks":""}
 
@@ -398,7 +403,7 @@ def get_networks_legacy():
                                                 channel_history["timestamp"] = string_to_time(channel_entry.split(' =')[1].replace('";', "").replace(';', "").replace(' "', "").strip())
                                                 # Get historical channel by comparing last connected with channel's timestamp
                                                 if network_entry.count(channel_entry.split(' =')[1].replace('";', "").replace(';', "").replace(' "', "").strip()) == 2:
-                                                    ssid_entry["channel"] = channel_history["channel"]                                                
+                                                    ssid_entry["channel"] = channel_history["channel"]
                                     history.append(channel_history)
                                 ssid_entry["channel_history"] = history[:-1]
                             except Exception:
@@ -422,12 +427,12 @@ def get_networks_legacy():
 
                 networks_json.append(ssid_entry)
         return {"known_networks":json.dumps(networks_json)}
-        
+
     except Exception:
         return {"known_networks":""}
 
 def string_to_time(date_time):
-    
+
     if (date_time == "0" or date_time == 0):
         return ""
     else:
@@ -488,7 +493,7 @@ def main():
 
         # Only merge in the known networks if not empty
         if known_networks != {}:
-            result = merge_two_dicts(known_networks, result)  
+            result = merge_two_dicts(known_networks, result)
     else:
         result = merge_two_dicts(get_wifi_info(), known_networks)