From 216175b138dae76b6712ac4b381fada7fdf85542 Mon Sep 17 00:00:00 2001
From: compwiz18 <>
Date: Sun, 16 Dec 2007 19:08:00 +0000
Subject: [PATCH] Applied pach in https://bugs.launchpad.net/wicd/+bug/175104
 to fix signal strength issues, thanks Philip

---
 daemon.py    |  8 ++++----
 wnettools.py | 28 +++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/daemon.py b/daemon.py
index ce13ea7..b69cc88 100644
--- a/daemon.py
+++ b/daemon.py
@@ -333,7 +333,7 @@ class ConnectionWizard(dbus.service.Object):
         if fresh:
             self.Scan()
             #self.AutoConnectScan()  # Also scans for hidden networks
-        if self.CheckPluggedIn() == True:
+        if self.CheckPluggedIn() == True and self.:
             if self.GetWiredAutoConnectMethod() == 2:
                 self.LaunchChooser()
             else:
@@ -385,7 +385,7 @@ class ConnectionWizard(dbus.service.Object):
     
     @dbus.service.method('org.wicd.daemon')    
     def SetCurrentInterface(self, iface):
-        self.current_interface = iface
+        self.current_interface = str(iface)
 
     @dbus.service.method('org.wicd.daemon')
     def SetNeedWiredProfileChooser(self,val):
@@ -394,14 +394,14 @@ class ConnectionWizard(dbus.service.Object):
 
     @dbus.service.method('org.wicd.daemon')
     def GetNeedWiredProfileChooser(self):
-        return self.need_profile_chooser
+        return bool(self.need_profile_chooser)
     #end function GetNeedWiredProfileChooser
 
     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
     def LaunchChooser(self):
         print 'calling wired profile chooser'
         daemon.SetNeedWiredProfileChooser(True)
-
+        
     @dbus.service.signal(dbus_interface='org.wicd.daemon', signature='')
     def StatusChanged(self):
         """ Called when the current connection status has changed """
diff --git a/wnettools.py b/wnettools.py
index e188a7c..4b65f1e 100644
--- a/wnettools.py
+++ b/wnettools.py
@@ -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\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).
@@ -261,6 +261,8 @@ class WirelessInterface(Interface):
 
         # Split the networks apart, using Cell as our split point
         # this way we can look at only one network at a time.
+        # the spaces around '   Cell ' are to minimize the chance that someone
+        # has an essid named Cell...
         networks = results.split( '   Cell ' )
 
         # Get available network info from iwpriv get_site_survey
@@ -390,8 +392,15 @@ class WirelessInterface(Interface):
 
         # Link Quality
         # Set strength to -1 if the quality is not found
-        if misc.RunRegex(strength_pattern,cell):
-            ap['quality'] = misc.RunRegex(strength_pattern,cell)
+        
+        # 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)
         elif misc.RunRegex(altstrength_pattern,cell):
             ap['quality'] = misc.RunRegex(altstrength_pattern,cell)
         else:
@@ -588,10 +597,19 @@ class WirelessInterface(Interface):
         cmd = 'iwconfig ' + self.iface
         # if self.verbose: print cmd
         output = misc.Run(cmd)
-        strength = misc.RunRegex(strength_pattern,output)
+        # implemented the patch provided in
+        # https://bugs.launchpad.net/wicd/+bug/175104
+        # it was for the stable version, so I've improvised here
+        # should work though
+
+        #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)
+ 			
         if strength == None:
             strength = misc.RunRegex(altstrength_pattern,output)
-
         return strength