From db80f31e03a22256e856f6eb643be3de531cbd64 Mon Sep 17 00:00:00 2001 From: Dario Freddi Date: Sun, 1 Mar 2009 16:46:58 +0100 Subject: [PATCH] Adding per-channel bitrate information as a string --- wicd/wnettools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wicd/wnettools.py b/wicd/wnettools.py index c1ee8de..49ae1af 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -50,6 +50,7 @@ channel_pattern = re.compile('.*Channel:? ?(\d\d?)', __re_mode) strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', __re_mode) altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', __re_mode) signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', __re_mode) +bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', __re_mode) mode_pattern = re.compile('.*Mode:(.*?)\n', __re_mode) freq_pattern = re.compile('.*Frequency:(.*?)\n', __re_mode) wep_pattern = re.compile('.*Encryption key:(.*?)\n', __re_mode) @@ -1059,7 +1060,7 @@ class BaseWirelessInterface(BaseInterface): ap['channel'] = self._FreqToChannel(freq) # Bit Rate - ap['bitrate'] = misc.RunRegex(bitrate_pattern, cell) + ap['bitrates'] = misc.RunRegex(bitrates_pattern, cell).replace('\n', '; ').replace(' ', '')[:-2] # BSSID ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell)