gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-21 13:28:08 +01:00
Code Issues Projects Releases Wiki Activity

Fixed some problems with tabs being used instead of 4 spaces.

Browse Source
This commit is contained in:
imdano
2007-12-17 15:17:00 +00:00
parent bf32a16e49
commit 6d708846d9
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wnettools.py
View File

@@ -39,7 +39,7 @@ import wpath
essid_pattern = re.compile('.*ESSID:"(.*?)"\n', re.DOTALL | re.I | re.M | re.S)
ap_mac_pattern = re.compile('.*Address: (.*?)\n',re.DOTALL | re.I | re.M | re.S)
channel_pattern = re.compile('.*Channel:? ?(\d\d?)',re.DOTALL | re.I | re.M | re.S)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)',re.DOTALL | re.I | re.M | re.S)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)',re.DOTALL | re.I | re.M | re.S)
# These next two look a lot a like, altstrength is for Signal level = xx/100,
# which is just an alternate way of displaying link quality, signaldbm is
# for displaying actual signal strength (-xx dBm).
@@ -395,12 +395,12 @@ class WirelessInterface(Interface):
# more of the patch from
# https://bugs.launchpad.net/wicd/+bug/175104
if (strength_pattern.match(cell)):
[(strength, max_strength)] = strength_pattern.findall(cell)
if max_strength:
CurrentNetwork["quality"] = 100 * int(strength) // int(max_strength)
else:
CurrentNetwork["quality"] = int(strength)
if (strength_pattern.match(cell)):
[(strength, max_strength)] = strength_pattern.findall(cell)
if max_strength:
CurrentNetwork["quality"] = 100 * int(strength) // int(max_strength)
else:
CurrentNetwork["quality"] = int(strength)
elif misc.RunRegex(altstrength_pattern,cell):
ap['quality'] = misc.RunRegex(altstrength_pattern,cell)
else:
@@ -604,9 +604,9 @@ class WirelessInterface(Interface):
#strength = misc.RunRegex(strength_pattern,output)
[(strength, max_strength)] = strength_pattern.findall(output)
if max_strength and strength:
return 100 * int(strength) // int(max_strength)
[(strength, max_strength)] = strength_pattern.findall(output)
if max_strength and strength:
return 100 * int(strength) / int(max_strength)
if strength == None:
strength = misc.RunRegex(altstrength_pattern,output)
@@ -621,7 +621,7 @@ class WirelessInterface(Interface):
"""
cmd = 'iwconfig ' + self.iface
if self.verbose: print cmd
# if self.verbose: print cmd
output = misc.Run(cmd)
dbm_strength = misc.RunRegex(signaldbm_pattern,output)
return dbm_strength
@@ -635,7 +635,7 @@ class WirelessInterface(Interface):
"""
cmd = 'iwconfig ' + self.iface
if self.verbose: print cmd
# if self.verbose: print cmd
output = misc.Run(cmd)
network = misc.RunRegex(re.compile('.*ESSID:"(.*?)"',re.DOTALL | re.I | re.M | re.S), output)
if network is not None: